<!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>[184483] branches/safari-601.1.32-branch/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/184483">184483</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 07:23:35 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184304">r184304</a>. rdar://problem/19790341</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCorehistoryCachedPagecpp">branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebCorehistoryCachedPageh">branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCorehistoryPageCachecpp">branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebCorehistoryPageCacheh">branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCorepageFrameViewcpp">branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari601132branchSourceWebCorepageFrameViewh">branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184304. rdar://problem/19790341
+
+ 2015-05-13 Timothy Horton <timothy_horton@apple.com>
+
+ Going back after resizing causes scroll knob to appear in the middle of the page
+ https://bugs.webkit.org/show_bug.cgi?id=144968
+ <rdar://problem/18299827>
+
+ Reviewed by Beth Dakin.
+
+ * history/CachedPage.cpp:
+ (WebCore::CachedPage::restore):
+ (WebCore::CachedPage::clear):
+ * history/CachedPage.h:
+ (WebCore::CachedPage::markForContentsSizeChanged):
+ * history/PageCache.cpp:
+ (WebCore::PageCache::markPagesForContentsSizeChanged):
+ * history/PageCache.h:
+ Add a flag that will cause us to call updateContentsSize() after a page
+ comes out of the page cache, if necessary.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setContentsSize):
+ * page/FrameView.h:
+ Mark all cached pages for this frame as needing updateContentsSize()
+ when setContentsSize happens. This will ensure that scrollbar layers
+ are repositioned when coming out of the page cache.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184296. rdar://problem/20100706
</span><span class="cx">
</span><span class="cx"> 2015-05-13 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorehistoryCachedPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.cpp (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.cpp 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.cpp 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -116,6 +116,11 @@
</span><span class="cx"> page.captionPreferencesChanged();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (m_needsUpdateContentsSize) {
+ if (FrameView* frameView = page.mainFrame().view())
+ frameView->updateContentsSize();
+ }
+
</ins><span class="cx"> clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -130,6 +135,7 @@
</span><span class="cx"> m_needsCaptionPreferencesChanged = false;
</span><span class="cx"> #endif
</span><span class="cx"> m_needsDeviceOrPageScaleChanged = false;
</span><ins>+ m_needsUpdateContentsSize = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedPage::hasExpired() const
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorehistoryCachedPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.h (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.h 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/history/CachedPage.h 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx">
</span><span class="cx"> void markForDeviceOrPageScaleChanged() { m_needsDeviceOrPageScaleChanged = true; }
</span><span class="cx">
</span><ins>+ void markForContentsSizeChanged() { m_needsUpdateContentsSize = true; }
+
</ins><span class="cx"> private:
</span><span class="cx"> double m_expirationTime;
</span><span class="cx"> std::unique_ptr<CachedFrame> m_cachedMainFrame;
</span><span class="lines">@@ -66,6 +68,7 @@
</span><span class="cx"> bool m_needsCaptionPreferencesChanged { false };
</span><span class="cx"> #endif
</span><span class="cx"> bool m_needsDeviceOrPageScaleChanged { false };
</span><ins>+ bool m_needsUpdateContentsSize { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.cpp (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.cpp 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.cpp 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -399,6 +399,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageCache::markPagesForContentsSizeChanged(Page& page)
+{
+ for (auto& item : m_items) {
+ CachedPage& cachedPage = *item->m_cachedPage;
+ if (&page.mainFrame() == &cachedPage.cachedMainFrame()->view()->frame())
+ cachedPage.markForContentsSizeChanged();
+ }
+}
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void PageCache::markPagesForCaptionPreferencesChanged()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorehistoryPageCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.h (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.h 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/history/PageCache.h 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> // Will mark all cached pages associated with the given page as needing style recalc.
</span><span class="cx"> void markPagesForFullStyleRecalc(Page&);
</span><span class="cx"> void markPagesForDeviceOrPageScaleChanged(Page&);
</span><ins>+ void markPagesForContentsSizeChanged(Page&);
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void markPagesForCaptionPreferencesChanged();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.cpp (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.cpp 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.cpp 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "MemoryPressureHandler.h"
</span><span class="cx"> #include "OverflowEvent.h"
</span><ins>+#include "PageCache.h"
</ins><span class="cx"> #include "PageOverlayController.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "RenderEmbeddedObject.h"
</span><span class="lines">@@ -575,8 +576,10 @@
</span><span class="cx">
</span><span class="cx"> page->chrome().contentsSizeChanged(&frame(), size); // Notify only.
</span><span class="cx">
</span><del>- if (frame().isMainFrame())
</del><ins>+ if (frame().isMainFrame()) {
</ins><span class="cx"> frame().mainFrame().pageOverlayController().didChangeDocumentSize();
</span><ins>+ PageCache::singleton().markPagesForContentsSizeChanged(*page);
+ }
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_deferSetNeedsLayoutCount);
</span><span class="cx"> m_deferSetNeedsLayoutCount--;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.h (184482 => 184483)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.h 2015-05-18 14:23:24 UTC (rev 184482)
+++ branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.h 2015-05-18 14:23:35 UTC (rev 184483)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> virtual bool avoidScrollbarCreation() const override;
</span><span class="cx">
</span><span class="cx"> virtual void setContentsSize(const IntSize&) override;
</span><ins>+ virtual void updateContentsSize() override;
</ins><span class="cx">
</span><span class="cx"> void layout(bool allowSubtree = true);
</span><span class="cx"> WEBCORE_EXPORT bool didFirstLayout() const;
</span><span class="lines">@@ -602,7 +603,6 @@
</span><span class="cx"> WEBCORE_EXPORT void adjustTiledBackingCoverage();
</span><span class="cx">
</span><span class="cx"> virtual void repaintContentRectangle(const IntRect&) override;
</span><del>- virtual void updateContentsSize() override;
</del><span class="cx"> virtual void addedOrRemovedScrollbar() override;
</span><span class="cx">
</span><span class="cx"> virtual void delegatesScrollingDidChange() override;
</span></span></pre>
</div>
</div>
</body>
</html>