Changeset 54059 in webkit

Timestamp:

Jan 29, 2010 6:10:54 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

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

Reviewed by Timothy Hatcher.

Web Inspector: Source view displays text using wrong fonts
​https://bugs.webkit.org/show_bug.cgi?id=34269

• inspector/front-end/TextEditor.js: (WebInspector.TextEditor): (WebInspector.TextEditor.prototype._initFont):
• inspector/front-end/inspector.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextEditor.js (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Source view displays text using wrong fonts
+        https://bugs.webkit.org/show_bug.cgi?id=34269
+
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor):
+        (WebInspector.TextEditor.prototype._initFont):
+        * inspector/front-end/inspector.js:
+
 2010-01-29  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -79 +79 @@
     this._selection = new WebInspector.TextSelectionModel(this._selectionChanged.bind(this));
 
-    this._isMacTiger = platform === "mac-tiger";
-    this._isMacLeopard = platform === "mac-leopard";
-    this._isMac = this._isMacTiger || this._isMacLeopard;
-    this._isWin = platform === "windows";
+    this._isMac = platform && (platform.indexOf("mac") === 0);
 
     this._initFont();
@@ -949 +946 @@
     },
 
-    _initFont: function(sansSerif, fontSize)
-    {
+    _initFont: function(sansSerif)
+    {
+        if (!WebInspector.TextEditor.PlatformFonts) {
+            WebInspector.TextEditor.PlatformFonts = {};
+            WebInspector.TextEditor.PlatformFonts[WebInspector.OS.Windows] = {size: 12, face: "Lucida Console"};
+            WebInspector.TextEditor.PlatformFonts[WebInspector.OS.WindowsVistaOrLater] = {size: 12, face: "Courier"};
+            WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacSnowLeopard] = {size: 11, face: "Menlo"};
+            WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacLeopard] = {size: 10, face: "Monaco"};
+            WebInspector.TextEditor.PlatformFonts[WebInspector.OS.MacTiger] = {size: 10, face: "Monaco"};
+        }
+
         if (sansSerif) {
             this._isMonospace = false;
-            this._fontSize = fontSize || 11;
+            this._fontSize = 11;
             this._font = this._fontSize + "px sans-serif";
         } else {
             this._isMonospace = true;
-            this._fontSize = fontSize || 10;
-            this._font = this._fontSize + "px monospace";
-            if (this._isMac)
-                this._font = this._fontSize + "px Monaco";
-            else if (this._isWin)
-                this._font = (this._fontSize + 1) + "px Courier New";
+            const platform = WebInspector.platform;
+            const fontInfo = WebInspector.TextEditor.PlatformFonts[platform] || {size: 10, face: "monospace"};
+            this._fontSize = fontInfo.size;
+            this._font = this._fontSize + "px " + fontInfo.face;
         }
         this._ctx.font = this._font;

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:
@@ -421 +414 @@
         }
     }
+}
+
+WebInspector.OS = {
+    Windows: "windows",
+    WindowsVistaOrLater: "windows-vista-or-later",
+    MacTiger: "mac-tiger",
+    MacLeopard: "mac-leopard",
+    MacSnowLeopard: "mac-snowleopard"
 }