summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html
diff options
context:
space:
mode:
authorjer.noble@apple.com <jer.noble@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2011-04-22 23:52:44 +0000
committerjer.noble@apple.com <jer.noble@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2011-04-22 23:52:44 +0000
commitca0a1d311a147c953ef7b10d6a7aa5e0ec22549a (patch)
treeb5bb7ff7aca8ca384ff49dc8c5aad3424fe5b690 /third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html
parent39ac13af7a20be18462132bc5f86e82c35ad942d (diff)
downloadchromium_src-ca0a1d311a147c953ef7b10d6a7aa5e0ec22549a.zip
chromium_src-ca0a1d311a147c953ef7b10d6a7aa5e0ec22549a.tar.gz
chromium_src-ca0a1d311a147c953ef7b10d6a7aa5e0ec22549a.tar.bz2
2011-04-19 Jer Noble <jer.noble@apple.com>
Reviewed by Daniel Bates. Full Screen from within an <iframe> does not cause <iframe> to resize. https://bugs.webkit.org/show_bug.cgi?id=58638 * fullscreen/full-screen-frameset-expected.txt: Added. * fullscreen/full-screen-frameset.html: Added. * fullscreen/content/inner.html: Added. * fullscreen/full-screen-iframe-allowed-expected.txt: Updated. * fullscreen/full-screen-iframe-allowed.html: Add a button with which to trigger full screen mode in Safari. * fullscreen/full-screen-iframe-not-allowed-expected.txt: Updated. * fullscreen/full-screen-iframe-not-allowed.html: Ditto. * fullscreen/resources/allowed.html: Added. * fullscreen/resources/inner.html: Added. 2011-04-19 Jer Noble <jer.noble@apple.com> Reviewed by Daniel Bates. Full Screen from within an <iframe> does not cause <iframe> to resize. https://bugs.webkit.org/show_bug.cgi?id=58638 Tests: fullscreen/full-screen-frameset.html * css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector): Add the -webkit-full-screen pseudo class to frame elements which contain full screen elements. * css/fullscreen.css: (iframe:-webkit-full-screen): Add iframe-specific styling rules. * dom/Document.cpp: (WebCore::Document::setContainsFullScreenElementRecursively): Added. Walk up each successive document owner element, calling setContainsFullScreenElement() if owner is a frame element. (WebCore::Document::fullScreenIsAllowedForElement): Use the new Element::isFrameElementBase call instead of checking the element's tag name. (WebCore::Document::webkitWillEnterFullScreenForElement): Mark any containing iframes as containing a full screen element. (WebCore::Document::webkitWillExitFullScreenForElement): Ditto. * dom/Element.h: (WebCore::Element::isFrameElementBase): Added. * html/HTMLFrameElement.h: (WebCore::HTMLFrameElement::allowFullScreen): Disable full screen from within HTMLFrameElements. * html/HTMLFrameElementBase.cpp: (WebCore::HTMLFrameElementBase::setContainsFullScreenElement): Added. * html/HTMLFrameElementBase.h: (WebCore::HTMLFrameElementBase::containsFullScreenElement): Added. (WebCore::HTMLFrameElementBase::isFrameElementBase): Added. 2011-04-19 Jer Noble <jer.noble@apple.com> Reviewed by Daniel Bates. Full Screen from within an <iframe> does not cause <iframe> to resize. https://bugs.webkit.org/show_bug.cgi?id=58638 Tests: fullscreen/full-screen-frameset-allowed.html fullscreen/full-screen-frameset-not-allowed.html Return the _element's document instead of the WKView's document, which will be different in the case of elements within <iframe>s. * WebView/WebFullScreenController.mm: (-[WebFullScreenController _document]): 2011-04-19 Jer Noble <jer.noble@apple.com> Reviewed by Daniel Bates. Full Screen from within an <iframe> does not cause <iframe> to resize. https://bugs.webkit.org/show_bug.cgi?id=58638 Tests: fullscreen/full-screen-frameset-allowed.html fullscreen/full-screen-frameset-not-allowed.html * UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Cancel the background animation if the full screen animation finishes first. * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm: (WebKit::WebFullScreenManagerMac::WebFullScreenManagerMac): m_fullScreenRootLayer was uninitialized. git-svn-id: svn://svn.chromium.org/blink/trunk@84706 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html')
-rw-r--r--third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html35
1 files changed, 35 insertions, 0 deletions
diff --git a/third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html b/third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html
new file mode 100644
index 0000000..dd30901
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fullscreen/full-screen-frameset.html
@@ -0,0 +1,35 @@
+<script src="full-screen-test.js"></script>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpChildFramesAsText();
+
+var waitingFor = 2;
+function runTest() {
+ if (--waitingFor)
+ return;
+ var frame = document.getElementById('frame');
+
+ waitForEvent(frame.contentDocument, 'webkitfullscreenchange', function() {
+ consoleWrite("FAIL - entered full screen!");
+ endTest();
+ if (layoutTestController)
+ layoutTestController.notifyDone();
+ });
+
+ runWithKeyDown(function() {
+
+ setTimeout(function() {
+ consoleWrite("SUCCEED - did not enter full screen!");
+ endTest();
+ if (layoutTestController)
+ layoutTestController.notifyDone();
+ }, 50);
+
+ frame.contentDocument.documentElement.webkitRequestFullScreen();
+ });
+}
+</script>
+<frameset rows="150,*">
+ <frame name="header" src="resources/not-allowed.html" webkitfullscreenallowed onload="runTest()">
+ <frame id="frame" src="resources/inner.html" onload="runTest()">
+</frameset>