<!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>[179229] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179229">179229</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 16:48:19 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary m_cachedPage null-checks in PageCache
https://bugs.webkit.org/show_bug.cgi?id=140965
Reviewed by Andreas Kling.
Remove unnecessary m_cachedPage null-checks in PageCache. We initialize
m_cachedPage when inserting the HistoryItem in the page cache and clear
it when removing it from the page cache. Therefore, it is guaranteed
that HistoryItems currently in the page cache have m_cachedPage
initialized and there is no need to null-check it.
* history/PageCache.cpp:
(WebCore::PageCache::frameCount):
(WebCore::PageCache::markPagesForVistedLinkStyleRecalc):
(WebCore::PageCache::markPagesForFullStyleRecalc):
(WebCore::PageCache::markPagesForDeviceScaleChanged):
(WebCore::PageCache::markPagesForCaptionPreferencesChanged):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179228 => 179229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 00:13:37 UTC (rev 179228)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 00:48:19 UTC (rev 179229)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-27 Chris Dumez <cdumez@apple.com>
+
+ Remove unnecessary m_cachedPage null-checks in PageCache
+ https://bugs.webkit.org/show_bug.cgi?id=140965
+
+ Reviewed by Andreas Kling.
+
+ Remove unnecessary m_cachedPage null-checks in PageCache. We initialize
+ m_cachedPage when inserting the HistoryItem in the page cache and clear
+ it when removing it from the page cache. Therefore, it is guaranteed
+ that HistoryItems currently in the page cache have m_cachedPage
+ initialized and there is no need to null-check it.
+
+ * history/PageCache.cpp:
+ (WebCore::PageCache::frameCount):
+ (WebCore::PageCache::markPagesForVistedLinkStyleRecalc):
+ (WebCore::PageCache::markPagesForFullStyleRecalc):
+ (WebCore::PageCache::markPagesForDeviceScaleChanged):
+ (WebCore::PageCache::markPagesForCaptionPreferencesChanged):
+
</ins><span class="cx"> 2015-01-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Some NSAccessibility methods we use are deprecated on 10.10
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (179228 => 179229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-01-28 00:13:37 UTC (rev 179228)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-01-28 00:48:19 UTC (rev 179229)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> for (HistoryItem* current = m_head; current; current = current->m_next) {
</span><span class="cx"> ++frameCount;
</span><span class="cx"> ASSERT(current->m_cachedPage);
</span><del>- frameCount += current->m_cachedPage ? current->m_cachedPage->cachedMainFrame()->descendantFrameCount() : 0;
</del><ins>+ frameCount += current->m_cachedPage->cachedMainFrame()->descendantFrameCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return frameCount;
</span><span class="lines">@@ -401,26 +401,26 @@
</span><span class="cx"> void PageCache::markPagesForVistedLinkStyleRecalc()
</span><span class="cx"> {
</span><span class="cx"> for (HistoryItem* current = m_head; current; current = current->m_next) {
</span><del>- if (current->m_cachedPage)
- current->m_cachedPage->markForVistedLinkStyleRecalc();
</del><ins>+ ASSERT(current->m_cachedPage);
+ current->m_cachedPage->markForVistedLinkStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageCache::markPagesForFullStyleRecalc(Page* page)
</span><span class="cx"> {
</span><span class="cx"> for (HistoryItem* current = m_head; current; current = current->m_next) {
</span><del>- CachedPage* cachedPage = current->m_cachedPage.get();
- if (cachedPage && &page->mainFrame() == &cachedPage->cachedMainFrame()->view()->frame())
- cachedPage->markForFullStyleRecalc();
</del><ins>+ CachedPage& cachedPage = *current->m_cachedPage;
+ if (&page->mainFrame() == &cachedPage.cachedMainFrame()->view()->frame())
+ cachedPage.markForFullStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageCache::markPagesForDeviceScaleChanged(Page* page)
</span><span class="cx"> {
</span><span class="cx"> for (HistoryItem* current = m_head; current; current = current->m_next) {
</span><del>- CachedPage* cachedPage = current->m_cachedPage.get();
- if (cachedPage && &page->mainFrame() == &cachedPage->cachedMainFrame()->view()->frame())
- cachedPage->markForDeviceScaleChanged();
</del><ins>+ CachedPage& cachedPage = *current->m_cachedPage;
+ if (&page->mainFrame() == &cachedPage.cachedMainFrame()->view()->frame())
+ cachedPage.markForDeviceScaleChanged();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -428,8 +428,8 @@
</span><span class="cx"> void PageCache::markPagesForCaptionPreferencesChanged()
</span><span class="cx"> {
</span><span class="cx"> for (HistoryItem* current = m_head; current; current = current->m_next) {
</span><del>- if (current->m_cachedPage)
- current->m_cachedPage->markForCaptionPreferencesChanged();
</del><ins>+ ASSERT(current->m_cachedPage);
+ current->m_cachedPage->markForCaptionPreferencesChanged();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>