Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit b1c4e07

Browse files
concavelenzcopybara-github
authored andcommitted
Remove references to X11 from closure userAgent
RELNOTES[INC]: Remove X11 references from goog.userAgent PiperOrigin-RevId: 577272544 Change-Id: Ie721bc14089ebdf7040b44301d671406cd0099f6
1 parent 24037a6 commit b1c4e07

File tree

4 files changed

+6
-45
lines changed

4 files changed

+6
-45
lines changed

closure/goog/positioning/positioning_test.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ let testArea;
4545

4646
/** This is used to round pixel values on FF3 Mac. */
4747
function assertRoundedEquals(a, b, c) {
48-
function round(x) {
49-
return userAgent.GECKO && (userAgent.MAC || userAgent.X11) ? Math.round(x) :
50-
x;
51-
}
5248
if (arguments.length == 3) {
53-
assertRoughlyEquals(a, round(b), round(c), ALLOWED_OFFSET);
49+
assertRoughlyEquals(a, b, c, ALLOWED_OFFSET);
5450
} else {
55-
assertRoughlyEquals(round(a), round(b), ALLOWED_OFFSET);
51+
assertRoughlyEquals(a, b, ALLOWED_OFFSET);
5652
}
5753
}
5854

closure/goog/ui/popup_test.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@ const Corner = goog.require('goog.positioning.Corner');
1212
const Popup = goog.require('goog.ui.Popup');
1313
const style = goog.require('goog.style');
1414
const testSuite = goog.require('goog.testing.testSuite');
15-
const userAgent = goog.require('goog.userAgent');
1615

1716
/** This is used to round pixel values on FF3 Mac. */
1817
function assertRoundedEquals(a, b, c) {
19-
function round(x) {
20-
return userAgent.GECKO && (userAgent.MAC || userAgent.X11) ? Math.round(x) :
21-
x;
22-
}
2318
if (arguments.length == 3) {
24-
assertEquals(a, round(b), round(c));
19+
assertEquals(a, b, c);
2520
} else {
26-
assertEquals(round(a), round(b));
21+
assertEquals(a, b);
2722
}
2823
}
2924

closure/goog/useragent/useragent.js

+2-31
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,6 @@ goog.userAgent.ASSUME_WINDOWS =
252252
goog.userAgent.ASSUME_LINUX = goog.define('goog.userAgent.ASSUME_LINUX', false);
253253

254254

255-
/**
256-
* @define {boolean} Whether the user agent is running on a X11 windowing
257-
* system.
258-
*/
259-
goog.userAgent.ASSUME_X11 = goog.define('goog.userAgent.ASSUME_X11', false);
260-
261-
262255
/**
263256
* @define {boolean} Whether the user agent is running on Android.
264257
*/
@@ -297,9 +290,8 @@ goog.userAgent.ASSUME_KAIOS = goog.define('goog.userAgent.ASSUME_KAIOS', false);
297290
*/
298291
goog.userAgent.PLATFORM_KNOWN_ = goog.userAgent.ASSUME_MAC ||
299292
goog.userAgent.ASSUME_WINDOWS || goog.userAgent.ASSUME_LINUX ||
300-
goog.userAgent.ASSUME_X11 || goog.userAgent.ASSUME_ANDROID ||
301-
goog.userAgent.ASSUME_IPHONE || goog.userAgent.ASSUME_IPAD ||
302-
goog.userAgent.ASSUME_IPOD;
293+
goog.userAgent.ASSUME_ANDROID || goog.userAgent.ASSUME_IPHONE ||
294+
goog.userAgent.ASSUME_IPAD || goog.userAgent.ASSUME_IPOD;
303295

304296

305297
/**
@@ -348,27 +340,6 @@ goog.userAgent.LINUX = goog.userAgent.PLATFORM_KNOWN_ ?
348340
goog.userAgent.isLegacyLinux_();
349341

350342

351-
/**
352-
* @return {boolean} Whether the user agent is an X11 windowing system.
353-
* @private
354-
*/
355-
goog.userAgent.isX11_ = function() {
356-
'use strict';
357-
var navigator = goog.userAgent.getNavigatorTyped();
358-
return !!navigator &&
359-
goog.string.internal.contains(navigator['appVersion'] || '', 'X11');
360-
};
361-
362-
363-
/**
364-
* Whether the user agent is running on a X11 windowing system.
365-
* @type {boolean}
366-
*/
367-
goog.userAgent.X11 = goog.userAgent.PLATFORM_KNOWN_ ?
368-
goog.userAgent.ASSUME_X11 :
369-
goog.userAgent.isX11_();
370-
371-
372343
/**
373344
* Whether the user agent is running on Android.
374345
* @type {boolean}

closure/goog/useragent/useragenttestutil.js

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ goog.userAgentTestUtil.reinitializeUserAgent = function() {
5151
goog.userAgent.MAC = goog.labs.userAgent.platform.isMacintosh();
5252
goog.userAgent.WINDOWS = goog.labs.userAgent.platform.isWindows();
5353
goog.userAgent.LINUX = goog.userAgent.isLegacyLinux_();
54-
goog.userAgent.X11 = goog.userAgent.isX11_();
5554
goog.userAgent.ANDROID = goog.labs.userAgent.platform.isAndroid();
5655
goog.userAgent.IPAD = goog.labs.userAgent.platform.isIpad();
5756
goog.userAgent.IPHONE = goog.labs.userAgent.platform.isIphone();

0 commit comments

Comments
 (0)