Changeset 85587 in webkit


Ignore:
Timestamp:
May 3, 2011 12:52:39 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

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:
Location:
trunk/Source/WebCore
Files:
1 added
21 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85586 r85587  
     12011-05-03  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: combine status bar button glyphs.
     6        https://bugs.webkit.org/show_bug.cgi?id=59885
     7
     8        * WebCore.gypi:
     9        * inspector/front-end/Images/breakpointsActivateButtonGlyph.png: Removed.
     10        * inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png: Removed.
     11        * inspector/front-end/Images/clearConsoleButtonGlyph.png: Removed.
     12        * inspector/front-end/Images/consoleButtonGlyph.png: Removed.
     13        * inspector/front-end/Images/dockButtonGlyph.png: Removed.
     14        * inspector/front-end/Images/enableOutlineButtonGlyph.png: Removed.
     15        * inspector/front-end/Images/enableSolidButtonGlyph.png: Removed.
     16        * inspector/front-end/Images/excludeButtonGlyph.png: Removed.
     17        * inspector/front-end/Images/focusButtonGlyph.png: Removed.
     18        * inspector/front-end/Images/garbageCollectButtonGlyph.png: Removed.
     19        * inspector/front-end/Images/gearButtonGlyph.png: Removed.
     20        * inspector/front-end/Images/helpButtonGlyph.png: Removed.
     21        * inspector/front-end/Images/largerResourcesButtonGlyph.png: Removed.
     22        * inspector/front-end/Images/nodeSearchButtonGlyph.png: Removed.
     23        * inspector/front-end/Images/pauseOnExceptionButtonGlyph.png: Removed.
     24        * inspector/front-end/Images/percentButtonGlyph.png: Removed.
     25        * inspector/front-end/Images/prettyPrintButtonGlyph.png: Removed.
     26        * inspector/front-end/Images/recordButtonGlyph.png: Removed.
     27        * inspector/front-end/Images/recordToggledButtonGlyph.png: Removed.
     28        * inspector/front-end/Images/reloadButtonGlyph.png: Removed.
     29        * inspector/front-end/Images/statusBarButtonGlyphs.png: Added.
     30        * inspector/front-end/Images/undockButtonGlyph.png: Removed.
     31        * inspector/front-end/WebKit.qrc:
     32        * inspector/front-end/inspector.css:
     33        (.status-bar-item > .glyph):
     34        (#dock-status-bar-item .glyph):
     35        (body.detached #dock-status-bar-item .glyph):
     36        (#console-status-bar-item .glyph):
     37        (.clear-status-bar-item .glyph):
     38        (button.enable-toggle-status-bar-item .glyph):
     39        (button.enable-toggle-status-bar-item.toggled-on .glyph):
     40        (.scripts-pause-on-exceptions-status-bar-item .glyph):
     41        (.scripts-toggle-pretty-print-status-bar-item .glyph):
     42        (.toggle-breakpoints .glyph):
     43        (.toggle-breakpoints.toggled-on .glyph):
     44        (.resources-larger-resources-status-bar-item .glyph):
     45        (.timeline-filter-status-bar-item .glyph):
     46        (.garbage-collect-status-bar-item .glyph):
     47        (.record-profile-status-bar-item .glyph):
     48        (.record-profile-status-bar-item.toggled-on .glyph):
     49        (.heap-snapshot-status-bar-item .glyph):
     50        (.node-search-status-bar-item .glyph):
     51        (.percent-time-status-bar-item .glyph):
     52        (.focus-profile-node-status-bar-item .glyph):
     53        (.exclude-profile-node-status-bar-item .glyph):
     54        (.reset-profile-status-bar-item .glyph):
     55        (.delete-storage-status-bar-item .glyph):
     56        (.refresh-storage-status-bar-item .glyph):
     57        * inspector/front-end/inspector.js:
     58
    1592011-05-02  Simon Fraser  <simon.fraser@apple.com>
    260

  • trunk/Source/WebCore/WebCore.gypi

    r85492 r85587  
    62326232            'inspector/front-end/Images/breakpointConditionalCounterBorder.png',
    62336233            'inspector/front-end/Images/breakpointCounterBorder.png',
    6234             'inspector/front-end/Images/breakpointsActivateButtonGlyph.png',
    6235             'inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png',
    62366234            'inspector/front-end/Images/checker.png',
    6237             'inspector/front-end/Images/clearConsoleButtonGlyph.png',
    62386235            'inspector/front-end/Images/closeButtons.png',
    6239             'inspector/front-end/Images/consoleButtonGlyph.png',
    62406236            'inspector/front-end/Images/consoleIcon.png',
    62416237            'inspector/front-end/Images/cookie.png',
    … …  
    62566252            'inspector/front-end/Images/disclosureTriangleSmallRightDownWhite.png',
    62576253            'inspector/front-end/Images/disclosureTriangleSmallRightWhite.png',
    6258             'inspector/front-end/Images/dockButtonGlyph.png',
    62596254            'inspector/front-end/Images/elementsIcon.png',
    6260             'inspector/front-end/Images/enableOutlineButtonGlyph.png',
    6261             'inspector/front-end/Images/enableSolidButtonGlyph.png',
    62626255            'inspector/front-end/Images/errorIcon.png',
    62636256            'inspector/front-end/Images/errorMediumIcon.png',
    62646257            'inspector/front-end/Images/errorRedDot.png',
    6265             'inspector/front-end/Images/excludeButtonGlyph.png',
    6266             'inspector/front-end/Images/focusButtonGlyph.png',
    62676258            'inspector/front-end/Images/forward.png',
    62686259            'inspector/front-end/Images/frame.png',
    6269             'inspector/front-end/Images/gearButtonGlyph.png',
    62706260            'inspector/front-end/Images/glossyHeader.png',
    62716261            'inspector/front-end/Images/glossyHeaderPressed.png',
    … …  
    62756265            'inspector/front-end/Images/graphLabelCalloutLeft.png',
    62766266            'inspector/front-end/Images/graphLabelCalloutRight.png',
    6277             'inspector/front-end/Images/helpButtonGlyph.png',
    6278             'inspector/front-end/Images/largerResourcesButtonGlyph.png',
    6279             'inspector/front-end/Images/garbageCollectButtonGlyph.png',
    62806267            'inspector/front-end/Images/localStorage.png',
    62816268            'inspector/front-end/Images/networkIcon.png',
    6282             'inspector/front-end/Images/nodeSearchButtonGlyph.png',
    62836269            'inspector/front-end/Images/paneAddButtons.png',
    62846270            'inspector/front-end/Images/paneBottomGrow.png',
    … …  
    62866272            'inspector/front-end/Images/paneGrowHandleLine.png',
    62876273            'inspector/front-end/Images/paneSettingsButtons.png',
    6288             'inspector/front-end/Images/pauseOnExceptionButtonGlyph.png',
    6289             'inspector/front-end/Images/percentButtonGlyph.png',
    62906274            'inspector/front-end/Images/popoverArrows.png',
    62916275            'inspector/front-end/Images/popoverBackground.png',
    6292             'inspector/front-end/Images/prettyPrintButtonGlyph.png',
    62936276            'inspector/front-end/Images/profileGroupIcon.png',
    62946277            'inspector/front-end/Images/profileIcon.png',
    … …  
    62986281            'inspector/front-end/Images/programCounterBorder.png',
    62996282            'inspector/front-end/Images/radioDot.png',
    6300             'inspector/front-end/Images/recordButtonGlyph.png',
    6301             'inspector/front-end/Images/recordToggledButtonGlyph.png',
    6302             'inspector/front-end/Images/reloadButtonGlyph.png',
    63036283            'inspector/front-end/Images/resourceCSSIcon.png',
    63046284            'inspector/front-end/Images/resourceDocumentIcon.png',
    … …  
    63286308            'inspector/front-end/Images/statusbarBackground.png',
    63296309            'inspector/front-end/Images/statusbarBottomBackground.png',
     6310            'inspector/front-end/Images/statusbarButtonGlyphs.png',
    63306311            'inspector/front-end/Images/statusbarButtons.png',
    63316312            'inspector/front-end/Images/statusbarMenuButton.png',
    … …  
    63736354            'inspector/front-end/Images/treeUpTriangleBlack.png',
    63746355            'inspector/front-end/Images/treeUpTriangleWhite.png',
    6375             'inspector/front-end/Images/undockButtonGlyph.png',
    63766356            'inspector/front-end/Images/userInputIcon.png',
    63776357            'inspector/front-end/Images/userInputPreviousIcon.png',

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

    r85191 r85587  
    145145    <file>Images/breakpointConditionalCounterBorder.png</file>
    146146    <file>Images/breakpointCounterBorder.png</file>
    147     <file>Images/breakpointsActivateButtonGlyph.png</file>
    148     <file>Images/breakpointsDeactivateButtonGlyph.png</file>
    149147    <file>Images/checker.png</file>
    150     <file>Images/clearConsoleButtonGlyph.png</file>
    151148    <file>Images/closeButtons.png</file>
    152     <file>Images/consoleButtonGlyph.png</file>
    153149    <file>Images/cookie.png</file>
    154150    <file>Images/consoleIcon.png</file>
    … …  
    169165    <file>Images/disclosureTriangleSmallRightDownWhite.png</file>
    170166    <file>Images/disclosureTriangleSmallRightWhite.png</file>
    171     <file>Images/dockButtonGlyph.png</file>
    172167    <file>Images/elementsIcon.png</file>
    173     <file>Images/enableOutlineButtonGlyph.png</file>
    174     <file>Images/enableSolidButtonGlyph.png</file>
    175168    <file>Images/errorIcon.png</file>
    176169    <file>Images/errorMediumIcon.png</file>
    177170    <file>Images/errorRedDot.png</file>
    178     <file>Images/excludeButtonGlyph.png</file>
    179     <file>Images/focusButtonGlyph.png</file>
    180171    <file>Images/forward.png</file>
    181172    <file>Images/frame.png</file>
    182     <file>Images/garbageCollectButtonGlyph.png</file>
    183     <file>Images/gearButtonGlyph.png</file>
    184173    <file>Images/glossyHeader.png</file>
    185174    <file>Images/glossyHeaderPressed.png</file>
    … …  
    189178    <file>Images/graphLabelCalloutLeft.png</file>
    190179    <file>Images/graphLabelCalloutRight.png</file>
    191     <file>Images/largerResourcesButtonGlyph.png</file>
    192180    <file>Images/localStorage.png</file>
    193181    <file>Images/networkIcon.png</file>
    194     <file>Images/nodeSearchButtonGlyph.png</file>
    195182    <file>Images/paneAddButtons.png</file>
    196183    <file>Images/paneBottomGrow.png</file>
    … …  
    198185    <file>Images/paneGrowHandleLine.png</file>
    199186    <file>Images/paneSettingsButtons.png</file>
    200     <file>Images/pauseOnExceptionButtonGlyph.png</file>
    201     <file>Images/percentButtonGlyph.png</file>
    202187    <file>Images/popoverArrows.png</file>
    203188    <file>Images/popoverBackground.png</file>
    204     <file>Images/prettyPrintButtonGlyph.png</file>
    205189    <file>Images/profileGroupIcon.png</file>
    206190    <file>Images/profileIcon.png</file>
    … …  
    210194    <file>Images/programCounterBorder.png</file>
    211195    <file>Images/radioDot.png</file>
    212     <file>Images/recordButtonGlyph.png</file>
    213     <file>Images/recordToggledButtonGlyph.png</file>
    214     <file>Images/reloadButtonGlyph.png</file>
    215196    <file>Images/resourceCSSIcon.png</file>
    216197    <file>Images/resourceDocumentIcon.png</file>
    … …  
    241222    <file>Images/statusbarBottomBackground.png</file>
    242223    <file>Images/statusbarButtons.png</file>
     224    <file>Images/statusbarButtonGlyphs.png</file>
    243225    <file>Images/statusbarMenuButton.png</file>
    244226    <file>Images/statusbarMenuButtonSelected.png</file>
    … …  
    285267    <file>Images/treeUpTriangleBlack.png</file>
    286268    <file>Images/treeUpTriangleWhite.png</file>
    287     <file>Images/undockButtonGlyph.png</file>
    288269    <file>Images/userInputIcon.png</file>
    289270    <file>Images/userInputPreviousIcon.png</file>

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

    r85402 r85587  
    522522}
    523523
     524.status-bar-item > .glyph {
     525    -webkit-mask-image: url(Images/statusbarButtonGlyphs.png);
     526}
     527
    524528#dock-status-bar-item .glyph {
    525     -webkit-mask-image: url(Images/undockButtonGlyph.png);
     529    -webkit-mask-position: 0 -48px;
    526530}
    527531
    528532body.detached #dock-status-bar-item .glyph {
    529     -webkit-mask-image: url(Images/dockButtonGlyph.png);
     533    -webkit-mask-position: -32px -24px;
    530534}
    531535
    … …  
    535539
    536540#console-status-bar-item .glyph {
    537     -webkit-mask-image: url(Images/consoleButtonGlyph.png);
     541    -webkit-mask-position: -64px -24px;
    538542}
    539543
    540544.clear-status-bar-item .glyph {
    541     -webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
     545    -webkit-mask-position: -64px 0;
    542546}
    543547
    … …  
    25412545
    25422546button.enable-toggle-status-bar-item .glyph {
    2543     -webkit-mask-image: url(Images/enableOutlineButtonGlyph.png);
     2547    -webkit-mask-position: -192px 0;
    25442548}
    25452549
    25462550button.enable-toggle-status-bar-item.toggled-on .glyph {
    2547     -webkit-mask-image: url(Images/enableSolidButtonGlyph.png);
     2551    -webkit-mask-position: -96px -24px;
    25482552}
    25492553
    25502554.scripts-pause-on-exceptions-status-bar-item .glyph {
    2551     -webkit-mask-image: url(Images/pauseOnExceptionButtonGlyph.png);
     2555    -webkit-mask-position: -256px 0;
    25522556}
    25532557
    … …  
    25612565
    25622566.scripts-toggle-pretty-print-status-bar-item .glyph {
    2563     -webkit-mask-image: url(Images/prettyPrintButtonGlyph.png);
     2567    -webkit-mask-position: -256px -24px;
    25642568}
    25652569
    … …  
    26212625
    26222626.toggle-breakpoints .glyph {
    2623     -webkit-mask-image: url(Images/breakpointsActivateButtonGlyph.png);
     2627    -webkit-mask-image: url(Images/statusbarButtonGlyphs.png);
     2628    -webkit-mask-position: -32px 0;
    26242629    background-color: rgb(96, 96, 96) !important;
    26252630}
    26262631
    26272632.toggle-breakpoints.toggled-on .glyph {
    2628     -webkit-mask-image: url(Images/breakpointsDeactivateButtonGlyph.png);
     2633    -webkit-mask-position: 0 -24px;
    26292634}
    26302635
    … …  
    26942699
    26952700.resources-larger-resources-status-bar-item .glyph {
    2696     -webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
     2701    -webkit-mask-position: -224px 0;
    26972702}
    26982703
    … …  
    39763981
    39773982.timeline-filter-status-bar-item .glyph {
    3978     -webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
     3983    -webkit-mask-position: -224px 0;
    39793984}
    39803985
    … …  
    39843989
    39853990.garbage-collect-status-bar-item .glyph {
    3986     -webkit-mask-image: url(Images/garbageCollectButtonGlyph.png);
     3991    -webkit-mask-position: -128px -24px;
    39873992}
    39883993
    … …  
    41164121
    41174122.record-profile-status-bar-item .glyph {
    4118     -webkit-mask-image: url(Images/recordButtonGlyph.png);
     4123    -webkit-mask-position: -288px 0;
    41194124}
    41204125
    41214126.record-profile-status-bar-item.toggled-on .glyph {
    4122     -webkit-mask-image: url(Images/recordToggledButtonGlyph.png);
     4127    -webkit-mask-position: -288px -24px;
    41234128    background-color: rgb(216, 0, 0) !important;
    41244129}
    … …  
    41264131/* FIXME: should have its own glyph. */
    41274132.heap-snapshot-status-bar-item .glyph {
    4128     -webkit-mask-image: url(Images/focusButtonGlyph.png);
     4133    -webkit-mask-position: -96px 0;
    41294134}
    41304135
    41314136.node-search-status-bar-item .glyph {
    4132     -webkit-mask-image: url(Images/nodeSearchButtonGlyph.png);
     4137    -webkit-mask-position: -224px -24px;
    41334138}
    41344139
    41354140.percent-time-status-bar-item .glyph {
    4136     -webkit-mask-image: url(Images/percentButtonGlyph.png);
     4141    -webkit-mask-position: -192px -24px;
    41374142}
    41384143
    41394144.focus-profile-node-status-bar-item .glyph {
    4140     -webkit-mask-image: url(Images/focusButtonGlyph.png);
     4145    -webkit-mask-position: -96px 0;
    41414146}
    41424147
    41434148.exclude-profile-node-status-bar-item .glyph {
    4144     -webkit-mask-image: url(Images/excludeButtonGlyph.png);
     4149    -webkit-mask-position: -128px 0;
    41454150}
    41464151
    41474152.reset-profile-status-bar-item .glyph {
    4148     -webkit-mask-image: url(Images/reloadButtonGlyph.png);
     4153    -webkit-mask-position: 0 0;
    41494154}
    41504155
    41514156.delete-storage-status-bar-item .glyph {
    4152     -webkit-mask-image: url(Images/excludeButtonGlyph.png);
     4157    -webkit-mask-position: -128px 0;
    41534158}
    41544159
    41554160.refresh-storage-status-bar-item .glyph {
    4156     -webkit-mask-image: url(Images/reloadButtonGlyph.png);
     4161    -webkit-mask-position: 0 0;
    41574162}
    41584163

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

    r85324 r85587  
    3232;(function preloadImages()
    3333{
    34     (new Image()).src = "Images/clearConsoleButtonGlyph.png";
    35     (new Image()).src = "Images/consoleButtonGlyph.png";
    36     (new Image()).src = "Images/dockButtonGlyph.png";
    37     (new Image()).src = "Images/enableOutlineButtonGlyph.png";
    38     (new Image()).src = "Images/enableSolidButtonGlyph.png";
    39     (new Image()).src = "Images/excludeButtonGlyph.png";
    40     (new Image()).src = "Images/focusButtonGlyph.png";
    41     (new Image()).src = "Images/largerResourcesButtonGlyph.png";
    42     (new Image()).src = "Images/nodeSearchButtonGlyph.png";
    43     (new Image()).src = "Images/pauseOnExceptionButtonGlyph.png";
    44     (new Image()).src = "Images/percentButtonGlyph.png";
    45     (new Image()).src = "Images/recordButtonGlyph.png";
    46     (new Image()).src = "Images/recordToggledButtonGlyph.png";
    47     (new Image()).src = "Images/reloadButtonGlyph.png";
    48     (new Image()).src = "Images/undockButtonGlyph.png";
     34    (new Image()).src = "Images/statusbarButtonGlyphs.png";
    4935})();
    5036
Note: See TracChangeset for help on using the changeset viewer.