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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 64ae12c40092a21e70524a8ba8813381fe0e8114
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 18:16:02 2010 +0000

    Don't assert when clicking on a plug-in in WebKit2
    https://bugs.webkit.org/show_bug.cgi?id=42762
    
    Reviewed by Sam Weinig.
    
    WebCore:
    
    Remove a now invalid assert and return false instead.
    
    * page/mac/EventHandlerMac.mm:
    (WebCore::EventHandler::passMouseDownEventToWidget):
    
    WebKit2:
    
    Add stub for PluginView::handleEvent.
    
    * WebProcess/Plugins/PluginView.cpp:
    (WebKit::PluginView::handleEvent):
    * WebProcess/Plugins/PluginView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c5873af..f91dee4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Don't assert when clicking on a plug-in in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=42762
+
+        Remove a now invalid assert and return false instead.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::passMouseDownEventToWidget):
+
 2010-07-21  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/mac/EventHandlerMac.mm b/WebCore/page/mac/EventHandlerMac.mm
index 8842e31..bb466db 100644
--- a/WebCore/page/mac/EventHandlerMac.mm
+++ b/WebCore/page/mac/EventHandlerMac.mm
@@ -215,10 +215,14 @@ bool EventHandler::passMouseDownEventToWidget(Widget* pWidget)
         return true;
     }
 
+    // In WebKit2 we will never have an NSView. Just return early and let the regular event handler machinery take care of
+    // dispatching the event.
+    if (!widget->platformWidget())
+        return false;
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     
     NSView *nodeView = widget->platformWidget();
-    ASSERT(nodeView);
     ASSERT([nodeView superview]);
     NSView *view = [nodeView hitTest:[[nodeView superview] convertPoint:[currentNSEvent() locationInWindow] fromView:nil]];
     if (!view) {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d8e7d9b..9dd23fe 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-21  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Don't assert when clicking on a plug-in in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=42762
+
+        Add stub for PluginView::handleEvent.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::handleEvent):
+        * WebProcess/Plugins/PluginView.h:
+
 2010-07-21  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index 251bdec..77a98f1 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -27,6 +27,7 @@
 
 #include "Plugin.h"
 #include <WebCore/DocumentLoader.h>
+#include <WebCore/Event.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameLoaderClient.h>
 #include <WebCore/FrameView.h>
@@ -317,6 +318,11 @@ void PluginView::setParent(ScrollView* scrollView)
     viewGeometryDidChange();
 }
 
+void PluginView::handleEvent(Event*)
+{
+    // FIXME: Implement.
+}
+    
 void PluginView::viewGeometryDidChange()
 {
     if (!parent() || !m_plugin || !m_isInitialized)
diff --git a/WebKit2/WebProcess/Plugins/PluginView.h b/WebKit2/WebProcess/Plugins/PluginView.h
index 1036009..5967271 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.h
+++ b/WebKit2/WebProcess/Plugins/PluginView.h
@@ -85,6 +85,7 @@ private:
     virtual void invalidateRect(const WebCore::IntRect&);
     virtual void frameRectsChanged();
     virtual void setParent(WebCore::ScrollView*);
+    virtual void handleEvent(WebCore::Event*);
 
     // WebCore::MediaCanStartListener
     virtual void mediaCanStart();

-- 
WebKit Debian packaging