Unreviewed, rolling out r100269.

http://trac.webkit.org/changeset/100269
https://bugs.webkit.org/show_bug.cgi?id=72383

"Broke dozens of tests due to exception in loadingFinished"
(Requested by tonyg-cr on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-11-15

Source/WebCore:

* English.lproj/localizedStrings.js:
* inspector/front-end/InspectorFrontendHostStub.js:
(.WebInspector.InspectorFrontendHostStub.prototype.inspectedURLChanged):
* inspector/front-end/ProfilesPanel.js:
* inspector/front-end/Resource.js:
* inspector/front-end/Settings.js:
* inspector/front-end/UIUtils.js:
* inspector/front-end/inspector.js:

Source/WebKit/chromium:

* src/js/DevTools.js:
():
(devtools.domContentLoaded):
(WebInspector.UIString):
(WebInspector.setToolbarColors):
(WebInspector.resetToolbarColors):
(.WebInspector.InspectorFrontendHostStub.prototype.inspectedURLChanged):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 03c7e051505cd9ec9aa68949067956d7c166cfdc..6d4e5f55095b97ab61a1e202315af4c286e25410 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-11-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r100269.
+        http://trac.webkit.org/changeset/100269
+        https://bugs.webkit.org/show_bug.cgi?id=72383
+
+        "Broke dozens of tests due to exception in loadingFinished"
+        (Requested by tonyg-cr on #webkit).
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.inspectedURLChanged):
+        * inspector/front-end/ProfilesPanel.js:
+        * inspector/front-end/Resource.js:
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/UIUtils.js:
+        * inspector/front-end/inspector.js:
+
 2011-11-15  Alexander Pavlov  <apavlov@chromium.org>
 
         font property does not show up as "shorthand" in inspector

diff --git a/Source/WebCore/English.lproj/localizedStrings.js b/Source/WebCore/English.lproj/localizedStrings.js
index 811fc28c902bd487c4bcab5e48ee7e650ed7ca89..3f21228208051485be9dbaa31dafa6d3ee50deac 100644 (file)
Binary files a/Source/WebCore/English.lproj/localizedStrings.js and b/Source/WebCore/English.lproj/localizedStrings.js differ

diff --git a/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js b/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js
index 590e055f61f605e938c8e9c09c8f1c53af2cf44f..4f97abb0129c9a0d5da2039a67dc7c9bca0ad8ab 100644 (file)
--- a/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js
+++ b/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js
@@ -110,7 +110,6 @@ WebInspector.InspectorFrontendHostStub.prototype = {
 
     inspectedURLChanged: function(url)
     {
-        document.title = WebInspector.UIString(Preferences.applicationTitle, url);
     },
 
     copyText: function()

diff --git a/Source/WebCore/inspector/front-end/ProfilesPanel.js b/Source/WebCore/inspector/front-end/ProfilesPanel.js
index 8e5e8c5655be88c707a6891308a007da7e760e4d..b8b8c33e0892b7a90b03b04ff58b2b4a8d1693be 100644 (file)
--- a/Source/WebCore/inspector/front-end/ProfilesPanel.js
+++ b/Source/WebCore/inspector/front-end/ProfilesPanel.js
@@ -119,8 +119,6 @@ WebInspector.ProfilesPanel = function()
 
     this.enableToggleButton = new WebInspector.StatusBarButton("", "enable-toggle-status-bar-item");
     this.enableToggleButton.addEventListener("click", this._toggleProfiling.bind(this), false);
-    if (Preferences.profilerAlwaysEnabled)
-        this.enableToggleButton.element.addStyleClass("hidden");
 
     this.clearResultsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Clear all profiles."), "clear-status-bar-item");
     this.clearResultsButton.addEventListener("click", this._clearProfiles.bind(this), false);

diff --git a/Source/WebCore/inspector/front-end/Resource.js b/Source/WebCore/inspector/front-end/Resource.js
index 6a0f42b234918c2e266495375fde408c54989998..69d12dff7e47166e909cf8758af997b594b40577 100644 (file)
--- a/Source/WebCore/inspector/front-end/Resource.js
+++ b/Source/WebCore/inspector/front-end/Resource.js
@@ -44,7 +44,6 @@ WebInspector.MIMETypes = {
     "image/bmp":                   {2: true},
     "image/svg+xml":               {2: true},
     "image/vnd.microsoft.icon":    {2: true},
-    "image/webp":                  {2: true},
     "image/x-icon":                {2: true},
     "image/x-xbitmap":             {2: true},
     "font/ttf":                    {3: true},

diff --git a/Source/WebCore/inspector/front-end/Settings.js b/Source/WebCore/inspector/front-end/Settings.js
index c2f1189ca68d8d4d145ff3ccc8c579593877d560..9955e8a08b33f179eff7eeb8e33f4502dc750d82 100644 (file)
--- a/Source/WebCore/inspector/front-end/Settings.js
+++ b/Source/WebCore/inspector/front-end/Settings.js
@@ -58,8 +58,7 @@ var Preferences = {
     showNetworkPanelInitiatorColumn: false,
     haveExtensions: false,
     sharedWorkersDebugNote: undefined,
-    localizeUI: true,
-    applicationTitle: "Web Inspector - %s"
+    localizeUI: true
 }
 
 /**

diff --git a/Source/WebCore/inspector/front-end/UIUtils.js b/Source/WebCore/inspector/front-end/UIUtils.js
index cae491d73651616b7f55dc9e5c70e5cb1840c8d3..a008fab2625b2dc1584d207ccb5794c9c798e88c 100644 (file)
--- a/Source/WebCore/inspector/front-end/UIUtils.js
+++ b/Source/WebCore/inspector/front-end/UIUtils.js
@@ -595,31 +595,6 @@ WebInspector.setCurrentFocusElement = function(x)
         WebInspector._previousFocusElement.blur();
 }
 
-WebInspector.setToolbarColors = function(backgroundColor, color)
-{
-    if (!WebInspector._themeStyleElement) {
-        WebInspector._themeStyleElement = document.createElement("style");
-        document.head.appendChild(WebInspector._themeStyleElement);
-    }
-    WebInspector._themeStyleElement.textContent =
-        "#toolbar {\
-             background-image: none !important;\
-             background-color: " + backgroundColor + " !important;\
-         }\
-         \
-         .toolbar-label {\
-             color: " + color + " !important;\
-             text-shadow: none;\
-         }";
-}
-
-WebInspector.resetToolbarColors = function()
-{
-    if (WebInspector._themeStyleElement)
-        WebInspector._themeStyleElement.textContent = "";
-
-}
-
 ;(function() {
 
 function windowLoaded()

diff --git a/Source/WebCore/inspector/front-end/inspector.js b/Source/WebCore/inspector/front-end/inspector.js
index 32e4dcfeded306f1eeab3f335b53a724b268cc98..a89deeace6f5a6ff8569d7914fda965be4713b59 100644 (file)
--- a/Source/WebCore/inspector/front-end/inspector.js
+++ b/Source/WebCore/inspector/front-end/inspector.js
@@ -319,9 +319,6 @@ WebInspector.doLoadedDone = function()
     if (WebInspector.socket)
         document.body.addStyleClass("remote");
 
-    if (WebInspector.queryParamsObject.toolbarColor && WebInspector.queryParamsObject.textColor)
-        WebInspector.setToolbarColors(WebInspector.queryParamsObject.toolbarColor, WebInspector.queryParamsObject.textColor);
-
     WebInspector.shortcutsScreen = new WebInspector.ShortcutsScreen();
     this._registerShortcuts();
 

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 31c5f09595d985bbe1360cbebb3c9f20cfb5d4a8..f67fb73bbe109480c632193363a4ae101298f62a 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2011-11-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r100269.
+        http://trac.webkit.org/changeset/100269
+        https://bugs.webkit.org/show_bug.cgi?id=72383
+
+        "Broke dozens of tests due to exception in loadingFinished"
+        (Requested by tonyg-cr on #webkit).
+
+        * src/js/DevTools.js:
+        ():
+        (devtools.domContentLoaded):
+        (WebInspector.UIString):
+        (WebInspector.setToolbarColors):
+        (WebInspector.resetToolbarColors):
+        (.WebInspector.InspectorFrontendHostStub.prototype.inspectedURLChanged):
+
 2011-11-15  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: move generic code from DevTools.js into the WebCore.

diff --git a/Source/WebKit/chromium/src/js/DevTools.js b/Source/WebKit/chromium/src/js/DevTools.js
index 09e31b540632217965edd799f6b9ff4672cfdfc4..e90bdd259be18b4984cfe43a40d29fbfa29e13fb 100644 (file)
--- a/Source/WebKit/chromium/src/js/DevTools.js
+++ b/Source/WebKit/chromium/src/js/DevTools.js
@@ -29,10 +29,14 @@
  */
 
 /**
- * DevTools.js is responsible for configuring Web Inspector for the Chromium
- * port as well as additional features specific to the Chromium port.
+ * FIXME: change field naming style to use trailing underscore.
+ * @fileoverview Tools is a main class that wires all components of the
+ * DevTools frontend together. It is also responsible for overriding existing
+ * WebInspector functionality while it is getting upstreamed into WebCore.
  */
 
+var context = {};  // Used by WebCore's inspector routines.
+
 (function () {
     Preferences.ignoreWhitespace = false;
     Preferences.samplingCPUProfiler = true;
@@ -55,9 +59,46 @@
     Preferences.haveExtensions = true;
     Preferences.sharedWorkersDebugNote = "Shared workers can be inspected in the Task Manager";
     Preferences.localizeUI = false;
-    Preferences.applicationTitle = "Developer Tools - %s";
 })();
 
+// Recognize WebP as a valid image mime type.
+WebInspector.MIMETypes["image/webp"] = {2: true};
+
+var devtools = devtools || {};
+
+devtools.domContentLoaded = function()
+{
+    if (WebInspector.queryParamsObject.toolbarColor && WebInspector.queryParamsObject.textColor)
+        WebInspector.setToolbarColors(WebInspector.queryParamsObject.toolbarColor, WebInspector.queryParamsObject.textColor);
+}
+document.addEventListener("DOMContentLoaded", devtools.domContentLoaded, false);
+
+
+// FIXME: This needs to be upstreamed.
+(function InterceptProfilesPanelEvents()
+{
+    var oldShow = WebInspector.ProfilesPanel.prototype.show;
+    WebInspector.ProfilesPanel.prototype.show = function()
+    {
+        this.enableToggleButton.visible = false;
+        oldShow.call(this);
+        // Show is called on every show event of a panel, so
+        // we only need to intercept it once.
+        WebInspector.ProfilesPanel.prototype.show = oldShow;
+    };
+})();
+
+
+/*
+ * @override
+ * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.
+ */
+WebInspector.UIString = function(string)
+{
+    return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));
+};
+
+
 /** Pending WebKit upstream by apavlov). Fixes iframe vs drag problem. */
 (function()
 {
@@ -96,6 +137,40 @@
     };
 })();
 
+
+/////////////////////////////
+// Chromium theme support. //
+/////////////////////////////
+
+WebInspector.setToolbarColors = function(backgroundColor, color)
+{
+    if (!WebInspector._themeStyleElement) {
+        WebInspector._themeStyleElement = document.createElement("style");
+        document.head.appendChild(WebInspector._themeStyleElement);
+    }
+    WebInspector._themeStyleElement.textContent =
+        "#toolbar {\
+             background-image: none !important;\
+             background-color: " + backgroundColor + " !important;\
+         }\
+         \
+         .toolbar-label {\
+             color: " + color + " !important;\
+             text-shadow: none;\
+         }";
+}
+
+WebInspector.resetToolbarColors = function()
+{
+    if (WebInspector._themeStyleElement)
+        WebInspector._themeStyleElement.textContent = "";
+
+}
+
+////////////////////////////////////////////////////////
+// Platform-specific WebInspector extensions support. //
+////////////////////////////////////////////////////////
+
 WebInspector.platformExtensionAPI = function(tabId)
 {
     function getTabId()
@@ -123,3 +198,10 @@ WebInspector.setInspectedTabId = function(tabId)
 {
     WebInspector._inspectedTabId = tabId;
 }
+
+if (WebInspector.InspectorFrontendHostStub) {
+    WebInspector.InspectorFrontendHostStub.prototype.inspectedURLChanged = function(url)
+    {
+        document.title = "Developer Tools - " + url;
+    }
+}