<!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>[176949] trunk/Source/WebCore</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/176949">176949</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 08:57:42 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ResourceHandle::loadsBlocked()
https://bugs.webkit.org/show_bug.cgi?id=139401
Reviewed by Daniel Bates.
This hasn't returned true since Leopard, so get rid of it.
* page/Chrome.cpp:
(WebCore::Chrome::canRunModalNow):
* platform/network/ResourceHandle.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::loadsBlocked): Deleted.
* platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandle::loadsBlocked): Deleted.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::loadsBlocked): Deleted.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::loadsBlocked): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/ChangeLog 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ Remove ResourceHandle::loadsBlocked()
+ https://bugs.webkit.org/show_bug.cgi?id=139401
+
+ Reviewed by Daniel Bates.
+
+ This hasn't returned true since Leopard, so get rid of it.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::canRunModalNow):
+ * platform/network/ResourceHandle.h:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::loadsBlocked): Deleted.
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ (WebCore::ResourceHandle::loadsBlocked): Deleted.
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::loadsBlocked): Deleted.
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::loadsBlocked): Deleted.
+
</ins><span class="cx"> 2014-12-08 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS: VoiceOver gets hung on some websites consistently.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/page/Chrome.cpp 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -228,8 +228,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If loads are blocked, we can't run modal because the contents
</span><span class="cx"> // of the modal dialog will never show up!
</span><del>- return canRunModal() && !ResourceHandle::loadsBlocked()
- && canRunModalIfDuringPageDismissal(m_page, ChromeClient::HTMLDialog, String());
</del><ins>+ return canRunModal() && canRunModalIfDuringPageDismissal(m_page, ChromeClient::HTMLDialog, String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Chrome::runModal() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -190,9 +190,6 @@
</span><span class="cx"> double m_requestTime;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // Used to work around the fact that you don't get any more NSURLConnection callbacks until you return from the one you're in.
- static bool loadsBlocked();
-
</del><span class="cx"> bool hasAuthenticationChallenge() const;
</span><span class="cx"> void clearAuthentication();
</span><span class="cx"> WEBCORE_EXPORT virtual void cancel();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -579,11 +579,6 @@
</span><span class="cx"> CFURLConnectionResume(d->m_connection.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ResourceHandle::loadsBlocked()
-{
- return false;
-}
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void ResourceHandle::schedule(SchedulePair& pair)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -166,12 +166,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ResourceHandle::loadsBlocked()
-{
- notImplemented();
- return false;
-}
-
</del><span class="cx"> bool ResourceHandle::shouldUseCredentialStorage()
</span><span class="cx"> {
</span><span class="cx"> return (!client() || client()->shouldUseCredentialStorage(this)) && firstRequest().url().protocolIsInHTTPFamily();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -381,11 +381,6 @@
</span><span class="cx"> return d->m_connection.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ResourceHandle::loadsBlocked()
-{
- return false;
-}
-
</del><span class="cx"> CFStringRef ResourceHandle::synchronousLoadRunLoopMode()
</span><span class="cx"> {
</span><span class="cx"> return CFSTR("WebCoreSynchronousLoaderRunLoopMode");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (176948 => 176949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-12-08 16:12:39 UTC (rev 176948)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-12-08 16:57:42 UTC (rev 176949)
</span><span class="lines">@@ -1239,11 +1239,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ResourceHandle::loadsBlocked()
-{
- return false;
-}
-
</del><span class="cx"> void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!loadingSynchronousRequest);
</span></span></pre>
</div>
</div>
</body>
</html>