<!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>[165352] 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/165352">165352</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-09 11:14:07 -0700 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS Wk2] Can't scroll after going back to page in page cache
https://bugs.webkit.org/show_bug.cgi?id=129989
<rdar://problem/16217588>
Reviewed by Dan Bernstein.
iOS has a special FrameLoader::forceLayoutWithoutRecalculatingStyle()
function that is called instead of FrameView::forceLayout(). This was unimplemented
for the WK2 FrameLoaderClient, so no layout was forced, with the result
that the contentSize was never updated and scrolling was broken.
Fix by renaming the client function to forceLayoutOnRestoreFromPageCache()
and having it return a bool to say whether the default forceLayout()
should be done. WK1 can then continue to have its custom behavior,
and Wk2 will simply do a forceLayout().
Also remove FrameLaoderClient::forceLayout(), which was never called.
Source/WebCore:
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* loader/FrameLoaderClient.h:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm:
(WebKit::WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebFrameLoaderClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebCore/ChangeLog 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-03-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS Wk2] Can't scroll after going back to page in page cache
+ https://bugs.webkit.org/show_bug.cgi?id=129989
+ <rdar://problem/16217588>
+
+ Reviewed by Dan Bernstein.
+
+ iOS has a special FrameLoader::forceLayoutWithoutRecalculatingStyle()
+ function that is called instead of FrameView::forceLayout(). This was unimplemented
+ for the WK2 FrameLoaderClient, so no layout was forced, with the result
+ that the contentSize was never updated and scrolling was broken.
+
+ Fix by renaming the client function to forceLayoutOnRestoreFromPageCache()
+ and having it return a bool to say whether the default forceLayout()
+ should be done. WK1 can then continue to have its custom behavior,
+ and Wk2 will simply do a forceLayout().
+
+ Also remove FrameLaoderClient::forceLayout(), which was never called.
+
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * loader/FrameLoaderClient.h:
+
+2014-03-08 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [iOS WK2] Get position:fixed working slighlty better
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129988
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -237,9 +237,8 @@
</span><span class="cx"> virtual bool hasWebView() const override { return true; } // mainly for assertions
</span><span class="cx">
</span><span class="cx"> virtual void makeRepresentation(DocumentLoader*) override { }
</span><del>- virtual void forceLayout() override { }
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void forceLayoutWithoutRecalculatingStyles() override { }
</del><ins>+ virtual bool forceLayoutOnRestoreFromPageCache() override { return false; }
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void forceLayoutForNonHTML() override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -1837,7 +1837,8 @@
</span><span class="cx">
</span><span class="cx"> // Force a layout to update view size and thereby update scrollbars.
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- m_client.forceLayoutWithoutRecalculatingStyles();
</del><ins>+ if (!m_client.forceLayoutOnRestoreFromPageCache())
+ m_frame.view()->forceLayout();
</ins><span class="cx"> #else
</span><span class="cx"> m_frame.view()->forceLayout();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -114,9 +114,10 @@
</span><span class="cx"> virtual bool hasWebView() const = 0; // mainly for assertions
</span><span class="cx">
</span><span class="cx"> virtual void makeRepresentation(DocumentLoader*) = 0;
</span><del>- virtual void forceLayout() = 0;
</del><ins>+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void forceLayoutWithoutRecalculatingStyles() = 0;
</del><ins>+ // Returns true if the client forced the layout.
+ virtual bool forceLayoutOnRestoreFromPageCache() = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void forceLayoutForNonHTML() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-08 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS Wk2] Can't scroll after going back to page in page cache
+ https://bugs.webkit.org/show_bug.cgi?id=129989
+ <rdar://problem/16217588>
+
+ Reviewed by Dan Bernstein.
+
+ iOS has a special FrameLoader::forceLayoutWithoutRecalculatingStyle()
+ function that is called instead of FrameView::forceLayout(). This was unimplemented
+ for the WK2 FrameLoaderClient, so no layout was forced, with the result
+ that the contentSize was never updated and scrolling was broken.
+
+ Fix by renaming the client function to forceLayoutOnRestoreFromPageCache()
+ and having it return a bool to say whether the default forceLayout()
+ should be done. WK1 can then continue to have its custom behavior,
+ and Wk2 will simply do a forceLayout().
+
+ Also remove FrameLaoderClient::forceLayout(), which was never called.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache):
+
</ins><span class="cx"> 2014-03-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the remaining WebKit2 headers to WEBKIT2_HEADERS
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -62,9 +62,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void makeRepresentation(WebCore::DocumentLoader*) override;
</span><span class="cx"> virtual bool hasHTMLView() const override;
</span><del>- virtual void forceLayout() override;
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void forceLayoutWithoutRecalculatingStyles() override;
</del><ins>+ virtual bool forceLayoutOnRestoreFromPageCache() override;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void forceLayoutForNonHTML() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -254,28 +254,8 @@
</span><span class="cx"> return [view isKindOfClass:[WebHTMLView class]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::forceLayout()
-{
- NSView <WebDocumentView> *view = [m_webFrame->_private->webFrameView documentView];
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- // This gets called to lay out a page restored from the page cache.
- // To work around timing problems with UIKit, restore fixed
- // layout settings here.
- WebView* webView = getWebView(m_webFrame.get());
- bool isMainFrame = [webView mainFrame] == m_webFrame.get();
- Frame* coreFrame = core(m_webFrame.get());
- if (isMainFrame && coreFrame->view()) {
- IntSize newSize([webView _fixedLayoutSize]);
- coreFrame->view()->setFixedLayoutSize(newSize);
- coreFrame->view()->setUseFixedLayout(!newSize.isEmpty());
- }
-#endif
- [view setNeedsLayout:YES];
- [view layout];
-}
-
-#if PLATFORM(IOS)
-void WebFrameLoaderClient::forceLayoutWithoutRecalculatingStyles()
</del><ins>+bool WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache()
</ins><span class="cx"> {
</span><span class="cx"> NSView <WebDocumentView> *view = [m_webFrame->_private->webFrameView documentView];
</span><span class="cx"> // This gets called to lay out a page restored from the page cache.
</span><span class="lines">@@ -291,6 +271,7 @@
</span><span class="cx"> }
</span><span class="cx"> [view setNeedsLayout:YES];
</span><span class="cx"> [view layout];
</span><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -129,23 +129,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::forceLayout()
-{
- Frame* frame = core(m_webFrame);
- if (!frame)
- return;
-
- if (frame->document() && frame->document()->inPageCache())
- return;
-
- FrameView* view = frame->view();
- if (!view)
- return;
-
- view->setNeedsLayout();
- view->forceLayout(true);
-}
-
</del><span class="cx"> void WebFrameLoaderClient::forceLayoutForNonHTML()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool hasWebView() const;
</span><span class="cx">
</span><del>- virtual void forceLayout() override;
-
</del><span class="cx"> virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
</span><span class="cx">
</span><span class="cx"> virtual void frameLoaderDestroyed() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-03-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS Wk2] Can't scroll after going back to page in page cache
+ https://bugs.webkit.org/show_bug.cgi?id=129989
+ <rdar://problem/16217588>
+
+ Reviewed by Dan Bernstein.
+
+ iOS has a special FrameLoader::forceLayoutWithoutRecalculatingStyle()
+ function that is called instead of FrameView::forceLayout(). This was unimplemented
+ for the WK2 FrameLoaderClient, so no layout was forced, with the result
+ that the contentSize was never updated and scrolling was broken.
+
+ Fix by renaming the client function to forceLayoutOnRestoreFromPageCache()
+ and having it return a bool to say whether the default forceLayout()
+ should be done. WK1 can then continue to have its custom behavior,
+ and Wk2 will simply do a forceLayout().
+
+ Also remove FrameLaoderClient::forceLayout(), which was never called.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm:
+ (WebKit::WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache):
+
+2014-03-08 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [iOS WK2] Get position:fixed working slighlty better
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129988
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -125,11 +125,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::forceLayout()
-{
- notImplemented();
-}
-
</del><span class="cx"> void WebFrameLoaderClient::forceLayoutForNonHTML()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -50,9 +50,8 @@
</span><span class="cx"> virtual bool hasWebView() const override;
</span><span class="cx">
</span><span class="cx"> virtual void makeRepresentation(WebCore::DocumentLoader*) override;
</span><del>- virtual void forceLayout() override;
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void forceLayoutWithoutRecalculatingStyles() override;
</del><ins>+ virtual bool forceLayoutOnRestoreFromPageCache() override;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void forceLayoutForNonHTML() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebFrameLoaderClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm (165351 => 165352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm 2014-03-09 17:17:14 UTC (rev 165351)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm 2014-03-09 18:14:07 UTC (rev 165352)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::forceLayoutWithoutRecalculatingStyles()
</del><ins>+bool WebFrameLoaderClient::forceLayoutOnRestoreFromPageCache()
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDictionaryRef> WebFrameLoaderClient::connectionProperties(DocumentLoader*, unsigned long identifier)
</span></span></pre>
</div>
</div>
</body>
</html>