<!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>[163466] 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/163466">163466</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 12:42:37 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FrameLoader::stateMachine() should return a reference.
<https://webkit.org/b/128263>
There is always a FrameLoaderStateMatchine, so return it by
reference since it can never be null.
Reviewed by Anders Carlsson.
* history/PageCache.cpp:
(WebCore::logCanCachePageDecision):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::finishedLoading):
(WebCore::DocumentLoader::commitData):
(WebCore::DocumentLoader::maybeLoadEmpty):
* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::createDocument):
(WebCore::DocumentWriter::begin):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::prepareForHistoryNavigation):
* loader/FrameLoader.h:
(WebCore::FrameLoader::stateMachine):
* loader/HistoryController.cpp:
(WebCore::HistoryController::restoreScrollPositionAndViewState):
(WebCore::HistoryController::saveDocumentState):
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::scheduleLocationChange):
(WebCore::NavigationScheduler::scheduleFormSubmission):
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::incrementProgress):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::storeResourceTimingInitiatorInformation):
* page/Frame.cpp:
(WebCore::Frame::injectUserScripts):
* page/FrameView.cpp:
(WebCore::FrameView::qualifiesAsVisuallyNonEmpty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentWritercpp">trunk/Source/WebCore/loader/DocumentWriter.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/ChangeLog 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-02-05 Andreas Kling <akling@apple.com>
+
+ FrameLoader::stateMachine() should return a reference.
+ <https://webkit.org/b/128263>
+
+ There is always a FrameLoaderStateMatchine, so return it by
+ reference since it can never be null.
+
+ Reviewed by Anders Carlsson.
+
+ * history/PageCache.cpp:
+ (WebCore::logCanCachePageDecision):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::finishedLoading):
+ (WebCore::DocumentLoader::commitData):
+ (WebCore::DocumentLoader::maybeLoadEmpty):
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::createDocument):
+ (WebCore::DocumentWriter::begin):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::prepareForHistoryNavigation):
+ * loader/FrameLoader.h:
+ (WebCore::FrameLoader::stateMachine):
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+ (WebCore::HistoryController::saveDocumentState):
+ * loader/NavigationScheduler.cpp:
+ (WebCore::NavigationScheduler::scheduleLocationChange):
+ (WebCore::NavigationScheduler::scheduleFormSubmission):
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::incrementProgress):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::storeResourceTimingInitiatorInformation):
+ * page/Frame.cpp:
+ (WebCore::Frame::injectUserScripts):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::qualifiesAsVisuallyNonEmpty):
+
</ins><span class="cx"> 2014-02-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Move characterAt index checks from InlineIterator to RenderText
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/history/PageCache.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> static void logCanCachePageDecision(Page* page)
</span><span class="cx"> {
</span><span class="cx"> // Only bother logging for main frames that have actually loaded and have content.
</span><del>- if (page->mainFrame().loader().stateMachine()->creatingInitialEmptyDocument())
</del><ins>+ if (page->mainFrame().loader().stateMachine().creatingInitialEmptyDocument())
</ins><span class="cx"> return;
</span><span class="cx"> URL currentURL = page->mainFrame().loader().documentLoader() ? page->mainFrame().loader().documentLoader()->url() : URL();
</span><span class="cx"> if (currentURL.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> if (!m_mainDocumentError.isNull())
</span><span class="cx"> return;
</span><span class="cx"> clearMainResourceLoader();
</span><del>- if (!frameLoader()->stateMachine()->creatingInitialEmptyDocument())
</del><ins>+ if (!frameLoader()->stateMachine().creatingInitialEmptyDocument())
</ins><span class="cx"> frameLoader()->checkLoadComplete();
</span><span class="cx">
</span><span class="cx"> // If the document specified an application cache manifest, it violates the author's intent if we store it in the memory cache
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> m_frame->document()->securityOrigin()->grantLoadLocalResources();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (frameLoader()->stateMachine()->creatingInitialEmptyDocument())
</del><ins>+ if (frameLoader()->stateMachine().creatingInitialEmptyDocument())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MHTML)
</span><span class="lines">@@ -1382,7 +1382,7 @@
</span><span class="cx"> if (!shouldLoadEmpty && !frameLoader()->client().representationExistsForURLScheme(m_request.url().protocol()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (m_request.url().isEmpty() && !frameLoader()->stateMachine()->creatingInitialEmptyDocument())
</del><ins>+ if (m_request.url().isEmpty() && !frameLoader()->stateMachine().creatingInitialEmptyDocument())
</ins><span class="cx"> m_request.setURL(blankURL());
</span><span class="cx"> String mimeType = shouldLoadEmpty ? "text/html" : frameLoader()->client().generatedMIMETypeForURLScheme(m_request.url().protocol());
</span><span class="cx"> m_response = ResourceResponse(m_request.url(), mimeType, 0, String(), String());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Document> DocumentWriter::createDocument(const URL& url)
</span><span class="cx"> {
</span><del>- if (!m_frame->loader().stateMachine()->isDisplayingInitialEmptyDocument() && m_frame->loader().client().shouldAlwaysUsePluginDocument(m_mimeType))
</del><ins>+ if (!m_frame->loader().stateMachine().isDisplayingInitialEmptyDocument() && m_frame->loader().client().shouldAlwaysUsePluginDocument(m_mimeType))
</ins><span class="cx"> return PluginDocument::create(m_frame, url);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (equalIgnoringCase(m_mimeType, "application/pdf"))
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Do we need to consult the content security policy here about blocked plug-ins?
</span><span class="cx">
</span><del>- bool shouldReuseDefaultView = m_frame->loader().stateMachine()->isDisplayingInitialEmptyDocument() && m_frame->document()->isSecureTransitionTo(url);
</del><ins>+ bool shouldReuseDefaultView = m_frame->loader().stateMachine().isDisplayingInitialEmptyDocument() && m_frame->document()->isSecureTransitionTo(url);
</ins><span class="cx"> if (shouldReuseDefaultView)
</span><span class="cx"> document->takeDOMWindowFrom(m_frame->document());
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -1161,9 +1161,9 @@
</span><span class="cx"> history().setCurrentItem(currentItem.get());
</span><span class="cx"> m_frame.page()->backForward().setCurrentItem(currentItem.get());
</span><span class="cx">
</span><del>- ASSERT(stateMachine()->isDisplayingInitialEmptyDocument());
- stateMachine()->advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit);
- stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
</del><ins>+ ASSERT(stateMachine().isDisplayingInitialEmptyDocument());
+ stateMachine().advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit);
+ stateMachine().advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> void setLoadsSynchronously(bool loadsSynchronously) { m_loadsSynchronously = loadsSynchronously; }
</span><span class="cx"> bool loadsSynchronously() const { return m_loadsSynchronously; }
</span><span class="cx">
</span><del>- FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
</del><ins>+ FrameLoaderStateMachine& stateMachine() { return m_stateMachine; }
</ins><span class="cx">
</span><span class="cx"> Frame* findFrameForNavigation(const AtomicString& name, Document* activeDocument = 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> */
</span><span class="cx"> void HistoryController::restoreScrollPositionAndViewState()
</span><span class="cx"> {
</span><del>- if (!m_frame.loader().stateMachine()->committedFirstRealDocumentLoad())
</del><ins>+ if (!m_frame.loader().stateMachine().committedFirstRealDocumentLoad())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_currentItem);
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Reading this bit of FrameLoader state here is unfortunate. I need to study
</span><span class="cx"> // this more to see if we can remove this dependency.
</span><del>- if (m_frame.loader().stateMachine()->creatingInitialEmptyDocument())
</del><ins>+ if (m_frame.loader().stateMachine().creatingInitialEmptyDocument())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // For a standard page load, we will have a previous item set, which will be used to
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx">
</span><span class="cx"> // Handle a location change of a page with no document as a special case.
</span><span class="cx"> // This may happen when a frame changes the location of another frame.
</span><del>- bool duringLoad = !loader.stateMachine()->committedFirstRealDocumentLoad();
</del><ins>+ bool duringLoad = !loader.stateMachine().committedFirstRealDocumentLoad();
</ins><span class="cx">
</span><span class="cx"> schedule(std::make_unique<ScheduledLocationChange>(securityOrigin, url, referrer, lockHistory, lockBackForwardList, duringLoad));
</span><span class="cx"> }
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx">
</span><span class="cx"> // Handle a location change of a page with no document as a special case.
</span><span class="cx"> // This may happen when a frame changes the location of another frame.
</span><del>- bool duringLoad = !m_frame.loader().stateMachine()->committedFirstRealDocumentLoad();
</del><ins>+ bool duringLoad = !m_frame.loader().stateMachine().committedFirstRealDocumentLoad();
</ins><span class="cx">
</span><span class="cx"> // If this is a child frame and the form submission was triggered by a script, lock the back/forward list
</span><span class="cx"> // to match IE and Opera.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> // For documents that use WebCore's layout system, treat first layout as the half-way point.
</span><span class="cx"> // FIXME: The hasHTMLView function is a sort of roundabout way of asking "do you use WebCore's layout system".
</span><span class="cx"> bool useClampedMaxProgress = frame->loader().client().hasHTMLView()
</span><del>- && !frame->loader().stateMachine()->firstLayoutDone();
</del><ins>+ && !frame->loader().stateMachine().firstLayoutDone();
</ins><span class="cx"> double maxProgressValue = useClampedMaxProgress ? 0.5 : finalProgressValue;
</span><span class="cx"> increment = (maxProgressValue - m_progressValue) * percentOfRemainingBytes;
</span><span class="cx"> m_progressValue += increment;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (resource->type() == CachedResource::MainResource) {
</span><span class="cx"> // <iframe>s should report the initial navigation requested by the parent document, but not subsequent navigations.
</span><del>- if (frame()->ownerElement() && m_documentLoader->frameLoader()->stateMachine()->committingFirstRealLoad()) {
</del><ins>+ if (frame()->ownerElement() && m_documentLoader->frameLoader()->stateMachine().committingFirstRealLoad()) {
</ins><span class="cx"> InitiatorInfo info = { frame()->ownerElement()->localName(), monotonicallyIncreasingTime() };
</span><span class="cx"> m_initiatorMap.add(resource.get(), info);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/page/Frame.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -696,7 +696,7 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (loader().stateMachine()->creatingInitialEmptyDocument() && !settings().shouldInjectUserScriptsInInitialEmptyDocument())
</del><ins>+ if (loader().stateMachine().creatingInitialEmptyDocument() && !settings().shouldInjectUserScriptsInInitialEmptyDocument())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const auto* userContentController = m_page->userContentController();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -3670,7 +3670,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Ensure that we always get marked visually non-empty eventually.
</span><del>- if (!frame().document()->parsing() && frame().loader().stateMachine()->committedFirstRealDocumentLoad())
</del><ins>+ if (!frame().document()->parsing() && frame().loader().stateMachine().committedFirstRealDocumentLoad())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Require the document to grow a bit.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -1458,7 +1458,7 @@
</span><span class="cx"> // FIXME (Viewless): I assume we want the equivalent of this optimization for viewless mode too.
</span><span class="cx"> bool willProduceHTMLView = [m_webFrame->_private->webFrameView _viewClassForMIMEType:[dataSource _responseMIMEType]] == [WebHTMLView class];
</span><span class="cx"> #endif
</span><del>- bool canSkipCreation = core(m_webFrame.get())->loader().stateMachine()->committingFirstRealLoad() && willProduceHTMLView;
</del><ins>+ bool canSkipCreation = core(m_webFrame.get())->loader().stateMachine().committingFirstRealLoad() && willProduceHTMLView;
</ins><span class="cx"> if (canSkipCreation) {
</span><span class="cx"> [[m_webFrame->_private->webFrameView documentView] setDataSource:dataSource];
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -1053,7 +1053,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_firstLayoutDone
</span><span class="cx"> {
</span><del>- return _private->coreFrame->loader().stateMachine()->firstLayoutDone();
</del><ins>+ return _private->coreFrame->loader().stateMachine().firstLayoutDone();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_isVisuallyNonEmpty
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (163465 => 163466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2014-02-05 20:04:59 UTC (rev 163465)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2014-02-05 20:42:37 UTC (rev 163466)
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- *result = coreFrame->loader().stateMachine()->firstLayoutDone();
</del><ins>+ *result = coreFrame->loader().stateMachine().firstLayoutDone();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>