Changeset 85510 in webkit

Timestamp:

May 2, 2011 1:19:12 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-05-02 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Eric Carlson.

REGRESSIONS (r71934): In standalone media documents, (double-)clicking the media element doesn’t play/pause
​https://bugs.webkit.org/show_bug.cgi?id=59917

Since default event handlers are not retargeted, we should always attempt ancestor
traversal to find out whether the event.

• html/MediaDocument.cpp: (WebCore::ancestorVideoElement): Added ancestor-traversing helper. (WebCore::MediaDocument::defaultEventHandler): Changed to use ancestorVideoElement.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaDocument.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        REGRESSIONS (r71934): In standalone media documents, (double-)clicking the media element doesn’t play/pause
+        https://bugs.webkit.org/show_bug.cgi?id=59917
+
+        Since default event handlers are not retargeted, we should always attempt ancestor
+        traversal to find out whether the event.
+
+        * html/MediaDocument.cpp:
+        (WebCore::ancestorVideoElement): Added ancestor-traversing helper.
+        (WebCore::MediaDocument::defaultEventHandler): Changed to use ancestorVideoElement.
+
 2011-05-02  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/html/MediaDocument.cpp

@@ -147 +147 @@
 }
 
+static inline HTMLVideoElement* ancestorVideoElement(Node* node)
+{
+    while (node && !node->hasTagName(videoTag))
+        node = node->parentOrHostNode();
+
+    return static_cast<HTMLVideoElement*>(node);
+}
+
 void MediaDocument::defaultEventHandler(Event* event)
 {
@@ -155 +163 @@
         return;
 
-    if (targetNode->hasTagName(videoTag)) {
-        HTMLVideoElement* video = static_cast<HTMLVideoElement*>(targetNode);
+    if (HTMLVideoElement* video = ancestorVideoElement(targetNode)) {
         if (event->type() == eventNames().clickEvent) {
             if (!video->canPlay()) {