Attachment 78344 Details for Bug 52095 – Patch

[patch] Patch

bug-52095-20110109003412.patch (text/plain), 6.34 KB, created by Jer Noble on 2011-01-09 00:34:14 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2011-01-09 00:34:14 PST

Size: 6.34 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 164f0625ead882168461ac4d649b7b1622772c2c..a292034d2b8129a0677d51f6daea45ca9f69b3ea 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2011-01-09  Jer Noble  <jer.noble@apple.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=52095
>+        REGRESSION (r75277): 2 test cases (<1%) had incorrect layout
>+        
>+        Fixes tests:
>+            fullscreen/full-screen-remove-ancestor.html
>+            fullscreen/full-screen-remove.html
>+            
>+        Revert change made in r75326, now that the underlying issue has been fixed.
>+
>+        * fullscreen/full-screen-remove-ancestor-expected.txt:
>+        * fullscreen/full-screen-remove-expected.txt:
>+
> 2011-01-08  Helder Correia  <helder@sencha.com>
> 
>         Reviewed by Simon Fraser.
>diff --git a/LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt b/LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt
>index 70479f374c6a5439a968b014f9b499e39a562195..d9a0ab300cfdce0b31cb859302e9758f1adad4bf 100644
>--- a/LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt
>+++ b/LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt
>@@ -1,42 +1,6 @@
>-
> EVENT(webkitfullscreenchange)
> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLElement]') OK
> EVENT(webkitfullscreenchange)
> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
> END OF TEST
> 
>-
>-
>-    // Bail out early if the full screen API is not enabled or is missing:
>-    if (Element.prototype.webkitRequestFullScreen == undefined) {
>-        logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
>-        endTest();
>-    } else {
>-        var callback;
>-        var fullscreenChanged = function(event)
>-        {
>-            if (callback)
>-                callback(event)
>-        };
>-        waitForEvent(document, 'webkitfullscreenchange', fullscreenChanged);
>-
>-        var span = document.getElementsByTagName('span')[0];
>-        var div = span.parentNode;
>-
>-        var spanEnteredFullScreen = function(event) {
>-            callback = documentEnteredFullScreen;
>-            testExpected("document.webkitCurrentFullScreenElement", span);
>-            document.body.removeChild(div);
>-        };
>-
>-        var documentEnteredFullScreen = function(event) {
>-            callback = null;
>-            testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
>-            endTest();
>-        };
>-
>-        callback = spanEnteredFullScreen;
>-        span.webkitRequestFullScreen();
>-    }
>-
>-
>diff --git a/LayoutTests/fullscreen/full-screen-remove-expected.txt b/LayoutTests/fullscreen/full-screen-remove-expected.txt
>index 8dc271474b78053734b67f5f0ea4e634ee4c5cf0..d9a0ab300cfdce0b31cb859302e9758f1adad4bf 100644
>--- a/LayoutTests/fullscreen/full-screen-remove-expected.txt
>+++ b/LayoutTests/fullscreen/full-screen-remove-expected.txt
>@@ -1,41 +1,6 @@
>-
> EVENT(webkitfullscreenchange)
> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLElement]') OK
> EVENT(webkitfullscreenchange)
> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
> END OF TEST
> 
>-
>-
>-    // Bail out early if the full screen API is not enabled or is missing:
>-    if (Element.prototype.webkitRequestFullScreen == undefined) {
>-        logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
>-        endTest();
>-    } else {
>-        var callback;
>-        var fullscreenChanged = function(event)
>-        {
>-            if (callback)
>-                callback(event)
>-        };
>-        waitForEvent(document, 'webkitfullscreenchange', fullscreenChanged);
>-    
>-        var span = document.getElementsByTagName('span')[0];
>-    
>-        var spanEnteredFullScreen = function(event) {
>-            callback = documentEnteredFullScreen;
>-            testExpected("document.webkitCurrentFullScreenElement", span);
>-            span.parentNode.removeChild(span);
>-        };
>-    
>-        var documentEnteredFullScreen = function(event) {
>-            callback = null;
>-            testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
>-            endTest();
>-        };
>-    
>-        callback = spanEnteredFullScreen;
>-        span.webkitRequestFullScreen();
>-    }
>-
>-
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 96bd29b141100d67cce8ec9053b26771a1e9ac5c..4663d57f6935ef527508f02dcf59da299321cb41 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2011-01-07  Jer Noble  <jer.noble@apple.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=52095
>+        REGRESSION (r75277): 2 test cases (<1%) had incorrect layout
>+        
>+        Fixes tests:
>+            fullscreen/full-screen-remove-ancestor.html
>+            fullscreen/full-screen-remove.html
>+        
>+        In nodeWillBeRemoved(), match the code in webkitDidExitFullScreen().
>+        Don't detach the documentElement, but rather simply call recalcStyle(Force).
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::nodeWillBeRemoved):
>+
> 2011-01-08 Amruth Raj  <amruthraj@motorola.com> and Ravi Phaneendra Kasibhatla  <ravi.kasibhatla@motorola.com>
> 
>         Reviewed by Martin Robinson.
>@@ -407,6 +424,7 @@
>         (WebCore::scrollbarStateToThemeState):
>         (WebCore::ScrollbarThemeChromiumMac::paint):
> 
>+
> 2011-01-07  Jer Noble  <jer.noble@apple.com>
> 
>         GTK Linux build fix: isDocumentRunningFullScreenAnimation should
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index e4b1128c998922e039cb52959accc23a0c15f13a..0bf254e1365d21af44da78edb1243e12477cf93d 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -3389,11 +3389,13 @@ void Document::nodeWillBeRemoved(Node* n)
>     ASSERT(n);
>     if (n->contains(m_fullScreenElement.get())) {
>         ASSERT(n != documentElement());
>+
>+        if (m_fullScreenRenderer)
>+            m_fullScreenRenderer->remove();
>+
>         setFullScreenRenderer(0);
>         m_fullScreenElement = documentElement();
>-        m_fullScreenElement->setNeedsStyleRecalc();
>-        m_fullScreenElement->detach();
>-        updateStyleIfNeeded();
>+        recalcStyle(Force);
>         m_fullScreenChangeDelayTimer.startOneShot(0);
>     }
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 52095: 78295 | 78344 | 78446