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

andersca at apple.com andersca at apple.com
Wed Dec 22 18:38:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1edc61286fc3baa10d9140edbcf3263b394325ed
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 01:56:05 2010 +0000

    Mouse Events Not Received in Run Applet in their Own Process Mode
    https://bugs.webkit.org/show_bug.cgi?id=51078
    <rdar://problem/8333491>
    
    Reviewed by Sam Weinig.
    
    Make sure that Widget::handleEvent is called for applets as well.
    
    * html/HTMLAppletElement.cpp:
    (WebCore::HTMLAppletElement::defaultEventHandler):
    * html/HTMLAppletElement.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 25f6cc9..52d62e2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-14  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Mouse Events Not Received in Run Applet in their Own Process Mode
+        https://bugs.webkit.org/show_bug.cgi?id=51078
+        <rdar://problem/8333491>
+
+        Make sure that Widget::handleEvent is called for applets as well.
+
+        * html/HTMLAppletElement.cpp:
+        (WebCore::HTMLAppletElement::defaultEventHandler):
+        * html/HTMLAppletElement.h:
+
 2010-12-14  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Chris Marrin.
diff --git a/WebCore/html/HTMLAppletElement.cpp b/WebCore/html/HTMLAppletElement.cpp
index 9d06f92..c7995b5 100644
--- a/WebCore/html/HTMLAppletElement.cpp
+++ b/WebCore/html/HTMLAppletElement.cpp
@@ -30,6 +30,7 @@
 #include "RenderApplet.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
+#include "Widget.h"
 
 namespace WebCore {
 
@@ -139,6 +140,17 @@ RenderObject* HTMLAppletElement::createRenderer(RenderArena*, RenderStyle* style
     return RenderObject::createObject(this, style);
 }
 
+void HTMLAppletElement::defaultEventHandler(Event* event)
+{
+    RenderObject* r = renderer();
+    if (!r || !r->isWidget())
+        return;
+    Widget* widget = toRenderWidget(r)->widget();
+    if (!widget)
+        return;
+    widget->handleEvent(event);
+}
+
 RenderWidget* HTMLAppletElement::renderWidgetForJSBindings() const
 {
     if (!canEmbedJava())
diff --git a/WebCore/html/HTMLAppletElement.h b/WebCore/html/HTMLAppletElement.h
index 1499279..0f3aad8 100644
--- a/WebCore/html/HTMLAppletElement.h
+++ b/WebCore/html/HTMLAppletElement.h
@@ -39,7 +39,9 @@ private:
     virtual bool rendererIsNeeded(RenderStyle*);
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     virtual void finishParsingChildren();
-    
+
+    virtual void defaultEventHandler(Event*);
+
     virtual RenderWidget* renderWidgetForJSBindings() const;
 
     void setupApplet() const;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list