Diff
Modified: branches/safari-534-branch/LayoutTests/ChangeLog (87199 => 87200)
--- branches/safari-534-branch/LayoutTests/ChangeLog 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/LayoutTests/ChangeLog 2011-05-24 20:59:54 UTC (rev 87200)
@@ -1,3 +1,16 @@
+2011-05-24 Lucas Forschler <[email protected]>
+
+ Merged r87022.
+
+ 2011-05-21 Jeremy Noble <[email protected]>
+
+ Reviewed by Eric Carlson.
+
+ WebKit2: fix failing fullscreen/full-screen-remove* tests.
+ https://bugs.webkit.org/show_bug.cgi?id=61027
+
+ * platform/mac-wk2/Skipped: Unskip most fullscreen/ tests.
+
2011-05-22 Lucas Forschler <[email protected]>
Merge r86904.
Modified: branches/safari-534-branch/LayoutTests/platform/mac-wk2/Skipped (87199 => 87200)
--- branches/safari-534-branch/LayoutTests/platform/mac-wk2/Skipped 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/LayoutTests/platform/mac-wk2/Skipped 2011-05-24 20:59:54 UTC (rev 87200)
@@ -358,7 +358,6 @@
fast/text/international/khmer-selection.html
fast/text/offsetForPosition-complex-fallback.html
fast/text/reset-drag-on-mouse-down.html
-fullscreen/full-screen-cancel.html
http/tests/local/blob/send-hybrid-blob.html
http/tests/local/drag-over-remote-content.html
http/tests/local/fileapi/file-last-modified.html
@@ -1677,9 +1676,10 @@
fast/harness/show-modal-dialog.html
inspector/console/console-long-eval-crash.html
-# WebKit2 needs fullscreen support
-# https://bugs.webkit.org/show_bug.cgi?id=56318
-fullscreen/
+# WebKit2 needs fake key event support
+fullscreen/full-screen-frameset.html
+fullscreen/full-screen-keyboard-disabled.html
+fullscreen/full-screen-keyboard-enabled.html
# WebKit2 needs to support synchronous creation of about:blank/data:url frames
fast/dom/HTMLDocument/hasFocus.html
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87199 => 87200)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-24 20:59:54 UTC (rev 87200)
@@ -1,3 +1,19 @@
+2011-05-24 Lucas Forschler <[email protected]>
+
+ Merged r87022.
+
+ 2011-05-21 Jeremy Noble <[email protected]>
+
+ Reviewed by Eric Carlson.
+
+ WebKit2: fix failing fullscreen/full-screen-remove* tests.
+ https://bugs.webkit.org/show_bug.cgi?id=61027
+
+ * dom/Document.cpp:
+ (WebCore::Document::fullScreenChangeDelayTimerFired): dispatchEvent can be
+ synchronous, so make sure to check whether the current element is
+ in the DOM before dispatching.
+
2011-05-22 Lucas Forschler <[email protected]>
Merge r86956.
Modified: branches/safari-534-branch/Source/WebCore/dom/Document.cpp (87199 => 87200)
--- branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/Source/WebCore/dom/Document.cpp 2011-05-24 20:59:54 UTC (rev 87200)
@@ -4985,12 +4985,12 @@
RefPtr<Element> element = m_fullScreenChangeEventTargetQueue.takeFirst();
if (!element)
element = documentElement();
-
- element->dispatchEvent(Event::create(eventNames().webkitfullscreenchangeEvent, true, false));
// If the element was removed from our tree, also message the documentElement.
if (!contains(element.get()))
m_fullScreenChangeEventTargetQueue.append(documentElement());
+
+ element->dispatchEvent(Event::create(eventNames().webkitfullscreenchangeEvent, true, false));
}
}
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87199 => 87200)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 20:59:54 UTC (rev 87200)
@@ -1,3 +1,18 @@
+2011-05-24 Lucas Forschler <[email protected]>
+
+ Merged r87022.
+
+ 2011-05-21 Jeremy Noble <[email protected]>
+
+ Reviewed by Eric Carlson.
+
+ WebKit2: fix failing fullscreen/full-screen-remove* tests.
+ https://bugs.webkit.org/show_bug.cgi?id=61027
+
+ * WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp:
+ (WebKit::InjectedBundlePageFullScreenClient::exitFullScreenForElement): Call the
+ exit functions (was calling the enter functions).
+
2011-05-23 Lucas Forschler <[email protected]>
Merge r86985.
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp (87199 => 87200)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp 2011-05-24 20:56:36 UTC (rev 87199)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp 2011-05-24 20:59:54 UTC (rev 87200)
@@ -61,9 +61,9 @@
void InjectedBundlePageFullScreenClient::exitFullScreenForElement(WebPage *page, WebCore::Element *element)
{
- if (m_client.enterFullScreenForElement) {
+ if (m_client.exitFullScreenForElement) {
RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(element);
- m_client.enterFullScreenForElement(toAPI(page), toAPI(nodeHandle.get()));
+ m_client.exitFullScreenForElement(toAPI(page), toAPI(nodeHandle.get()));
} else
page->send(Messages::WebFullScreenManagerProxy::ExitFullScreen());
}
