[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 58bf4747710b5ce6d490ddbacfd95ebcf2557ca6
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 14:34:40 2010 +0000

    2010-02-25  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Swap images for activate and deactivate breakpoints.
    
            https://bugs.webkit.org/show_bug.cgi?id=35383
    
            * WebCore.gypi:
            * inspector/front-end/Images/breakpointsActivateButtonGlyph.png: Renamed from WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png.
            * inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png: Renamed from WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png.
            * inspector/front-end/WebKit.qrc:
            * inspector/front-end/inspector.css:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 47acac3..ac87fb9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-25  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Swap images for activate and deactivate breakpoints.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35383
+
+        * WebCore.gypi:
+        * inspector/front-end/Images/breakpointsActivateButtonGlyph.png: Renamed from WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png.
+        * inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png: Renamed from WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png.
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.css:
+
 2010-02-25  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 4c99bc1..ed196f4 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3810,6 +3810,8 @@
         'webinspector_image_files': [
 
             'inspector/front-end/Images/back.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',
@@ -3818,8 +3820,6 @@
             'inspector/front-end/Images/cookie.png',
             'inspector/front-end/Images/database.png',
             'inspector/front-end/Images/databaseTable.png',
-            'inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png',
-            'inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png',
             'inspector/front-end/Images/debuggerContinue.png',
             'inspector/front-end/Images/debuggerPause.png',
             'inspector/front-end/Images/debuggerStepInto.png',
diff --git a/WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png b/WebCore/inspector/front-end/Images/breakpointsActivateButtonGlyph.png
similarity index 100%
rename from WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png
rename to WebCore/inspector/front-end/Images/breakpointsActivateButtonGlyph.png
diff --git a/WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png b/WebCore/inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png
similarity index 100%
rename from WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png
rename to WebCore/inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index 8199fb6..5b3b9ca 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -95,6 +95,8 @@
     <file>popover.css</file>
     <file>textViewer.css</file>
     <file>Images/back.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>
@@ -103,8 +105,6 @@
     <file>Images/consoleIcon.png</file>
     <file>Images/database.png</file>
     <file>Images/databaseTable.png</file>
-    <file>Images/deactivateBreakpointsButtonGlyph.png</file>
-    <file>Images/deactivateBreakpointsDisabledButtonGlyph.png</file>
     <file>Images/debuggerContinue.png</file>
     <file>Images/debuggerPause.png</file>
     <file>Images/debuggerStepInto.png</file>
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 2d4b9e0..606dfed 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2411,12 +2411,12 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
 }
 
 .toggle-breakpoints .glyph {
-    -webkit-mask-image: url(Images/deactivateBreakpointsDisabledButtonGlyph.png);
+    -webkit-mask-image: url(Images/breakpointsActivateButtonGlyph.png);
     background-color: rgb(96, 96, 96) !important;
 }
 
 .toggle-breakpoints.toggled-on .glyph {
-    -webkit-mask-image: url(Images/deactivateBreakpointsButtonGlyph.png);
+    -webkit-mask-image: url(Images/breakpointsDeactivateButtonGlyph.png);
 }
 
 #scripts-debugger-status {

-- 
WebKit Debian packaging