2011-05-03 Pavel Feldman <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: combine status bar button glyphs.
        https://bugs.webkit.org/show_bug.cgi?id=59885

        * WebCore.gypi:
        * inspector/front-end/Images/breakpointsActivateButtonGlyph.png: Removed.
        * inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png: Removed.
        * inspector/front-end/Images/clearConsoleButtonGlyph.png: Removed.
        * inspector/front-end/Images/consoleButtonGlyph.png: Removed.
        * inspector/front-end/Images/dockButtonGlyph.png: Removed.
        * inspector/front-end/Images/enableOutlineButtonGlyph.png: Removed.
        * inspector/front-end/Images/enableSolidButtonGlyph.png: Removed.
        * inspector/front-end/Images/excludeButtonGlyph.png: Removed.
        * inspector/front-end/Images/focusButtonGlyph.png: Removed.
        * inspector/front-end/Images/garbageCollectButtonGlyph.png: Removed.
        * inspector/front-end/Images/gearButtonGlyph.png: Removed.
        * inspector/front-end/Images/helpButtonGlyph.png: Removed.
        * inspector/front-end/Images/largerResourcesButtonGlyph.png: Removed.
        * inspector/front-end/Images/nodeSearchButtonGlyph.png: Removed.
        * inspector/front-end/Images/pauseOnExceptionButtonGlyph.png: Removed.
        * inspector/front-end/Images/percentButtonGlyph.png: Removed.
        * inspector/front-end/Images/prettyPrintButtonGlyph.png: Removed.
        * inspector/front-end/Images/recordButtonGlyph.png: Removed.
        * inspector/front-end/Images/recordToggledButtonGlyph.png: Removed.
        * inspector/front-end/Images/reloadButtonGlyph.png: Removed.
        * inspector/front-end/Images/statusBarButtonGlyphs.png: Added.
        * inspector/front-end/Images/undockButtonGlyph.png: Removed.
        * inspector/front-end/WebKit.qrc:
        * inspector/front-end/inspector.css:
        (.status-bar-item > .glyph):
        (#dock-status-bar-item .glyph):
        (body.detached #dock-status-bar-item .glyph):
        (#console-status-bar-item .glyph):
        (.clear-status-bar-item .glyph):
        (button.enable-toggle-status-bar-item .glyph):
        (button.enable-toggle-status-bar-item.toggled-on .glyph):
        (.scripts-pause-on-exceptions-status-bar-item .glyph):
        (.scripts-toggle-pretty-print-status-bar-item .glyph):
        (.toggle-breakpoints .glyph):
        (.toggle-breakpoints.toggled-on .glyph):
        (.resources-larger-resources-status-bar-item .glyph):
        (.timeline-filter-status-bar-item .glyph):
        (.garbage-collect-status-bar-item .glyph):
        (.record-profile-status-bar-item .glyph):
        (.record-profile-status-bar-item.toggled-on .glyph):
        (.heap-snapshot-status-bar-item .glyph):
        (.node-search-status-bar-item .glyph):
        (.percent-time-status-bar-item .glyph):
        (.focus-profile-node-status-bar-item .glyph):
        (.exclude-profile-node-status-bar-item .glyph):
        (.reset-profile-status-bar-item .glyph):
        (.delete-storage-status-bar-item .glyph):
        (.refresh-storage-status-bar-item .glyph):
        * inspector/front-end/inspector.js:

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

Source/WebCore/ChangeLog

+2011-05-03  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: combine status bar button glyphs.
+        https://bugs.webkit.org/show_bug.cgi?id=59885
+
+        * WebCore.gypi:
+        * inspector/front-end/Images/breakpointsActivateButtonGlyph.png: Removed.
+        * inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png: Removed.
+        * inspector/front-end/Images/clearConsoleButtonGlyph.png: Removed.
+        * inspector/front-end/Images/consoleButtonGlyph.png: Removed.
+        * inspector/front-end/Images/dockButtonGlyph.png: Removed.
+        * inspector/front-end/Images/enableOutlineButtonGlyph.png: Removed.
+        * inspector/front-end/Images/enableSolidButtonGlyph.png: Removed.
+        * inspector/front-end/Images/excludeButtonGlyph.png: Removed.
+        * inspector/front-end/Images/focusButtonGlyph.png: Removed.
+        * inspector/front-end/Images/garbageCollectButtonGlyph.png: Removed.
+        * inspector/front-end/Images/gearButtonGlyph.png: Removed.
+        * inspector/front-end/Images/helpButtonGlyph.png: Removed.
+        * inspector/front-end/Images/largerResourcesButtonGlyph.png: Removed.
+        * inspector/front-end/Images/nodeSearchButtonGlyph.png: Removed.
+        * inspector/front-end/Images/pauseOnExceptionButtonGlyph.png: Removed.
+        * inspector/front-end/Images/percentButtonGlyph.png: Removed.
+        * inspector/front-end/Images/prettyPrintButtonGlyph.png: Removed.
+        * inspector/front-end/Images/recordButtonGlyph.png: Removed.
+        * inspector/front-end/Images/recordToggledButtonGlyph.png: Removed.
+        * inspector/front-end/Images/reloadButtonGlyph.png: Removed.
+        * inspector/front-end/Images/statusBarButtonGlyphs.png: Added.
+        * inspector/front-end/Images/undockButtonGlyph.png: Removed.
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.css:
+        (.status-bar-item > .glyph):
+        (#dock-status-bar-item .glyph):
+        (body.detached #dock-status-bar-item .glyph):
+        (#console-status-bar-item .glyph):
+        (.clear-status-bar-item .glyph):
+        (button.enable-toggle-status-bar-item .glyph):
+        (button.enable-toggle-status-bar-item.toggled-on .glyph):
+        (.scripts-pause-on-exceptions-status-bar-item .glyph):
+        (.scripts-toggle-pretty-print-status-bar-item .glyph):
+        (.toggle-breakpoints .glyph):
+        (.toggle-breakpoints.toggled-on .glyph):
+        (.resources-larger-resources-status-bar-item .glyph):
+        (.timeline-filter-status-bar-item .glyph):
+        (.garbage-collect-status-bar-item .glyph):
+        (.record-profile-status-bar-item .glyph):
+        (.record-profile-status-bar-item.toggled-on .glyph):
+        (.heap-snapshot-status-bar-item .glyph):
+        (.node-search-status-bar-item .glyph):
+        (.percent-time-status-bar-item .glyph):
+        (.focus-profile-node-status-bar-item .glyph):
+        (.exclude-profile-node-status-bar-item .glyph):
+        (.reset-profile-status-bar-item .glyph):
+        (.delete-storage-status-bar-item .glyph):
+        (.refresh-storage-status-bar-item .glyph):
+        * inspector/front-end/inspector.js:
+
 2011-05-02  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dan Bernstein.

Source/WebCore/WebCore.gypi

@@ -6231,12 +6231,8 @@
             'inspector/front-end/Images/breakpointConditionalBorder.png',
             'inspector/front-end/Images/breakpointConditionalCounterBorder.png',
             'inspector/front-end/Images/breakpointCounterBorder.png',
-            'inspector/front-end/Images/breakpointsActivateButtonGlyph.png',
-            'inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png',
             'inspector/front-end/Images/checker.png',
-            'inspector/front-end/Images/clearConsoleButtonGlyph.png',
             'inspector/front-end/Images/closeButtons.png',
-            'inspector/front-end/Images/consoleButtonGlyph.png',
             'inspector/front-end/Images/consoleIcon.png',
             'inspector/front-end/Images/cookie.png',
             'inspector/front-end/Images/database.png',
@@ -6255,18 +6251,12 @@
             'inspector/front-end/Images/disclosureTriangleSmallRightDownBlack.png',
             'inspector/front-end/Images/disclosureTriangleSmallRightDownWhite.png',
             'inspector/front-end/Images/disclosureTriangleSmallRightWhite.png',
-            'inspector/front-end/Images/dockButtonGlyph.png',
             'inspector/front-end/Images/elementsIcon.png',
-            'inspector/front-end/Images/enableOutlineButtonGlyph.png',
-            'inspector/front-end/Images/enableSolidButtonGlyph.png',
             'inspector/front-end/Images/errorIcon.png',
             'inspector/front-end/Images/errorMediumIcon.png',
             'inspector/front-end/Images/errorRedDot.png',
-            'inspector/front-end/Images/excludeButtonGlyph.png',
-            'inspector/front-end/Images/focusButtonGlyph.png',
             'inspector/front-end/Images/forward.png',
             'inspector/front-end/Images/frame.png',
-            'inspector/front-end/Images/gearButtonGlyph.png',
             'inspector/front-end/Images/glossyHeader.png',
             'inspector/front-end/Images/glossyHeaderPressed.png',
             'inspector/front-end/Images/glossyHeaderSelected.png',
@@ -6274,22 +6264,15 @@
             'inspector/front-end/Images/goArrow.png',
             'inspector/front-end/Images/graphLabelCalloutLeft.png',
             'inspector/front-end/Images/graphLabelCalloutRight.png',
-            'inspector/front-end/Images/helpButtonGlyph.png',
-            'inspector/front-end/Images/largerResourcesButtonGlyph.png',
-            'inspector/front-end/Images/garbageCollectButtonGlyph.png',
             'inspector/front-end/Images/localStorage.png',
             'inspector/front-end/Images/networkIcon.png',
-            'inspector/front-end/Images/nodeSearchButtonGlyph.png',
             'inspector/front-end/Images/paneAddButtons.png',
             'inspector/front-end/Images/paneBottomGrow.png',
             'inspector/front-end/Images/paneBottomGrowActive.png',
             'inspector/front-end/Images/paneGrowHandleLine.png',
             'inspector/front-end/Images/paneSettingsButtons.png',
-            'inspector/front-end/Images/pauseOnExceptionButtonGlyph.png',
-            'inspector/front-end/Images/percentButtonGlyph.png',
             'inspector/front-end/Images/popoverArrows.png',
             'inspector/front-end/Images/popoverBackground.png',
-            'inspector/front-end/Images/prettyPrintButtonGlyph.png',
             'inspector/front-end/Images/profileGroupIcon.png',
             'inspector/front-end/Images/profileIcon.png',
             'inspector/front-end/Images/profilesIcon.png',
@@ -6297,9 +6280,6 @@
             'inspector/front-end/Images/profilesSilhouette.png',
             'inspector/front-end/Images/programCounterBorder.png',
             'inspector/front-end/Images/radioDot.png',
-            'inspector/front-end/Images/recordButtonGlyph.png',
-            'inspector/front-end/Images/recordToggledButtonGlyph.png',
-            'inspector/front-end/Images/reloadButtonGlyph.png',
             'inspector/front-end/Images/resourceCSSIcon.png',
             'inspector/front-end/Images/resourceDocumentIcon.png',
             'inspector/front-end/Images/resourceDocumentIconSmall.png',
@@ -6327,6 +6307,7 @@
             'inspector/front-end/Images/splitviewDividerBackground.png',
             'inspector/front-end/Images/statusbarBackground.png',
             'inspector/front-end/Images/statusbarBottomBackground.png',
+            'inspector/front-end/Images/statusbarButtonGlyphs.png',
             'inspector/front-end/Images/statusbarButtons.png',
             'inspector/front-end/Images/statusbarMenuButton.png',
             'inspector/front-end/Images/statusbarMenuButtonSelected.png',
@@ -6372,7 +6353,6 @@
             'inspector/front-end/Images/treeRightTriangleWhite.png',
             'inspector/front-end/Images/treeUpTriangleBlack.png',
             'inspector/front-end/Images/treeUpTriangleWhite.png',
-            'inspector/front-end/Images/undockButtonGlyph.png',
             'inspector/front-end/Images/userInputIcon.png',
             'inspector/front-end/Images/userInputPreviousIcon.png',
             'inspector/front-end/Images/userInputResultIcon.png',

Source/WebCore/inspector/front-end/WebKit.qrc

@@ -144,12 +144,8 @@
     <file>Images/breakpointConditionalBorder.png</file>
     <file>Images/breakpointConditionalCounterBorder.png</file>
     <file>Images/breakpointCounterBorder.png</file>
-    <file>Images/breakpointsActivateButtonGlyph.png</file>
-    <file>Images/breakpointsDeactivateButtonGlyph.png</file>
     <file>Images/checker.png</file>
-    <file>Images/clearConsoleButtonGlyph.png</file>
     <file>Images/closeButtons.png</file>
-    <file>Images/consoleButtonGlyph.png</file>
     <file>Images/cookie.png</file>
     <file>Images/consoleIcon.png</file>
     <file>Images/database.png</file>
@@ -168,19 +164,12 @@
     <file>Images/disclosureTriangleSmallRightDownBlack.png</file>
     <file>Images/disclosureTriangleSmallRightDownWhite.png</file>
     <file>Images/disclosureTriangleSmallRightWhite.png</file>
-    <file>Images/dockButtonGlyph.png</file>
     <file>Images/elementsIcon.png</file>
-    <file>Images/enableOutlineButtonGlyph.png</file>
-    <file>Images/enableSolidButtonGlyph.png</file>
     <file>Images/errorIcon.png</file>
     <file>Images/errorMediumIcon.png</file>
     <file>Images/errorRedDot.png</file>
-    <file>Images/excludeButtonGlyph.png</file>
-    <file>Images/focusButtonGlyph.png</file>
     <file>Images/forward.png</file>
     <file>Images/frame.png</file>
-    <file>Images/garbageCollectButtonGlyph.png</file>
-    <file>Images/gearButtonGlyph.png</file>
     <file>Images/glossyHeader.png</file>
     <file>Images/glossyHeaderPressed.png</file>
     <file>Images/glossyHeaderSelected.png</file>
@@ -188,20 +177,15 @@
     <file>Images/goArrow.png</file>
     <file>Images/graphLabelCalloutLeft.png</file>
     <file>Images/graphLabelCalloutRight.png</file>
-    <file>Images/largerResourcesButtonGlyph.png</file>
     <file>Images/localStorage.png</file>
     <file>Images/networkIcon.png</file>
-    <file>Images/nodeSearchButtonGlyph.png</file>
     <file>Images/paneAddButtons.png</file>
     <file>Images/paneBottomGrow.png</file>
     <file>Images/paneBottomGrowActive.png</file>
     <file>Images/paneGrowHandleLine.png</file>
     <file>Images/paneSettingsButtons.png</file>
-    <file>Images/pauseOnExceptionButtonGlyph.png</file>
-    <file>Images/percentButtonGlyph.png</file>
     <file>Images/popoverArrows.png</file>
     <file>Images/popoverBackground.png</file>
-    <file>Images/prettyPrintButtonGlyph.png</file>
     <file>Images/profileGroupIcon.png</file>
     <file>Images/profileIcon.png</file>
     <file>Images/profilesIcon.png</file>
@@ -209,9 +193,6 @@
     <file>Images/profilesSilhouette.png</file>
     <file>Images/programCounterBorder.png</file>
     <file>Images/radioDot.png</file>
-    <file>Images/recordButtonGlyph.png</file>
-    <file>Images/recordToggledButtonGlyph.png</file>
-    <file>Images/reloadButtonGlyph.png</file>
     <file>Images/resourceCSSIcon.png</file>
     <file>Images/resourceDocumentIcon.png</file>
     <file>Images/resourceDocumentIconSmall.png</file>
@@ -240,6 +221,7 @@
     <file>Images/statusbarBackground.png</file>
     <file>Images/statusbarBottomBackground.png</file>
     <file>Images/statusbarButtons.png</file>
+    <file>Images/statusbarButtonGlyphs.png</file>
     <file>Images/statusbarMenuButton.png</file>
     <file>Images/statusbarMenuButtonSelected.png</file>
     <file>Images/statusbarResizerHorizontal.png</file>
@@ -284,7 +266,6 @@
     <file>Images/treeRightTriangleWhite.png</file>
     <file>Images/treeUpTriangleBlack.png</file>
     <file>Images/treeUpTriangleWhite.png</file>
-    <file>Images/undockButtonGlyph.png</file>
     <file>Images/userInputIcon.png</file>
     <file>Images/userInputPreviousIcon.png</file>
     <file>Images/userInputResultIcon.png</file>

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

@@ -521,12 +521,16 @@ select.status-bar-item:active {
     -webkit-border-image: url(Images/statusbarMenuButtonSelected.png) 0 17 0 2;
 }
 
+.status-bar-item > .glyph {
+    -webkit-mask-image: url(Images/statusbarButtonGlyphs.png);
+}
+
 #dock-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/undockButtonGlyph.png);
+    -webkit-mask-position: 0 -48px;
 }
 
 body.detached #dock-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/dockButtonGlyph.png);
+    -webkit-mask-position: -32px -24px;
 }
 
 body.port-qt #dock-status-bar-item {
@@ -534,11 +538,11 @@ body.port-qt #dock-status-bar-item {
 }
 
 #console-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/consoleButtonGlyph.png);
+    -webkit-mask-position: -64px -24px;
 }
 
 .clear-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
+    -webkit-mask-position: -64px 0;
 }
 
 #counters {
@@ -2540,15 +2544,15 @@ body.inactive .panel-enabler-view button:not(.status-bar-item), .panel-enabler-v
 }
 
 button.enable-toggle-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/enableOutlineButtonGlyph.png);
+    -webkit-mask-position: -192px 0;
 }
 
 button.enable-toggle-status-bar-item.toggled-on .glyph {
-    -webkit-mask-image: url(Images/enableSolidButtonGlyph.png);
+    -webkit-mask-position: -96px -24px;
 }
 
 .scripts-pause-on-exceptions-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/pauseOnExceptionButtonGlyph.png);
+    -webkit-mask-position: -256px 0;
 }
 
 .scripts-pause-on-exceptions-status-bar-item.toggled-all .glyph {
@@ -2560,7 +2564,7 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
 }
 
 .scripts-toggle-pretty-print-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/prettyPrintButtonGlyph.png);
+    -webkit-mask-position: -256px -24px;
 }
 
 .scripts-toggle-pretty-print-status-bar-item.toggled .glyph {
@@ -2620,12 +2624,13 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
 }
 
 .toggle-breakpoints .glyph {
-    -webkit-mask-image: url(Images/breakpointsActivateButtonGlyph.png);
+    -webkit-mask-image: url(Images/statusbarButtonGlyphs.png);
+    -webkit-mask-position: -32px 0;
     background-color: rgb(96, 96, 96) !important;
 }
 
 .toggle-breakpoints.toggled-on .glyph {
-    -webkit-mask-image: url(Images/breakpointsDeactivateButtonGlyph.png);
+    -webkit-mask-position: 0 -24px;
 }
 
 #scripts-debugger-status {
@@ -2693,7 +2698,7 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
 }
 
 .resources-larger-resources-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
+    -webkit-mask-position: -224px 0;
 }
 
 #resources-filter, #console-filter.console-filter-top {
@@ -3975,7 +3980,7 @@ body.inactive li.selected .bubble.search-matches {
 }
 
 .timeline-filter-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
+    -webkit-mask-position: -224px 0;
 }
 
 .timeline-filter-status-bar-item.toggled-on .glyph {
@@ -3983,7 +3988,7 @@ body.inactive li.selected .bubble.search-matches {
 }
 
 .garbage-collect-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/garbageCollectButtonGlyph.png);
+    -webkit-mask-position: -128px -24px;
 }
 
 .timeline-records-counter, .storage-application-cache-status, .storage-application-cache-connectivity {
@@ -4115,45 +4120,45 @@ button.enable-toggle-status-bar-item .glyph {
 }
 
 .record-profile-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/recordButtonGlyph.png);
+    -webkit-mask-position: -288px 0;
 }
 
 .record-profile-status-bar-item.toggled-on .glyph {
-    -webkit-mask-image: url(Images/recordToggledButtonGlyph.png);
+    -webkit-mask-position: -288px -24px;
     background-color: rgb(216, 0, 0) !important;
 }
 
 /* FIXME: should have its own glyph. */
 .heap-snapshot-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/focusButtonGlyph.png);
+    -webkit-mask-position: -96px 0;
 }
 
 .node-search-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/nodeSearchButtonGlyph.png);
+    -webkit-mask-position: -224px -24px;
 }
 
 .percent-time-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/percentButtonGlyph.png);
+    -webkit-mask-position: -192px -24px;
 }
 
 .focus-profile-node-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/focusButtonGlyph.png);
+    -webkit-mask-position: -96px 0;
 }
 
 .exclude-profile-node-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/excludeButtonGlyph.png);
+    -webkit-mask-position: -128px 0;
 }
 
 .reset-profile-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/reloadButtonGlyph.png);
+    -webkit-mask-position: 0 0;
 }
 
 .delete-storage-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/excludeButtonGlyph.png);
+    -webkit-mask-position: -128px 0;
 }
 
 .refresh-storage-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/reloadButtonGlyph.png);
+    -webkit-mask-position: 0 0;
 }
 
 ol.breakpoint-list {

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

@@ -31,21 +31,7 @@
 // Keep this ; so that concatenated version of the script worked.
 ;(function preloadImages()
 {
-    (new Image()).src = "Images/clearConsoleButtonGlyph.png";
-    (new Image()).src = "Images/consoleButtonGlyph.png";
-    (new Image()).src = "Images/dockButtonGlyph.png";
-    (new Image()).src = "Images/enableOutlineButtonGlyph.png";
-    (new Image()).src = "Images/enableSolidButtonGlyph.png";
-    (new Image()).src = "Images/excludeButtonGlyph.png";
-    (new Image()).src = "Images/focusButtonGlyph.png";
-    (new Image()).src = "Images/largerResourcesButtonGlyph.png";
-    (new Image()).src = "Images/nodeSearchButtonGlyph.png";
-    (new Image()).src = "Images/pauseOnExceptionButtonGlyph.png";
-    (new Image()).src = "Images/percentButtonGlyph.png";
-    (new Image()).src = "Images/recordButtonGlyph.png";
-    (new Image()).src = "Images/recordToggledButtonGlyph.png";
-    (new Image()).src = "Images/reloadButtonGlyph.png";
-    (new Image()).src = "Images/undockButtonGlyph.png";
+    (new Image()).src = "Images/statusbarButtonGlyphs.png";
 })();
 
 var WebInspector = {