[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 367485942c5f27ba30359a9c459a5512c8e890cf
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 11:00:15 2010 +0000

    Web Inspector: fix gcc warnings introduced in 65731
    https://bugs.webkit.org/show_bug.cgi?id=44468
    
    Patch by Pavel Podivilov <podivilov at chromium.org> on 2010-08-24
    Reviewed by Yury Semikhatsky.
    
    * inspector/InspectorDOMAgent.cpp:
    (WebCore::InspectorDOMAgent::didInsertDOMNode):
    (WebCore::InspectorDOMAgent::pauseOnBreakpoint):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2988f2..628cf0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-24  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: fix gcc warnings introduced in 65731
+        https://bugs.webkit.org/show_bug.cgi?id=44468
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::didInsertDOMNode):
+        (WebCore::InspectorDOMAgent::pauseOnBreakpoint):
+
 2010-08-24  Ariya Hidayat  <ariya at sencha.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 9de620d..00c8bad 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -971,7 +971,7 @@ void InspectorDOMAgent::didInsertDOMNode(Node* node)
                 return;
         }
         uint32_t mask = m_breakpoints.get(parent);
-        mask = mask | (mask >> domBreakpointDerivedTypeShift) & ((1 << domBreakpointDerivedTypeShift) - 1);
+        mask = (mask | (mask >> domBreakpointDerivedTypeShift)) & ((1 << domBreakpointDerivedTypeShift) - 1);
         updateSubtreeBreakpoints(node, mask, true);
     }
 
@@ -1060,6 +1060,8 @@ bool InspectorDOMAgent::pauseOnBreakpoint()
     bool deleted = !s_domAgentOnBreakpoint;
     s_domAgentOnBreakpoint = 0;
     return !deleted;
+#else
+    return true;
 #endif
 }
 

-- 
WebKit Debian packaging