<!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>[159077] trunk/Source/WebKit2</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/159077">159077</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-11-11 15:32:15 -0800 (Mon, 11 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add a FrameLoadState object and begin moving loading related members from WebFrameProxy
https://bugs.webkit.org/show_bug.cgi?id=124163

Reviewed by Beth Dakin.

* UIProcess/API/C/WKFrame.cpp:
(WKFrameGetFrameLoadState):
* UIProcess/FrameLoadState.cpp: Added.
(WebKit::FrameLoadState::FrameLoadState):
(WebKit::FrameLoadState::~FrameLoadState):
* UIProcess/FrameLoadState.h: Added.
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::WebFrameProxy):
(WebKit::WebFrameProxy::didStartProvisionalLoad):
(WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
(WebKit::WebFrameProxy::didFailProvisionalLoad):
(WebKit::WebFrameProxy::didCommitLoad):
(WebKit::WebFrameProxy::didFinishLoad):
(WebKit::WebFrameProxy::didFailLoad):
(WebKit::WebFrameProxy::didSameDocumentNavigation):
(WebKit::WebFrameProxy::setUnreachableURL):
* UIProcess/WebFrameProxy.h:
(WebKit::WebFrameProxy::frameLoadState):
(WebKit::WebFrameProxy::loadState):
(WebKit::WebFrameProxy::url):
(WebKit::WebFrameProxy::provisionalURL):
(WebKit::WebFrameProxy::unreachableURL):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::activeURL):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::loadStateAtProcessExit):
* WebKit2.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKFramecpp">trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessFrameLoadStatecpp">trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessFrameLoadStateh">trunk/Source/WebKit2/UIProcess/FrameLoadState.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/ChangeLog        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2013-11-11  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Add a FrameLoadState object and begin moving loading related members from WebFrameProxy
+        https://bugs.webkit.org/show_bug.cgi?id=124163
+
+        Reviewed by Beth Dakin.
+
+        * UIProcess/API/C/WKFrame.cpp:
+        (WKFrameGetFrameLoadState):
+        * UIProcess/FrameLoadState.cpp: Added.
+        (WebKit::FrameLoadState::FrameLoadState):
+        (WebKit::FrameLoadState::~FrameLoadState):
+        * UIProcess/FrameLoadState.h: Added.
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::WebFrameProxy):
+        (WebKit::WebFrameProxy::didStartProvisionalLoad):
+        (WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
+        (WebKit::WebFrameProxy::didFailProvisionalLoad):
+        (WebKit::WebFrameProxy::didCommitLoad):
+        (WebKit::WebFrameProxy::didFinishLoad):
+        (WebKit::WebFrameProxy::didFailLoad):
+        (WebKit::WebFrameProxy::didSameDocumentNavigation):
+        (WebKit::WebFrameProxy::setUnreachableURL):
+        * UIProcess/WebFrameProxy.h:
+        (WebKit::WebFrameProxy::frameLoadState):
+        (WebKit::WebFrameProxy::loadState):
+        (WebKit::WebFrameProxy::url):
+        (WebKit::WebFrameProxy::provisionalURL):
+        (WebKit::WebFrameProxy::unreachableURL):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::activeURL):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::loadStateAtProcessExit):
+        * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-11-11  Gergo Balogh  &lt;geryxyz@inf.u-szeged.hu&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove #include from test input of the *Messages.in processing scripts.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> WKFrameLoadState WKFrameGetFrameLoadState(WKFrameRef frameRef)
</span><span class="cx"> {
</span><span class="cx">     WebFrameProxy* frame = toImpl(frameRef);
</span><del>-    switch (frame-&gt;loadState()) {
-        case WebFrameProxy::LoadStateProvisional:
-            return kWKFrameLoadStateProvisional;
-        case WebFrameProxy::LoadStateCommitted:
-            return kWKFrameLoadStateCommitted;
-        case WebFrameProxy::LoadStateFinished:
-            return kWKFrameLoadStateFinished;
</del><ins>+    switch (frame-&gt;frameLoadState().m_loadState) {
+    case FrameLoadState::LoadStateProvisional:
+        return kWKFrameLoadStateProvisional;
+    case FrameLoadState::LoadStateCommitted:
+        return kWKFrameLoadStateCommitted;
+    case FrameLoadState::LoadStateFinished:
+        return kWKFrameLoadStateFinished;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessFrameLoadStatecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp (0 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp                                (rev 0)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include &quot;config.h&quot;
+#include &quot;FrameLoadState.h&quot;
+
+namespace WebKit {
+
+FrameLoadState::FrameLoadState()
+    : m_loadState(LoadStateFinished)
+{
+}
+
+FrameLoadState::~FrameLoadState()
+{
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessFrameLoadStateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/FrameLoadState.h (0 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/FrameLoadState.h                                (rev 0)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.h        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FrameLoadState_h
+#define FrameLoadState_h
+
+#include &lt;wtf/text/WTFString.h&gt;
+
+namespace WebKit {
+
+class FrameLoadState {
+public:
+    FrameLoadState();
+    ~FrameLoadState();
+
+    enum LoadState {
+        LoadStateProvisional,
+        LoadStateCommitted,
+        LoadStateFinished
+    };
+
+    // FIXME: These should all be private, and FrameLoadState should
+    // provide state transition member functions.
+    LoadState m_loadState;
+    String m_url;
+    String m_provisionalURL;
+    String m_unreachableURL;
+    String m_lastUnreachableURL;
+};
+
+} // namespace WebKit
+
+#endif // FrameLoadState_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> 
</span><span class="cx"> WebFrameProxy::WebFrameProxy(WebPageProxy* page, uint64_t frameID)
</span><span class="cx">     : m_page(page)
</span><del>-    , m_loadState(LoadStateFinished)
</del><span class="cx">     , m_isFrameSet(false)
</span><span class="cx">     , m_frameID(frameID)
</span><span class="cx"> {
</span><span class="lines">@@ -119,31 +118,31 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didStartProvisionalLoad(const String&amp; url)
</span><span class="cx"> {
</span><del>-    ASSERT(m_provisionalURL.isEmpty());
-    m_loadState = LoadStateProvisional;
-    m_provisionalURL = url;
</del><ins>+    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
+    m_frameLoadState.m_loadState = FrameLoadState::LoadStateProvisional;
+    m_frameLoadState.m_provisionalURL = url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const String&amp; url)
</span><span class="cx"> {
</span><del>-    ASSERT(m_loadState == LoadStateProvisional);
-    m_provisionalURL = url;
</del><ins>+    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
+    m_frameLoadState.m_provisionalURL = url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didFailProvisionalLoad()
</span><span class="cx"> {
</span><del>-    ASSERT(m_loadState == LoadStateProvisional);
-    m_loadState = LoadStateFinished;
-    m_provisionalURL = String();
-    m_unreachableURL = m_lastUnreachableURL;
</del><ins>+    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
+    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
+    m_frameLoadState.m_provisionalURL = String();
+    m_frameLoadState.m_unreachableURL = m_frameLoadState.m_lastUnreachableURL;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didCommitLoad(const String&amp; contentType, const PlatformCertificateInfo&amp; certificateInfo)
</span><span class="cx"> {
</span><del>-    ASSERT(m_loadState == LoadStateProvisional);
-    m_loadState = LoadStateCommitted;
-    m_url = m_provisionalURL;
-    m_provisionalURL = String();
</del><ins>+    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
+    m_frameLoadState.m_loadState = FrameLoadState::LoadStateCommitted;
+    m_frameLoadState.m_url = m_frameLoadState.m_provisionalURL;
+    m_frameLoadState.m_provisionalURL = String();
</ins><span class="cx">     m_title = String();
</span><span class="cx">     m_MIMEType = contentType;
</span><span class="cx">     m_isFrameSet = false;
</span><span class="lines">@@ -152,21 +151,21 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didFinishLoad()
</span><span class="cx"> {
</span><del>-    ASSERT(m_loadState == LoadStateCommitted);
-    ASSERT(m_provisionalURL.isEmpty());
-    m_loadState = LoadStateFinished;
</del><ins>+    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateCommitted);
+    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
+    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didFailLoad()
</span><span class="cx"> {
</span><del>-    ASSERT(m_loadState == LoadStateCommitted);
-    ASSERT(m_provisionalURL.isEmpty());
-    m_loadState = LoadStateFinished;
</del><ins>+    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateCommitted);
+    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
+    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didSameDocumentNavigation(const String&amp; url)
</span><span class="cx"> {
</span><del>-    m_url = url;
</del><ins>+    m_frameLoadState.m_url = url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::didChangeTitle(const String&amp; title)
</span><span class="lines">@@ -232,8 +231,8 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFrameProxy::setUnreachableURL(const String&amp; unreachableURL)
</span><span class="cx"> {
</span><del>-    m_lastUnreachableURL = m_unreachableURL;
-    m_unreachableURL = unreachableURL;
</del><ins>+    m_frameLoadState.m_lastUnreachableURL = m_frameLoadState.m_unreachableURL;
+    m_frameLoadState.m_unreachableURL = unreachableURL;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebFrameProxy_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;APIObject.h&quot;
</span><ins>+#include &quot;FrameLoadState.h&quot;
</ins><span class="cx"> #include &quot;ImmutableArray.h&quot;
</span><span class="cx"> #include &quot;GenericCallback.h&quot;
</span><span class="cx"> #include &quot;WebFrameListenerProxy.h&quot;
</span><span class="lines">@@ -60,12 +61,6 @@
</span><span class="cx"> 
</span><span class="cx">     virtual ~WebFrameProxy();
</span><span class="cx"> 
</span><del>-    enum LoadState {
-        LoadStateProvisional,
-        LoadStateCommitted,
-        LoadStateFinished
-    };
-
</del><span class="cx">     uint64_t frameID() const { return m_frameID; }
</span><span class="cx">     WebPageProxy* page() const { return m_page; }
</span><span class="cx"> 
</span><span class="lines">@@ -76,15 +71,17 @@
</span><span class="cx">     void setIsFrameSet(bool value) { m_isFrameSet = value; }
</span><span class="cx">     bool isFrameSet() const { return m_isFrameSet; }
</span><span class="cx"> 
</span><del>-    LoadState loadState() const { return m_loadState; }
</del><ins>+    FrameLoadState&amp; frameLoadState() { return m_frameLoadState; }
+
+    FrameLoadState::LoadState loadState() const { return m_frameLoadState.m_loadState; }
</ins><span class="cx">     
</span><span class="cx">     void stopLoading() const;
</span><span class="cx"> 
</span><del>-    const String&amp; url() const { return m_url; }
-    const String&amp; provisionalURL() const { return m_provisionalURL; }
</del><ins>+    const String&amp; url() const { return m_frameLoadState.m_url; }
+    const String&amp; provisionalURL() const { return m_frameLoadState.m_provisionalURL; }
</ins><span class="cx"> 
</span><span class="cx">     void setUnreachableURL(const String&amp;);
</span><del>-    const String&amp; unreachableURL() const { return m_unreachableURL; }
</del><ins>+    const String&amp; unreachableURL() const { return m_frameLoadState.m_unreachableURL; }
</ins><span class="cx"> 
</span><span class="cx">     const String&amp; mimeType() const { return m_MIMEType; }
</span><span class="cx"> 
</span><span class="lines">@@ -121,11 +118,9 @@
</span><span class="cx">     WebFrameProxy(WebPageProxy* page, uint64_t frameID);
</span><span class="cx"> 
</span><span class="cx">     WebPageProxy* m_page;
</span><del>-    LoadState m_loadState;
-    String m_url;
-    String m_provisionalURL;
-    String m_unreachableURL;
-    String m_lastUnreachableURL;
</del><ins>+
+    FrameLoadState m_frameLoadState;
+
</ins><span class="cx">     String m_MIMEType;
</span><span class="cx">     String m_title;
</span><span class="cx">     bool m_isFrameSet;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">     , m_estimatedProgress(0)
</span><span class="cx">     , m_viewState(ViewState::NoFlags)
</span><span class="cx">     , m_backForwardList(WebBackForwardList::create(this))
</span><del>-    , m_loadStateAtProcessExit(WebFrameProxy::LoadStateFinished)
</del><ins>+    , m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished)
</ins><span class="cx">     , m_temporarilyClosedComposition(false)
</span><span class="cx">     , m_textZoomFactor(1)
</span><span class="cx">     , m_pageZoomFactor(1)
</span><span class="lines">@@ -847,11 +847,11 @@
</span><span class="cx">     if (!m_mainFrame-&gt;unreachableURL().isEmpty())
</span><span class="cx">         return m_mainFrame-&gt;unreachableURL();
</span><span class="cx"> 
</span><del>-    switch (m_mainFrame-&gt;loadState()) {
-    case WebFrameProxy::LoadStateProvisional:
</del><ins>+    switch (m_mainFrame-&gt;frameLoadState().m_loadState) {
+    case FrameLoadState::LoadStateProvisional:
</ins><span class="cx">         return m_mainFrame-&gt;provisionalURL();
</span><del>-    case WebFrameProxy::LoadStateCommitted:
-    case WebFrameProxy::LoadStateFinished:
</del><ins>+    case FrameLoadState::LoadStateCommitted:
+    case FrameLoadState::LoadStateFinished:
</ins><span class="cx">         return m_mainFrame-&gt;url();
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx">     PassRefPtr&lt;ImmutableArray&gt; relatedPages() const;
</span><span class="cx"> 
</span><span class="cx">     const String&amp; urlAtProcessExit() const { return m_urlAtProcessExit; }
</span><del>-    WebFrameProxy::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
</del><ins>+    FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">     WebCore::DragSession dragSession() const { return m_currentDragSession; }
</span><span class="lines">@@ -1090,7 +1090,7 @@
</span><span class="cx">     String m_toolTip;
</span><span class="cx"> 
</span><span class="cx">     String m_urlAtProcessExit;
</span><del>-    WebFrameProxy::LoadState m_loadStateAtProcessExit;
</del><ins>+    FrameLoadState::LoadState m_loadStateAtProcessExit;
</ins><span class="cx"> 
</span><span class="cx">     EditorState m_editorState;
</span><span class="cx">     bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (159076 => 159077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2013-11-11 23:31:17 UTC (rev 159076)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2013-11-11 23:32:15 UTC (rev 159077)
</span><span class="lines">@@ -266,6 +266,8 @@
</span><span class="cx">                 1AE00D4F182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */; };
</span><span class="cx">                 1AE00D5C182DADE100087DD7 /* KeyedEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D5A182DADE100087DD7 /* KeyedEncoder.cpp */; };
</span><span class="cx">                 1AE00D5D182DADE100087DD7 /* KeyedEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5B182DADE100087DD7 /* KeyedEncoder.h */; };
</span><ins>+                1AE00D601831792100087DD7 /* FrameLoadState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */; };
+                1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5F1831792100087DD7 /* FrameLoadState.h */; };
</ins><span class="cx">                 1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
</span><span class="cx">                 1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4976611FF658E0048B464 /* NPJSObject.h */; };
</span><span class="cx">                 1AE4976911FF658E0048B464 /* NPJSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4976711FF658E0048B464 /* NPJSObject.cpp */; };
</span><span class="lines">@@ -1752,6 +1754,8 @@
</span><span class="cx">                 1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextHandleInternal.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AE00D5A182DADE100087DD7 /* KeyedEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyedEncoder.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AE00D5B182DADE100087DD7 /* KeyedEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyedEncoder.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoadState.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
+                1AE00D5F1831792100087DD7 /* FrameLoadState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameLoadState.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AE4976611FF658E0048B464 /* NPJSObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObject.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1AE4976711FF658E0048B464 /* NPJSObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObject.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -4294,6 +4298,8 @@
</span><span class="cx">                                 BC2652131182608100243E12 /* DrawingAreaProxy.h */,
</span><span class="cx">                                 1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
</span><span class="cx">                                 1A910070126675C4001842F5 /* FindIndicator.cpp */,
</span><ins>+                                1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */,
+                                1AE00D5F1831792100087DD7 /* FrameLoadState.h */,
</ins><span class="cx">                                 1A91006F126675C3001842F5 /* FindIndicator.h */,
</span><span class="cx">                                 BC17753E118BABF0007D9E9A /* GenericCallback.h */,
</span><span class="cx">                                 BC06F44912DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.cpp */,
</span><span class="lines">@@ -5793,6 +5799,7 @@
</span><span class="cx">                                 1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
</span><span class="cx">                                 51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */,
</span><span class="cx">                                 51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
</span><ins>+                                1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */,
</ins><span class="cx">                                 BC59548915C7868500FD1E3E /* WebKit2.h in Headers */,
</span><span class="cx">                                 BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
</span><span class="cx">                                 BC9BA5051697C45300E44616 /* WebKit2Initialize.h in Headers */,
</span><span class="lines">@@ -6763,6 +6770,7 @@
</span><span class="cx">                                 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */,
</span><span class="cx">                                 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
</span><span class="cx">                                 E179FD9F134D38250015B883 /* ArgumentCodersMac.mm in Sources */,
</span><ins>+                                1AE00D601831792100087DD7 /* FrameLoadState.cpp in Sources */,
</ins><span class="cx">                                 BC032DA510F437D10058C15A /* ArgumentDecoder.cpp in Sources */,
</span><span class="cx">                                 BC032DA710F437D10058C15A /* ArgumentEncoder.cpp in Sources */,
</span><span class="cx">                                 BCEE966C112FAF57006BCC24 /* Attachment.cpp in Sources */,
</span></span></pre>
</div>
</div>

</body>
</html>