Changeset 54001 in webkit

Timestamp:

Jan 28, 2010 8:28:41 AM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Pavel Feldman.

Use platform-specific monospace fonts in the Web Inspector

Move the OS version detection code into the frontend,
add custom CSS monospace styles for known platforms.
​https://bugs.webkit.org/show_bug.cgi?id=34040

• inspector/InspectorFrontendHost.cpp: (WebCore::InspectorFrontendHost::platform):
• inspector/front-end/BreakpointsSidebarPane.js: (WebInspector.BreakpointsSidebarPane.prototype._appendBreakpointElement):
• inspector/front-end/DatabaseQueryView.js: (WebInspector.DatabaseQueryView):
• inspector/front-end/InspectorBackendStub.js: (.WebInspector.InspectorBackendStub.prototype.releaseWrapperObjectGroup): (.WebInspector.InspectorBackendStub.prototype.setInjectedScriptSource):
• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype._createConditionElement):
• inspector/front-end/inspector.css:
• inspector/front-end/inspector.html:
• inspector/front-end/inspector.js: (WebInspector.URLRegExp.i.get platform): (WebInspector._detectPlatform):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorFrontendHost.cpp (modified) (1 diff)
• inspector/front-end/BreakpointsSidebarPane.js (modified) (1 diff)
• inspector/front-end/DatabaseQueryView.js (modified) (1 diff)
• inspector/front-end/InspectorBackendStub.js (modified) (1 diff)
• inspector/front-end/SourceFrame.js (modified) (1 diff)
• inspector/front-end/inspector.css (modified) (6 diffs)
• inspector/front-end/inspector.html (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-28  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Use platform-specific monospace fonts in the Web Inspector
+
+        Move the OS version detection code into the frontend,
+        add custom CSS monospace styles for known platforms.
+        https://bugs.webkit.org/show_bug.cgi?id=34040
+
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::platform):
+        * inspector/front-end/BreakpointsSidebarPane.js:
+        (WebInspector.BreakpointsSidebarPane.prototype._appendBreakpointElement):
+        * inspector/front-end/DatabaseQueryView.js:
+        (WebInspector.DatabaseQueryView):
+        * inspector/front-end/InspectorBackendStub.js:
+        (.WebInspector.InspectorBackendStub.prototype.releaseWrapperObjectGroup):
+        (.WebInspector.InspectorBackendStub.prototype.setInjectedScriptSource):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._createConditionElement):
+        * inspector/front-end/inspector.css:
+        * inspector/front-end/inspector.html:
+        * inspector/front-end/inspector.js:
+        (WebInspector.URLRegExp.i.get platform):
+        (WebInspector._detectPlatform):
+
 2010-01-28  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/WebCore/inspector/InspectorFrontendHost.cpp

@@ -122 +122 @@
 {
 #if PLATFORM(MAC)
-#ifdef BUILDING_ON_TIGER
-    DEFINE_STATIC_LOCAL(const String, platform, ("mac-tiger"));
-#else
-    DEFINE_STATIC_LOCAL(const String, platform, ("mac-leopard"));
-#endif
+    DEFINE_STATIC_LOCAL(const String, platform, ("mac"));
 #elif OS(WINDOWS)
     DEFINE_STATIC_LOCAL(const String, platform, ("windows"));
+#elif OS(LINUX)
+    DEFINE_STATIC_LOCAL(const String, platform, ("linux"));
 #else
     DEFINE_STATIC_LOCAL(const String, platform, ("unknown"));

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

@@ -100 +100 @@
         var sourceTextElement = document.createElement("div");
         sourceTextElement.textContent = breakpoint.sourceText;
-        sourceTextElement.className = "source-text";
+        sourceTextElement.className = "source-text monospace";
         breakpointElement.appendChild(sourceTextElement);
 

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

@@ -32 +32 @@
     this.element.addStyleClass("storage-view");
     this.element.addStyleClass("query");
+    this.element.addStyleClass("monospace");
     this.element.tabIndex = 0;
 

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

@@ -266 +266 @@
     releaseWrapperObjectGroup: function()
     {
+    },
+
+    setInjectedScriptSource: function()
+    {
     }
 }

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

@@ -377 +377 @@
         var editorElement = document.createElement("input");
         editorElement.id = "source-breakpoint-condition";
+        editorElement.className = "monospace";
         editorElement.type = "text"
         conditionElement.appendChild(editorElement);

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

@@ -496 +496 @@
 }
 
+.monospace {
+    font-size: 10px;
+    font-family: monospace;
+}
+
+body.platform-mac-tiger .monospace, body.platform-mac-leopard .monospace,
+body.platform-mac-tiger .source-code, body.platform-mac-leopard .source-code {
+    font-size: 10px;
+    font-family: Monaco, monospace;
+}
+
+body.platform-mac-snowleopard .monospace,
+body.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 {
+    font-size: 12px;
+    font-family: Consolas, Lucida Console, monospace;
+}
+
 #console-messages {
     position: absolute;
@@ -503 +526 @@
     right: 0;
     bottom: 23px;
-    font-size: initial;
-    font-family: monospace;
     padding: 2px 0;
     overflow-y: overlay;
@@ -1099 +1120 @@
 .source-code {
     font-family: monospace;
-    font-size: medium;
+    font-size: 10px;
     white-space: pre-wrap;
-}
-
-body.platform-windows .source-code {
-    font-family: Consolas, Lucida Console, monospace;
-    font-size: 12px;
 }
 
@@ -2124 +2140 @@
 
 .storage-view.query {
-    font-size: initial;
-    font-family: monospace;
     padding: 2px 0;
     overflow-y: overlay;
@@ -3788 +3802 @@
 
 .breakpoint-list .source-text {
-    font-family: monospace;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -3822 +3835 @@
 
 #source-breakpoint-condition {
-    font-family: monospace;
     margin: 0;
     border: 1px inset rgb(190, 190, 190) !important;

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

@@ -134 +134 @@
     </div>
     <div id="drawer">
-        <div id="console-view"><div id="console-messages"><div id="console-prompt" spellcheck="false"><br></div></div></div>
+        <div id="console-view"><div id="console-messages" class="monospace"><div id="console-prompt" spellcheck="false"><br></div></div></div>
         <div id="drawer-status-bar" class="status-bar"><div id="other-drawer-status-bar-items"><button id="clear-console-status-bar-item" class="status-bar-item"><div class="glyph"></div><div class="glyph shadow"></div></button><div id="console-filter" class="scope-bar status-bar-item"></div></div></div>
     </div>

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

@@ -56 +56 @@
     missingLocalizedStrings: {},
     pendingDispatches: 0,
+    OS: {
+        Windows: "windows",
+        WindowsVistaOrLater: "windows-vista-or-later",
+        MacTiger: "mac-tiger",
+        MacLeopard: "mac-leopard",
+        MacSnowLeopard: "mac-snowleopard"
+    },
 
     // RegExp groups:
@@ -68 +75 @@
     {
         if (!("_platform" in this))
-            this._platform = InspectorFrontendHost.platform();
+            this._platform = this._detectPlatform();
 
         return this._platform;
+    },
+
+    _detectPlatform: function()
+    {
+        const userAgent = navigator.userAgent;
+        var nativePlatform = InspectorFrontendHost.platform();
+
+        if (nativePlatform === "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") {
+            var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+)_(?:\d+))?/);
+            if (!match || match[1] != 10)
+                return WebInspector.OS.MacLeopard;
+            switch (Number(match[2])) {
+                case 4:
+                    return WebInspector.OS.MacTiger;
+                case 5:
+                    return WebInspector.OS.MacLeopard;
+                case 6:
+                    return WebInspector.OS.MacSnowLeopard;
+            }
+            return WebInspector.OS.MacLeopard;
+        }
+
+        return nativePlatform;
     },