Changeset 149989 in webkit

Timestamp:

May 12, 2013 11:40:52 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

REGRESSION (r149749): Video becomes invisible when it starts playing at newyorkbygehry.com
​https://bugs.webkit.org/show_bug.cgi?id=115963

Reviewed by Dean Jackson.

Source/WebCore:

Test: media/video-remove-insert-repaints.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::insertedInto): Set m_inActiveDocument when inserted into a document.
(WebCore::HTMLMediaElement::removedFrom): Fix logging.

LayoutTests:

• media/video-remove-insert-repaints.html: Added.
• media/video-remove-insert-repaints-expected.txt: Added.
• platform/mac/media/video-remove-insert-repaints-expected.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-remove-insert-repaints-expected.txt (added)
• LayoutTests/media/video-remove-insert-repaints.html (added)
• LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+        REGRESSION (r149749): Video becomes invisible when it starts playing at newyorkbygehry.com
+        https://bugs.webkit.org/show_bug.cgi?id=115963
+
+        Reviewed by Dean Jackson.
+
+        * media/video-remove-insert-repaints.html: Added.
+        * media/video-remove-insert-repaints-expected.txt: Added.
+        * platform/mac/media/video-remove-insert-repaints-expected.png: Added.
+
 2013-05-12  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+        REGRESSION (r149749): Video becomes invisible when it starts playing at newyorkbygehry.com
+        https://bugs.webkit.org/show_bug.cgi?id=115963
+
+        Reviewed by Dean Jackson.
+
+        Test: media/video-remove-insert-repaints.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::insertedInto): Set m_inActiveDocument when inserted into a document.
+        (WebCore::HTMLMediaElement::removedFrom): Fix logging.
+
 2013-05-12  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -579 +579 @@
 {
     LOG(Media, "HTMLMediaElement::insertedInto");
+
     HTMLElement::insertedInto(insertionPoint);
-    if (insertionPoint->inDocument() && !getAttribute(srcAttr).isEmpty() && m_networkState == NETWORK_EMPTY)
-        scheduleDelayedAction(LoadMediaResource);
+    if (insertionPoint->inDocument()) {
+        m_inActiveDocument = true;
+
+        if (m_networkState == NETWORK_EMPTY && !getAttribute(srcAttr).isEmpty())
+            scheduleDelayedAction(LoadMediaResource);
+    }
+
     configureMediaControls();
     return InsertionDone;
@@ -588 +594 @@
 void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)
 {
+    LOG(Media, "HTMLMediaElement::removedFrom");
+
     m_inActiveDocument = false;
-
     if (insertionPoint->inDocument()) {
-        LOG(Media, "HTMLMediaElement::removedFrom");
         configureMediaControls();
         if (m_networkState > NETWORK_EMPTY)