Changeset 151599 in webkit

Timestamp:

Jun 14, 2013, 10:09:49 AM (13 years ago)

Author:

dino@apple.com

Message:

Clicking on snapshotting plug-ins does not restart them
​https://bugs.webkit.org/show_bug.cgi?id=117620
<rdar://problem/13821729>

Follow-up review comments from Darin Adler, with some
discussion on IRC.

Sprinkle OVERRIDE on virtual functions where needed. Also
make sure that the Event is a MouseEvent before casting to it.

• html/HTMLPlugInElement.h: Move defaultEventHandler back to protected and add OVERRIDE.
• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::defaultEventHandler): Check for MouseEvent and
use toMouseEvent().

• html/HTMLPlugInImageElement.h: Sprinkle some OVERRIDEs, and move defaultEventHandler

to private.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInElement.h (modified) (3 diffs)
• html/HTMLPlugInImageElement.cpp (modified) (2 diffs)
• html/HTMLPlugInImageElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-14  Dean Jackson  <dino@apple.com>
+
+        Clicking on snapshotting plug-ins does not restart them
+        https://bugs.webkit.org/show_bug.cgi?id=117620
+        <rdar://problem/13821729>
+
+        Follow-up review comments from Darin Adler, with some
+        discussion on IRC.
+
+        Sprinkle OVERRIDE on virtual functions where needed. Also
+        make sure that the Event is a MouseEvent before casting to it.
+
+        * html/HTMLPlugInElement.h: Move defaultEventHandler back to protected and add OVERRIDE.
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::defaultEventHandler): Check for MouseEvent and
+        use toMouseEvent().
+        * html/HTMLPlugInImageElement.h: Sprinkle some OVERRIDEs, and move defaultEventHandler
+        to private.
+
 2013-06-14  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/html/HTMLPlugInElement.h

@@ -81 +81 @@
     virtual bool isPlugInImageElement() const { return false; }
 
-    virtual void defaultEventHandler(Event*);
-
 protected:
     HTMLPlugInElement(const QualifiedName& tagName, Document*);
@@ -91 +89 @@
 
     virtual bool useFallbackContent() const { return false; }
+
+    virtual void defaultEventHandler(Event*) OVERRIDE;
 
     // Subclasses should use guardedDispatchBeforeLoadEvent instead of calling dispatchBeforeLoadEvent directly.
@@ -107 +107 @@
 
     virtual bool isKeyboardFocusable(KeyboardEvent*) const OVERRIDE;
-    virtual bool isPluginElement() const;
+    virtual bool isPluginElement() const OVERRIDE;
 
     RefPtr<JSC::Bindings::Instance> m_instance;

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -714 +714 @@
     RenderObject* r = renderer();
     if (r && r->isEmbeddedObject()) {
-        if (isPlugInImageElement() && displayState() == WaitingForSnapshot && event->type() == eventNames().clickEvent) {
-            MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
+        if (isPlugInImageElement() && displayState() == WaitingForSnapshot && event->isMouseEvent() && event->type() == eventNames().clickEvent) {
+            MouseEvent* mouseEvent = toMouseEvent(event);
             if (mouseEvent->button() == LeftButton) {
                 userDidClickSnapshot(mouseEvent, true);
@@ -725 +725 @@
     HTMLPlugInElement::defaultEventHandler(event);
 }
-    
+
 } // namespace WebCore

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -126 +126 @@
     virtual bool isRestartedPlugin() const OVERRIDE { return m_isRestartedPlugin; }
 
-    virtual void defaultEventHandler(Event*);
-
 private:
-    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
-    virtual bool willRecalcStyle(StyleChange);
+    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
+    virtual bool willRecalcStyle(StyleChange) OVERRIDE;
 
     void didAddUserAgentShadowRoot(ShadowRoot*) OVERRIDE;
 
-    virtual void finishParsingChildren();
+    virtual void finishParsingChildren() OVERRIDE;
 
     void updateWidgetIfNecessary();
@@ -149 +147 @@
 
     void removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>*);
+
+    virtual void defaultEventHandler(Event*) OVERRIDE;
 
     bool m_needsWidgetUpdate;