<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209730] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209730">209730</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-12-12 15:12:12 -0800 (Mon, 12 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove implementation of legacy Mozilla-based Fullscreen API.
https://bugs.webkit.org/show_bug.cgi?id=165689
Source/WebCore:
Reviewed by Eric Carlson.
Alias the legacy webkitRequestFull_S_creen() function on Element to webkitRequestFull_s_creen().
Remove the custom behavior in Document::requestFullScreenForElement() to handle the legacy path.
* dom/Document.cpp:
(WebCore::Document::requestFullScreenForElement):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::webkitRequestFullscreen):
(WebCore::Element::webkitRequestFullScreen): Deleted.
* dom/Element.h:
* dom/Element.idl:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::enterFullscreen):
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlFullscreenButtonElement::defaultEventHandler):
Source/WebKit/mac:
<rdar://problem/29603053>
Reviewed by Eric Carlson.
* DOM/DOMElement.mm:
(-[DOMElement webkitRequestFullScreen:]):
LayoutTests:
Reviewed by Eric Carlson.
* fullscreen/full-screen-css-expected.txt:
* fullscreen/full-screen-css.html:
* fullscreen/full-screen-keyboard-disabled-expected.txt: Removed.
* fullscreen/full-screen-keyboard-disabled.html: Removed.
* fullscreen/full-screen-twice-expected.txt:
* fullscreen/full-screen-twice.html:
* js/dom/dom-static-property-for-in-iteration-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreencssexpectedtxt">trunk/LayoutTests/fullscreen/full-screen-css-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreencsshtml">trunk/LayoutTests/fullscreen/full-screen-css.html</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreentwiceexpectedtxt">trunk/LayoutTests/fullscreen/full-screen-twice-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreentwicehtml">trunk/LayoutTests/fullscreen/full-screen-twice.html</a></li>
<li><a href="#trunkLayoutTestsjsdomdomstaticpropertyforiniterationexpectedtxt">trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMElementmm">trunk/Source/WebKit/mac/DOM/DOMElement.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfullscreenfullscreenkeyboarddisabledexpectedtxt">trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreenkeyboarddisabledhtml">trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/ChangeLog 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-12 Jer Noble <jer.noble@apple.com>
+
+ Remove implementation of legacy Mozilla-based Fullscreen API.
+ https://bugs.webkit.org/show_bug.cgi?id=165689
+
+ Reviewed by Eric Carlson.
+
+ * fullscreen/full-screen-css-expected.txt:
+ * fullscreen/full-screen-css.html:
+ * fullscreen/full-screen-keyboard-disabled-expected.txt: Removed.
+ * fullscreen/full-screen-keyboard-disabled.html: Removed.
+ * fullscreen/full-screen-twice-expected.txt:
+ * fullscreen/full-screen-twice.html:
+ * js/dom/dom-static-property-for-in-iteration-expected.txt:
+
</ins><span class="cx"> 2016-12-12 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Add some test cases that were removed in r209562
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreencssexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/full-screen-css-expected.txt (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-css-expected.txt 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-css-expected.txt 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color') == 'rgba(0, 0, 0, 0)') OK
</span><span class="cx"> EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color') == 'rgb(0, 0, 0)') OK
</span><span class="cx"> EVENT(webkitfullscreenchange)
</span><ins>+EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
+EXPECTED (document.defaultView.getComputedStyle(span, null).getPropertyValue('background-color') == 'rgba(0, 0, 0, 0)') OK
+EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color') == 'rgb(0, 255, 0)') OK
+EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color') == 'rgb(0, 0, 255)') OK
+EVENT(webkitfullscreenchange)
</ins><span class="cx"> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLSpanElement]') OK
</span><span class="cx"> EXPECTED (document.defaultView.getComputedStyle(span, null).getPropertyValue('background-color') == 'rgb(0, 255, 0)') OK
</span><span class="cx"> EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color') == 'rgb(255, 0, 0)') OK
</span><span class="cx"> EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color') == 'rgb(0, 0, 255)') OK
</span><del>-EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
-EXPECTED (document.defaultView.getComputedStyle(span, null).getPropertyValue('background-color') == 'rgba(0, 0, 0, 0)') OK
-EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color') == 'rgb(0, 255, 0)') OK
-EXPECTED (document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color') == 'rgb(0, 0, 255)') OK
</del><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreencsshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/full-screen-css.html (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-css.html 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-css.html 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> testExpected("document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color')", "rgb(255, 0, 0)");
</span><span class="cx"> testExpected("document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color')", "rgb(0, 0, 255)");
</span><span class="cx">
</span><del>- callback = documentEnteredFullScreen;
- runWithKeyDown(function(){document.documentElement.webkitRequestFullScreen()});
</del><ins>+ endTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var documentEnteredFullScreen = function(event) {
</span><span class="lines">@@ -41,10 +40,12 @@
</span><span class="cx"> testExpected("document.defaultView.getComputedStyle(span, null).getPropertyValue('background-color')", "rgba(0, 0, 0, 0)");
</span><span class="cx"> testExpected("document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('background-color')", "rgb(0, 255, 0)");
</span><span class="cx"> testExpected("document.defaultView.getComputedStyle(document.documentElement, null).getPropertyValue('color')", "rgb(0, 0, 255)");
</span><del>- endTest();
</del><ins>+
+ callback = spanEnteredFullScreen;
+ runWithKeyDown(function(){span.webkitRequestFullScreen()});
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- callback = spanEnteredFullScreen;
- runWithKeyDown(function(){span.webkitRequestFullScreen()});
</del><ins>+ callback = documentEnteredFullScreen;
+ runWithKeyDown(function(){document.documentElement.webkitRequestFullScreen()});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreenkeyboarddisabledexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled-expected.txt (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled-expected.txt 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled-expected.txt 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitIsFullScreen == 'true') OK
-EVENT(keypress)
-EXPECTED (event.keyCode == '32') OK
-END OF TEST
-This tests that full screen mode does not allow alphanumeric key events. Press space to continue, then press an alphanumeric key, followed by space.
</del></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreenkeyboarddisabledhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-keyboard-disabled.html 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-<body>
-<script src="full-screen-test.js"></script>
-<p>This tests that full screen mode does not allow alphanumeric key events. Press space to continue, then press an alphanumeric key, followed by space.
-<span></span>
-<script>
- // 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 spanEnteredFullScreen = function() {
- callback = null;
- testExpected("document.webkitIsFullScreen", true);
- if (window.testRunner && eventSender.keyDown) {
- waitForEvent(document, 'keypress', keyPressed);
- eventSender.keyDown('a', []);
- eventSender.keyDown(' ', []);
- }
- };
-
- var keyPressed = function(event) {
- testExpected('event.keyCode', 32); // Space
- endTest();
- document.webkitCancelFullScreen();
- }
- waitForEvent(document, 'webkitfullscreenchange', fullscreenChanged);
-
- var span = document.getElementsByTagName('span')[0];
- callback = spanEnteredFullScreen;
- runWithKeyDown(function(){span.webkitRequestFullScreen()});
- }
-</script>
</del></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreentwiceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/full-screen-twice-expected.txt (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-twice-expected.txt 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-twice-expected.txt 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> EVENT(webkitfullscreenchange)
</span><ins>+EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
+EVENT(webkitfullscreenchange)
</ins><span class="cx"> EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLSpanElement]') OK
</span><del>-EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
</del><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreentwicehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/full-screen-twice.html (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-twice.html 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/fullscreen/full-screen-twice.html 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -20,16 +20,16 @@
</span><span class="cx"> var spanEnteredFullScreen = function() {
</span><span class="cx"> testExpected("document.webkitCurrentFullScreenElement", span);
</span><span class="cx"> callback = documentEnteredFullScreen;
</span><del>- runWithKeyDown(function(){document.documentElement.webkitRequestFullScreen()});
</del><ins>+ endTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var documentEnteredFullScreen = function() {
</span><span class="cx"> testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
</span><del>- callback = null;
- endTest();
</del><ins>+ callback = spanEnteredFullScreen;
+ runWithKeyDown(function(){span.webkitRequestFullScreen()});
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- callback = spanEnteredFullScreen;
- runWithKeyDown(function(){span.webkitRequestFullScreen()});
</del><ins>+ callback = documentEnteredFullScreen;
+ runWithKeyDown(function(){document.documentElement.webkitRequestFullScreen()});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomdomstaticpropertyforiniterationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> PASS a["lastElementChild"] is null
</span><span class="cx"> PASS a["childElementCount"] is 0
</span><span class="cx"> PASS a["assignedSlot"] is null
</span><del>-PASS a["ALLOW_KEYBOARD_INPUT"] is 1
</del><span class="cx"> PASS a["nodeName"] is A
</span><span class="cx"> PASS a["nodeValue"] is null
</span><span class="cx"> PASS a["nodeType"] is 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/ChangeLog 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-12 Jer Noble <jer.noble@apple.com>
+
+ Remove implementation of legacy Mozilla-based Fullscreen API.
+ https://bugs.webkit.org/show_bug.cgi?id=165689
+
+ Reviewed by Eric Carlson.
+
+ Alias the legacy webkitRequestFull_S_creen() function on Element to webkitRequestFull_s_creen().
+ Remove the custom behavior in Document::requestFullScreenForElement() to handle the legacy path.
+
+ * dom/Document.cpp:
+ (WebCore::Document::requestFullScreenForElement):
+ * dom/Document.h:
+ * dom/Element.cpp:
+ (WebCore::Element::webkitRequestFullscreen):
+ (WebCore::Element::webkitRequestFullScreen): Deleted.
+ * dom/Element.h:
+ * dom/Element.idl:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::enterFullscreen):
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlFullscreenButtonElement::defaultEventHandler):
+
</ins><span class="cx"> 2016-12-12 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] MediaQueryParser should use Ref and not RefPtr
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -5572,12 +5572,8 @@
</span><span class="cx"> return isAttributeOnAllOwners(allowfullscreenAttr, webkitallowfullscreenAttr, element->document().ownerElement());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::requestFullScreenForElement(Element* element, unsigned short flags, FullScreenCheckType checkType)
</del><ins>+void Document::requestFullScreenForElement(Element* element, FullScreenCheckType checkType)
</ins><span class="cx"> {
</span><del>- // The Mozilla Full Screen API <https://wiki.mozilla.org/Gecko:FullScreenAPI> has different requirements
- // for full screen mode, and do not have the concept of a full screen element stack.
- bool inLegacyMozillaMode = (flags & Element::LEGACY_MOZILLA_REQUEST);
-
</del><span class="cx"> do {
</span><span class="cx"> if (!element)
</span><span class="cx"> element = documentElement();
</span><span class="lines">@@ -5596,9 +5592,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // The context object's node document fullscreen element stack is not empty and its top element
</span><del>- // is not an ancestor of the context object. (NOTE: Ignore this requirement if the request was
- // made via the legacy Mozilla-style API.)
- if (!m_fullScreenElementStack.isEmpty() && !m_fullScreenElementStack.last()->contains(element) && !inLegacyMozillaMode)
</del><ins>+ // is not an ancestor of the context object.
+ if (!m_fullScreenElementStack.isEmpty() && !m_fullScreenElementStack.last()->contains(element))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // A descendant browsing context's document has a non-empty fullscreen element stack.
</span><span class="lines">@@ -5609,7 +5604,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (descendentHasNonEmptyStack && !inLegacyMozillaMode)
</del><ins>+ if (descendentHasNonEmptyStack)
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // This algorithm is not allowed to show a pop-up:
</span><span class="lines">@@ -5623,14 +5618,13 @@
</span><span class="cx"> if (!page() || !page()->settings().fullScreenEnabled())
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- if (!page()->chrome().client().supportsFullScreenForElement(element, flags & Element::ALLOW_KEYBOARD_INPUT)) {
</del><ins>+ bool hasKeyboardAccess = true;
+ if (!page()->chrome().client().supportsFullScreenForElement(element, hasKeyboardAccess)) {
</ins><span class="cx"> // The new full screen API does not accept a "flags" parameter, so fall back to disallowing
</span><span class="cx"> // keyboard input if the chrome client refuses to allow keyboard input.
</span><del>- if (!inLegacyMozillaMode && flags & Element::ALLOW_KEYBOARD_INPUT) {
- flags &= ~Element::ALLOW_KEYBOARD_INPUT;
- if (!page()->chrome().client().supportsFullScreenForElement(element, false))
- break;
- } else
</del><ins>+ hasKeyboardAccess = false;
+
+ if (!page()->chrome().client().supportsFullScreenForElement(element, hasKeyboardAccess))
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5682,7 +5676,7 @@
</span><span class="cx">
</span><span class="cx"> // 5. Return, and run the remaining steps asynchronously.
</span><span class="cx"> // 6. Optionally, perform some animation.
</span><del>- m_areKeysEnabledInFullScreen = flags & Element::ALLOW_KEYBOARD_INPUT;
</del><ins>+ m_areKeysEnabledInFullScreen = hasKeyboardAccess;
</ins><span class="cx"> page()->chrome().client().enterFullScreenForElement(element);
</span><span class="cx">
</span><span class="cx"> // 7. Optionally, display a message indicating how the user can exit displaying the context object fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/dom/Document.h 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1095,7 +1095,7 @@
</span><span class="cx"> ExemptIFrameAllowFullScreenRequirement,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void requestFullScreenForElement(Element*, unsigned short flags, FullScreenCheckType);
</del><ins>+ void requestFullScreenForElement(Element*, FullScreenCheckType);
</ins><span class="cx"> WEBCORE_EXPORT void webkitCancelFullScreen();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void webkitWillEnterFullScreenForElement(Element*);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -3051,14 +3051,9 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> void Element::webkitRequestFullscreen()
</span><span class="cx"> {
</span><del>- document().requestFullScreenForElement(this, ALLOW_KEYBOARD_INPUT, Document::EnforceIFrameAllowFullScreenRequirement);
</del><ins>+ document().requestFullScreenForElement(this, Document::EnforceIFrameAllowFullScreenRequirement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::webkitRequestFullScreen(unsigned short flags)
-{
- document().requestFullScreenForElement(this, (flags | LEGACY_MOZILLA_REQUEST), Document::EnforceIFrameAllowFullScreenRequirement);
-}
-
</del><span class="cx"> bool Element::containsFullScreenElement() const
</span><span class="cx"> {
</span><span class="cx"> return hasRareData() && elementRareData()->containsFullScreenElement();
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/dom/Element.h 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -460,17 +460,9 @@
</span><span class="cx"> virtual void buildPendingResource() { };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- enum {
- ALLOW_KEYBOARD_INPUT = 1 << 0,
- LEGACY_MOZILLA_REQUEST = 1 << 1,
- };
-
- WEBCORE_EXPORT void webkitRequestFullScreen(unsigned short flags);
</del><span class="cx"> WEBCORE_EXPORT bool containsFullScreenElement() const;
</span><span class="cx"> void setContainsFullScreenElement(bool);
</span><span class="cx"> void setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(bool);
</span><del>-
- // W3C API
</del><span class="cx"> WEBCORE_EXPORT void webkitRequestFullscreen();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/dom/Element.idl 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -113,8 +113,7 @@
</span><span class="cx">
</span><span class="cx"> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
</span><span class="cx"> // Mozilla version
</span><del>- const unsigned short ALLOW_KEYBOARD_INPUT = 1;
- void webkitRequestFullScreen(optional unsigned short flags = 0);
</del><ins>+ [ImplementedAs=webkitRequestFullscreen] void webkitRequestFullScreen();
</ins><span class="cx">
</span><span class="cx"> // W3C version
</span><span class="cx"> void webkitRequestFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -5405,7 +5405,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> if (document().settings()->fullScreenEnabled()) {
</span><span class="cx"> if (mode == VideoFullscreenModeStandard) {
</span><del>- document().requestFullScreenForElement(this, 0, Document::ExemptIFrameAllowFullScreenRequirement);
</del><ins>+ document().requestFullScreenForElement(this, Document::ExemptIFrameAllowFullScreenRequirement);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx"> if (document().webkitIsFullScreen() && document().webkitCurrentFullScreenElement() == parentMediaElement(this))
</span><span class="cx"> document().webkitCancelFullScreen();
</span><span class="cx"> else
</span><del>- document().requestFullScreenForElement(parentMediaElement(this), 0, Document::ExemptIFrameAllowFullScreenRequirement);
</del><ins>+ document().requestFullScreenForElement(parentMediaElement(this), Document::ExemptIFrameAllowFullScreenRequirement);
</ins><span class="cx"> } else
</span><span class="cx"> #endif
</span><span class="cx"> mediaController()->enterFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-12 Jer Noble <jer.noble@apple.com>
+
+ Remove implementation of legacy Mozilla-based Fullscreen API.
+ https://bugs.webkit.org/show_bug.cgi?id=165689
+ <rdar://problem/29603053>
+
+ Reviewed by Eric Carlson.
+
+ * DOM/DOMElement.mm:
+ (-[DOMElement webkitRequestFullScreen:]):
+
</ins><span class="cx"> 2016-12-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The DOM should have an advancing wavefront opaque root barrier
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMElement.mm (209729 => 209730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMElement.mm 2016-12-12 23:11:29 UTC (rev 209729)
+++ trunk/Source/WebKit/mac/DOM/DOMElement.mm 2016-12-12 23:12:12 UTC (rev 209730)
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> - (void)webkitRequestFullScreen:(unsigned short)flags
</span><span class="cx"> {
</span><span class="cx"> JSMainThreadNullState state;
</span><del>- unwrap(*self).webkitRequestFullScreen(flags);
</del><ins>+ unwrap(*self).webkitRequestFullscreen();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webkitRequestFullscreen
</span></span></pre>
</div>
</div>
</body>
</html>