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

[apavlov at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7cb77de3ca7829f5b680594fd771e9d9dee61fa1
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 13:21:04 2010 +0000

    2010-02-24  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Activate/Deactivate breaks does not look consistent with rest of the toolbar.
    
            Fix style and add the new images to the related file sets.
            https://bugs.webkit.org/show_bug.cgi?id=35307
    
            * WebCore.gypi:
            * inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png:
            * 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@55187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a4e382b..d1e9894 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-24  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Activate/Deactivate breaks does not look consistent with rest of the toolbar.
+
+        Fix style and add the new images to the related file sets.
+        https://bugs.webkit.org/show_bug.cgi?id=35307
+
+        * WebCore.gypi:
+        * inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png:
+        * inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png:
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.css:
+
 2010-02-24  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 9e6a9a7..78c1e1b 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3813,6 +3813,8 @@
             '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/deactivateBreakpointsButtonGlyph.png
index edcf225..ce49aac 100644
Binary files a/WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png and b/WebCore/inspector/front-end/Images/deactivateBreakpointsButtonGlyph.png differ
diff --git a/WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png b/WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png
index 58ccf68..5c5fcf6 100644
Binary files a/WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png and b/WebCore/inspector/front-end/Images/deactivateBreakpointsDisabledButtonGlyph.png differ
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index 73309d1..581405d 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -102,6 +102,8 @@
     <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 ec6078f..2d4b9e0 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2412,12 +2412,11 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
 
 .toggle-breakpoints .glyph {
     -webkit-mask-image: url(Images/deactivateBreakpointsDisabledButtonGlyph.png);
-    background-color: rgb(96, 96, 96);
+    background-color: rgb(96, 96, 96) !important;
 }
 
 .toggle-breakpoints.toggled-on .glyph {
     -webkit-mask-image: url(Images/deactivateBreakpointsButtonGlyph.png);
-    background-color: rgb(1, 142, 217);
 }
 
 #scripts-debugger-status {

-- 
WebKit Debian packaging