Changeset 54240 in webkit

Timestamp:

Feb 2, 2010 9:08:02 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2010-02-02 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Eliminate some of the platform flavor-specific stylesheet selectors

Extract OS version into WebInspector.platformFlavor
​https://bugs.webkit.org/show_bug.cgi?id=34469

• inspector/front-end/InspectorBackendStub.js:
• inspector/front-end/InspectorFrontendHostStub.js: (.WebInspector.InspectorFrontendHostStub.prototype.platform):
• inspector/front-end/inspector.css:
• inspector/front-end/inspector.js: (WebInspector.pendingDispatches.0.URLRegExp.i.get platform): (WebInspector.get platformFlavor): (WebInspector._detectPlatformFlavor): (WebInspector.loaded): (WebInspector.toolbarDragStart): (WebInspector.isMac):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/InspectorBackendStub.js (modified) (1 diff)
• inspector/front-end/InspectorFrontendHostStub.js (modified) (1 diff)
• inspector/front-end/inspector.css (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-02  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Eliminate some of the platform flavor-specific stylesheet selectors
+
+        Extract OS version into WebInspector.platformFlavor
+        https://bugs.webkit.org/show_bug.cgi?id=34469
+
+        * inspector/front-end/InspectorBackendStub.js:
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.platform):
+        * inspector/front-end/inspector.css:
+        * inspector/front-end/inspector.js:
+        (WebInspector.pendingDispatches.0.URLRegExp.i.get platform):
+        (WebInspector.get platformFlavor):
+        (WebInspector._detectPlatformFlavor):
+        (WebInspector.loaded):
+        (WebInspector.toolbarDragStart):
+        (WebInspector.isMac):
+
 2010-02-02  Steve Block  <steveblock@google.com>
 

trunk/WebCore/inspector/front-end/InspectorBackendStub.js

@@ -47 +47 @@
     },
 
-    platform: function()
-    {
-        return "mac-leopard";
-    },
-
-    port: function()
-    {
-        return "unknown";
-    },
-
-
     closeWindow: function()
     {

trunk/WebCore/inspector/front-end/InspectorFrontendHostStub.js

@@ -36 +36 @@
 }
 
+WebInspector._platformFlavor = WebInspector.PlatformFlavor.MacLeopard;
+
 WebInspector.InspectorFrontendHostStub.prototype = {
     platform: function()
     {
-        return "mac-leopard";
+        return "mac";
     },
 

trunk/WebCore/inspector/front-end/inspector.css

@@ -247 +247 @@
 }
 
-body.platform-mac-tiger .toolbar-item.close-right,
-body.platform-mac-leopard .toolbar-item.close-right,
-body.platform-mac-snowleopard .toolbar-item.close-right {
-    display: none;
-}
-
-body:not(.platform-mac-tiger):not(.platform-mac-leopard):not(.platform-mac-snowleopard) .toolbar-item.close-left {
+body.platform-mac .toolbar-item.close-right {
+    display: none;
+}
+
+body:not(.platform-mac) .toolbar-item.close-left {
     display: none;
 }
@@ -504 +502 @@
 }
 
-body.platform-mac-tiger .monospace, body.platform-mac-leopard .monospace,
-body.platform-mac-tiger .source-code, body.platform-mac-leopard .source-code {
+body.platform-mac .monospace, body.platform-mac .source-code {
     font-family: Monaco, monospace;
 }
 
-body.platform-mac-snowleopard .monospace,
-body.platform-mac-snowleopard .source-code {
+/* Keep .platform-mac to make the rule more specific than the general one above. */
+body.platform-mac.platform-mac-snowleopard .monospace,
+body.platform-mac.platform-mac-snowleopard .source-code {
     font-size: 11px;
     font-family: Menlo, monospace;
 }
 
-body.platform-windows .monospace, body.platform-windows-vista-or-later .monospace,
-body.platform-windows .source-code, body.platform-windows-vista-or-later .source-code {
+body.platform-windows .monospace, body.platform-windows .source-code {
     font-size: 12px;
     font-family: Consolas, Lucida Console, monospace;

trunk/WebCore/inspector/front-end/inspector.js

@@ -68 +68 @@
     {
         if (!("_platform" in this))
-            this._platform = this._detectPlatform();
+            this._platform = InspectorFrontendHost.platform();
 
         return this._platform;
     },
 
-    _detectPlatform: function()
+    get platformFlavor()
+    {
+        if (!("_platformFlavor" in this))
+            this._platformFlavor = this._detectPlatformFlavor();
+
+        return this._platformFlavor;
+    },
+
+    _detectPlatformFlavor: function()
     {
         const userAgent = navigator.userAgent;
-        var nativePlatform = InspectorFrontendHost.platform();
-
-        if (nativePlatform === "windows") {
+
+        if (this.platform === "windows") {
             var match = userAgent.match(/Windows NT (\d+)\.(?:\d+)/);
             if (match && match[1] >= 6)
-                return WebInspector.OS.WindowsVistaOrLater;
-            return WebInspector.OS.Windows;
-        } else if (nativePlatform === "mac") {
+                return WebInspector.PlatformFlavor.WindowsVista;
+            return null;
+        } else if (this.platform === "mac") {
             var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+))?/);
             if (!match || match[1] != 10)
-                return WebInspector.OS.MacSnowLeopard;
+                return WebInspector.PlatformFlavor.MacSnowLeopard;
             switch (Number(match[2])) {
                 case 4:
-                    return WebInspector.OS.MacTiger;
+                    return WebInspector.PlatformFlavor.MacTiger;
                 case 5:
-                    return WebInspector.OS.MacLeopard;
+                    return WebInspector.PlatformFlavor.MacLeopard;
                 case 6:
                 default:
-                    return WebInspector.OS.MacSnowLeopard;
+                    return WebInspector.PlatformFlavor.MacSnowLeopard;
             }
         }
 
-        return nativePlatform;
+        return null;
     },
 
@@ -416 +423 @@
 }
 
-WebInspector.OS = {
-    Windows: "windows",
-    WindowsVistaOrLater: "windows-vista-or-later",
+WebInspector.PlatformFlavor = {
+    WindowsVista: "windows-vista",
     MacTiger: "mac-tiger",
     MacLeopard: "mac-leopard",
@@ -430 +436 @@
     var platform = WebInspector.platform;
     document.body.addStyleClass("platform-" + platform);
+    var flavor = WebInspector.platformFlavor;
+    if (flavor)
+        document.body.addStyleClass("platform-" + flavor);
     var port = WebInspector.port;
     document.body.addStyleClass("port-" + port);
@@ -872 +881 @@
 WebInspector.toolbarDragStart = function(event)
 {
-    if ((!WebInspector.attached && WebInspector.platform !== "mac-leopard") || WebInspector.port == "qt")
+    if ((!WebInspector.attached && WebInspector.platformFlavor !== WebInspector.PlatformFlavor.MacLeopard && WebInspector.platformFlavor !== WebInspector.PlatformFlavor.MacSnowLeopard) || WebInspector.port == "qt")
         return;
 
@@ -1700 +1709 @@
 {
     if (!("_isMac" in this))
-        this._isMac = WebInspector.platform.indexOf("mac-") === 0;
+        this._isMac = WebInspector.platform === "mac";
 
     return this._isMac;