<!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>[211042] trunk/Source</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/211042">211042</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-23 10:39:48 -0800 (Mon, 23 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/211033">r211033</a>): ASSERTION FAILED: m_ptr in com.apple.WebCore: WTF::RefPtr<WebCore::Element>::operator* const + 70
https://bugs.webkit.org/show_bug.cgi?id=167308
<rdar://problem/30144964>
Unreviewed, do a partial revert of <a href="http://trac.webkit.org/projects/webkit/changeset/211033">r211033</a> to fix assertion.
Source/WebCore:
No new tests, already covered by:
fullscreen/exit-full-screen-iframe.html
* dom/Document.cpp:
(WebCore::Document::webkitExitFullscreen):
* page/ChromeClient.h:
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::exitFullScreenForElement):
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::exitFullScreenForElement):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::exitFullScreenForElement):
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebCore/ChangeLog 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-23 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r211033): ASSERTION FAILED: m_ptr in com.apple.WebCore: WTF::RefPtr<WebCore::Element>::operator* const + 70
+ https://bugs.webkit.org/show_bug.cgi?id=167308
+ <rdar://problem/30144964>
+
+ Unreviewed, do a partial revert of r211033 to fix assertion.
+
+ No new tests, already covered by:
+ fullscreen/exit-full-screen-iframe.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::webkitExitFullscreen):
+ * page/ChromeClient.h:
+
</ins><span class="cx"> 2017-01-23 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> [GTK] asserting on unknown locale for hyphenation is wrong
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -5720,7 +5720,7 @@
</span><span class="cx"> // Only exit out of full screen window mode if there are no remaining elements in the
</span><span class="cx"> // full screen stack.
</span><span class="cx"> if (!newTop) {
</span><del>- page()->chrome().client().exitFullScreenForElement(*m_fullScreenElement);
</del><ins>+ page()->chrome().client().exitFullScreenForElement(m_fullScreenElement.get());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebCore/page/ChromeClient.h 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> virtual bool supportsFullScreenForElement(const Element&, bool) { return false; }
</span><span class="cx"> virtual void enterFullScreenForElement(Element&) { }
</span><del>- virtual void exitFullScreenForElement(Element&) { }
</del><ins>+ virtual void exitFullScreenForElement(Element*) { }
</ins><span class="cx"> virtual void setRootFullScreenLayer(GraphicsLayer*) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-23 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r211033): ASSERTION FAILED: m_ptr in com.apple.WebCore: WTF::RefPtr<WebCore::Element>::operator* const + 70
+ https://bugs.webkit.org/show_bug.cgi?id=167308
+ <rdar://problem/30144964>
+
+ Unreviewed, do a partial revert of r211033 to fix assertion.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::exitFullScreenForElement):
+
</ins><span class="cx"> 2017-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove allowWindowOpenWithoutUserGesture setting
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> bool supportsFullScreenForElement(const WebCore::Element&, bool withKeyboard) final;
</span><span class="cx"> void enterFullScreenForElement(WebCore::Element&) final;
</span><del>- void exitFullScreenForElement(WebCore::Element&) final;
</del><ins>+ void exitFullScreenForElement(WebCore::Element*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool selectItemWritingDirectionIsNatural() override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -1013,17 +1013,17 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitFullScreenForElement(Element& element)
</del><ins>+void WebChromeClient::exitFullScreenForElement(Element* element)
</ins><span class="cx"> {
</span><span class="cx"> SEL selector = @selector(webView:exitFullScreenForElement:listener:);
</span><span class="cx"> if ([[m_webView UIDelegate] respondsToSelector:selector]) {
</span><del>- WebKitFullScreenListener* listener = [[WebKitFullScreenListener alloc] initWithElement:&element];
- CallUIDelegate(m_webView, selector, kit(&element), listener);
</del><ins>+ WebKitFullScreenListener* listener = [[WebKitFullScreenListener alloc] initWithElement:element];
+ CallUIDelegate(m_webView, selector, kit(element), listener);
</ins><span class="cx"> [listener release];
</span><span class="cx"> }
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> else
</span><del>- [m_webView _exitFullScreenForElement:&element];
</del><ins>+ [m_webView _exitFullScreenForElement:element];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-23 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r211033): ASSERTION FAILED: m_ptr in com.apple.WebCore: WTF::RefPtr<WebCore::Element>::operator* const + 70
+ https://bugs.webkit.org/show_bug.cgi?id=167308
+ <rdar://problem/30144964>
+
+ Unreviewed, do a partial revert of r211033 to fix assertion.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::exitFullScreenForElement):
+
</ins><span class="cx"> 2017-01-20 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from "page" directory of WebCore, also deploy references
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -822,17 +822,17 @@
</span><span class="cx"> m_webView->fullScreenController()->enterFullScreen();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitFullScreenForElement(Element& element)
</del><ins>+void WebChromeClient::exitFullScreenForElement(Element* element)
</ins><span class="cx"> {
</span><span class="cx"> COMPtr<IWebUIDelegate> uiDelegate;
</span><span class="cx"> if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) {
</span><span class="cx"> COMPtr<IWebUIDelegatePrivate4> uiDelegatePrivate4(Query, uiDelegate);
</span><del>- COMPtr<IDOMElement> domElement(AdoptCOM, DOMElement::createInstance(&element));
</del><ins>+ COMPtr<IDOMElement> domElement(AdoptCOM, DOMElement::createInstance(element));
</ins><span class="cx"> if (uiDelegatePrivate4 && SUCCEEDED(uiDelegatePrivate4->exitFullScreenForElement(domElement.get())))
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(&element == m_webView->fullScreenElement());
</del><ins>+ ASSERT(element == m_webView->fullScreenElement());
</ins><span class="cx"> m_webView->fullScreenController()->exitFullScreen();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> bool supportsFullScreenForElement(const WebCore::Element&, bool withKeyboard) final;
</span><span class="cx"> void enterFullScreenForElement(WebCore::Element&) final;
</span><del>- void exitFullScreenForElement(WebCore::Element&) final;
</del><ins>+ void exitFullScreenForElement(WebCore::Element*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void wheelEventHandlersChanged(bool) final { }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-23 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r211033): ASSERTION FAILED: m_ptr in com.apple.WebCore: WTF::RefPtr<WebCore::Element>::operator* const + 70
+ https://bugs.webkit.org/show_bug.cgi?id=167308
+ <rdar://problem/30144964>
+
+ Unreviewed, do a partial revert of r211033 to fix assertion.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::exitFullScreenForElement):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2017-01-20 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> urlParserEnabled parameter is only encoded for COCOA ports
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -964,9 +964,9 @@
</span><span class="cx"> m_page.fullScreenManager()->enterFullScreenForElement(&element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitFullScreenForElement(Element& element)
</del><ins>+void WebChromeClient::exitFullScreenForElement(Element* element)
</ins><span class="cx"> {
</span><del>- m_page.fullScreenManager()->exitFullScreenForElement(&element);
</del><ins>+ m_page.fullScreenManager()->exitFullScreenForElement(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (211041 => 211042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-23 18:30:25 UTC (rev 211041)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2017-01-23 18:39:48 UTC (rev 211042)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> bool supportsFullScreenForElement(const WebCore::Element&, bool withKeyboard) final;
</span><span class="cx"> void enterFullScreenForElement(WebCore::Element&) final;
</span><del>- void exitFullScreenForElement(WebCore::Element&) final;
</del><ins>+ void exitFullScreenForElement(WebCore::Element*) final;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>