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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4660d127fa08354bb5961cbacbac10100114af3f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 21:29:06 2010 +0000

    Fix some clang++ warnings (one of which was an actual bug)
    https://bugs.webkit.org/show_bug.cgi?id=50700
    
    Reviewed by Darin Adler.
    
    * page/mac/DragControllerMac.mm:
    (WebCore::DragController::dragOperation):
    Add parentheses to silent a clang warning.
    
    * page/mac/EventHandlerMac.mm:
    (WebCore::EventHandler::needsKeyboardEventDisambiguationQuirks):
    Fix || vs && precedence bug uncovered by clang.
    
    * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
    (WebCore::GraphicsContext3D::reshape):
    Use an early return to avoid a warning.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73543 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6635e86..2a8cf4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-08  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix some clang++ warnings (one of which was an actual bug)
+        https://bugs.webkit.org/show_bug.cgi?id=50700
+
+        * page/mac/DragControllerMac.mm:
+        (WebCore::DragController::dragOperation):
+        Add parentheses to silent a clang warning.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::needsKeyboardEventDisambiguationQuirks):
+        Fix || vs && precedence bug uncovered by clang.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::reshape):
+        Use an early return to avoid a warning.
+
 2010-12-08  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/page/mac/DragControllerMac.mm b/WebCore/page/mac/DragControllerMac.mm
index a09c418..05c8e09 100644
--- a/WebCore/page/mac/DragControllerMac.mm
+++ b/WebCore/page/mac/DragControllerMac.mm
@@ -53,8 +53,8 @@ DragOperation DragController::dragOperation(DragData* dragData)
     if ([NSApp modalWindow] || !dragData->containsURL())
         return DragOperationNone;
 
-    if (!m_documentUnderMouse || ![[m_page->mainFrame()->view()->getOuterView() window] attachedSheet] 
-        && [dragData->platformData() draggingSource] != m_page->mainFrame()->view()->getOuterView())
+    if (!m_documentUnderMouse || (![[m_page->mainFrame()->view()->getOuterView() window] attachedSheet] 
+        && [dragData->platformData() draggingSource] != m_page->mainFrame()->view()->getOuterView()))
         return DragOperationCopy;
 
     return DragOperationNone;
diff --git a/WebCore/page/mac/EventHandlerMac.mm b/WebCore/page/mac/EventHandlerMac.mm
index 2db713f..2d4d86b 100644
--- a/WebCore/page/mac/EventHandlerMac.mm
+++ b/WebCore/page/mac/EventHandlerMac.mm
@@ -759,7 +759,7 @@ bool EventHandler::needsKeyboardEventDisambiguationQuirks() const
     Document* document = m_frame->document();
 
     // RSS view needs arrow key keypress events.
-    if (applicationIsSafari() && document->url().protocolIs("feed") || document->url().protocolIs("feeds"))
+    if (applicationIsSafari() && (document->url().protocolIs("feed") || document->url().protocolIs("feeds")))
         return true;
     Settings* settings = m_frame->settings();
     if (!settings)
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
index d295abb..af1c8cd 100644
--- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -125,7 +125,10 @@ void GraphicsContext3D::paintRenderingResultsToCanvas(CanvasRenderingContext* co
 
 void GraphicsContext3D::reshape(int width, int height)
 {
-    if (width == m_currentWidth && height == m_currentHeight || !m_contextObj)
+    if (!m_contextObj)
+        return;
+
+    if (width == m_currentWidth && height == m_currentHeight)
         return;
     
     m_currentWidth = width;

-- 
WebKit Debian packaging