Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

1 files changed, 20 insertions, 67 deletions

diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index a530fe5..59b88db 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -190,6 +190,23 @@ WebInspector.loaded = function()
     InspectorFrontendHost.loaded();
 };
 
+devtools.domContentLoaded = function()
+{
+    var queryParams = window.location.search;
+    if (queryParams) {
+        var params = queryParams.substring(1).split("&");
+        var paramsObject = {};
+        for (var i = 0; i < params.length; ++i) {
+            var pair = params[i].split("=");
+            paramsObject[pair[0]] = pair[1];
+        }
+        WebInspector.setAttachedWindow(paramsObject.docked);
+        if (paramsObject.toolbar_color && paramsObject.text_color)
+            WebInspector.setToolbarColors(paramsObject.toolbar_color, paramsObject.text_color);
+    }
+}
+document.addEventListener("DOMContentLoaded", devtools.domContentLoaded, false);
+
 
 if (!window.v8ScriptDebugServerEnabled) {
 
@@ -415,78 +432,14 @@ WebInspector.setToolbarColors = function(backgroundColor, color)
         document.head.appendChild(WebInspector._themeStyleElement);
     }
     WebInspector._themeStyleElement.textContent =
-        "body #toolbar, body.inactive #toolbar {\
+        "#toolbar {\
              background-image: none !important;\
              background-color: " + backgroundColor + " !important;\
          }\
          \
-         body .status-bar {\
-             background-image: url(Images/statusbarBackgroundChromium2.png) !important;\
-             background-color: " + backgroundColor + " !important;\
-         }\
-         \
-         body button.status-bar-item {\
-             background-image: none !important;\
-         }\
-         \
-         button.status-bar-item {\
-             background-image: none;\
-             border-right: 1px solid " + backgroundColor + ";\
-         }\
-         \
-         .status-bar {\
-             background-image: none;\
-             color: " + color + ";\
-         }\
-         \
-         body #drawer {\
-             background-image: none !important;\
-         }\
-         \
-         #drawer-status-bar {\
-             background-image: url(Images/statusbarBackgroundChromium2.png);\
-             background-color: " + backgroundColor + ";\
-         }\
-         \
-         \
-         body.drawer-visible #main-status-bar {\
-             background-image: url(Images/statusbarBackgroundChromium2.png) !important;\
-         }\
-         \
-         body .crumbs .crumb, body .crumbs .crumb.end {\
-             -webkit-border-image: url(Images/segmentChromium2.png) 0 12 0 2 !important;\
-             background-color: " + backgroundColor + " !important;\
-         }\
-         \
-         body .crumbs .crumb:hover, body .crumbs .crumb.dimmed:hover {\
-             -webkit-border-image: url(Images/segmentHoverChromium2.png) 0 12 0 2 !important;\
-         }\
-         \
-         body .crumbs .crumb.end {\
-             -webkit-border-image: url(Images/segmentChromium2.png) 0 12 0 2 !important;\
-         }\
-         \
-         body .crumbs .crumb.selected:hover, body .crumbs .crumb.selected.end, .crumbs .crumb.selected.end:hover {\
-             -webkit-border-image: url(Images/segmentSelectedChromium2.png) 0 12 0 2 !important;\
-         }\
-         \
-         body select.status-bar-item {\
-             -webkit-border-image: url(Images/statusbarMenuButtonChromium2.png) 0 17 0 2 !important;\
-             background-color: " + backgroundColor + " !important;\
-             text-shadow: none !important;\
-         }\
-         \
-         .glyph {\
-             background-color: " + color + ";\
-         }\
-         \
-         button.status-bar-item .glyph.shadow {\
-             display: none;\
-         }\
-         \
-         .crumbs, .crumbs .crumb:hover, #drawer .scope-bar:not(.console-filter-top) li, .toolbar-label, select.status-bar-item {\
+         .toolbar-label {\
+             color: " + color + " !important;\
              text-shadow: none;\
-             color: " + color + ";\
          }";
 }