<!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>[175347] 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/175347">175347</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 14:59:48 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Notify Settings object when its Page object goes away.
https://bugs.webkit.org/show_bug.cgi?id=138183
rdar://problem/18786900
Reviewed by Andreas Kling.
I could not make a test for this issue.
* page/Page.cpp:
(WebCore::Page::~Page):
* page/Settings.cpp:
(WebCore::setImageLoadingSettings):
(WebCore::Settings::Settings):
(WebCore::Settings::setTextAutosizingEnabled):
(WebCore::Settings::setTextAutosizingWindowSizeOverride):
(WebCore::Settings::setTextAutosizingFontScaleFactor):
(WebCore::Settings::setMediaTypeOverride):
(WebCore::Settings::setScriptEnabled):
(WebCore::Settings::setUserStyleSheetLocation):
(WebCore::Settings::setMinDOMTimerInterval):
(WebCore::Settings::minDOMTimerInterval):
(WebCore::Settings::domTimerAlignmentInterval):
(WebCore::Settings::setUsesPageCache):
(WebCore::Settings::setScreenFontSubstitutionEnabled):
(WebCore::Settings::setFontRenderingMode):
(WebCore::Settings::setDNSPrefetchingEnabled):
(WebCore::Settings::setStorageBlockingPolicy):
(WebCore::Settings::setBackgroundShouldExtendBeyondPage):
(WebCore::Settings::setScrollingPerformanceLoggingEnabled):
(WebCore::Settings::setHiddenPageDOMTimerThrottlingEnabled):
(WebCore::Settings::setHiddenPageCSSAnimationSuspensionEnabled):
(WebCore::Settings::setFontFallbackPrefersPictographs):
* page/Settings.h:
(WebCore::Settings::pageDestroyed):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175346 => 175347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-29 21:32:06 UTC (rev 175346)
+++ trunk/Source/WebCore/ChangeLog 2014-10-29 21:59:48 UTC (rev 175347)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-10-29 Alexey Proskuryakov <ap@apple.com>
+
+ Notify Settings object when its Page object goes away.
+ https://bugs.webkit.org/show_bug.cgi?id=138183
+ rdar://problem/18786900
+
+ Reviewed by Andreas Kling.
+
+ I could not make a test for this issue.
+
+ * page/Page.cpp:
+ (WebCore::Page::~Page):
+ * page/Settings.cpp:
+ (WebCore::setImageLoadingSettings):
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setTextAutosizingEnabled):
+ (WebCore::Settings::setTextAutosizingWindowSizeOverride):
+ (WebCore::Settings::setTextAutosizingFontScaleFactor):
+ (WebCore::Settings::setMediaTypeOverride):
+ (WebCore::Settings::setScriptEnabled):
+ (WebCore::Settings::setUserStyleSheetLocation):
+ (WebCore::Settings::setMinDOMTimerInterval):
+ (WebCore::Settings::minDOMTimerInterval):
+ (WebCore::Settings::domTimerAlignmentInterval):
+ (WebCore::Settings::setUsesPageCache):
+ (WebCore::Settings::setScreenFontSubstitutionEnabled):
+ (WebCore::Settings::setFontRenderingMode):
+ (WebCore::Settings::setDNSPrefetchingEnabled):
+ (WebCore::Settings::setStorageBlockingPolicy):
+ (WebCore::Settings::setBackgroundShouldExtendBeyondPage):
+ (WebCore::Settings::setScrollingPerformanceLoggingEnabled):
+ (WebCore::Settings::setHiddenPageDOMTimerThrottlingEnabled):
+ (WebCore::Settings::setHiddenPageCSSAnimationSuspensionEnabled):
+ (WebCore::Settings::setFontFallbackPrefersPictographs):
+ * page/Settings.h:
+ (WebCore::Settings::pageDestroyed):
+
</ins><span class="cx"> 2014-10-29 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove invalid float from RootInlineBox.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (175346 => 175347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-10-29 21:32:06 UTC (rev 175346)
+++ trunk/Source/WebCore/page/Page.cpp 2014-10-29 21:59:48 UTC (rev 175347)
</span><span class="lines">@@ -240,6 +240,8 @@
</span><span class="cx"> setGroupName(String());
</span><span class="cx"> allPages->remove(this);
</span><span class="cx">
</span><ins>+ m_settings->pageDestroyed();
+
</ins><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> frame->willDetachPage();
</span><span class="cx"> frame->detachFromPage();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (175346 => 175347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-10-29 21:32:06 UTC (rev 175346)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-10-29 21:59:48 UTC (rev 175347)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx">
</span><span class="cx"> static void setImageLoadingSettings(Page* page)
</span><span class="cx"> {
</span><ins>+ if (!page)
+ return;
+
</ins><span class="cx"> for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> frame->document()->cachedResourceLoader()->setImagesEnabled(page->settings().areImagesEnabled());
</span><span class="cx"> frame->document()->cachedResourceLoader()->setAutoLoadImages(page->settings().loadsImagesAutomatically());
</span><span class="lines">@@ -201,7 +204,7 @@
</span><span class="cx"> // hash before trying to use it.
</span><span class="cx"> AtomicString::init();
</span><span class="cx"> initializeDefaultFontFamilies();
</span><del>- m_page = page; // Page is not yet fully initialized wen constructing Settings, so keeping m_page null over initializeDefaultFontFamilies() call.
</del><ins>+ m_page = page; // Page is not yet fully initialized when constructing Settings, so keeping m_page null over initializeDefaultFontFamilies() call.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Settings::~Settings()
</span><span class="lines">@@ -330,7 +333,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_textAutosizingEnabled = textAutosizingEnabled;
</span><del>- m_page->setNeedsRecalcStyleInAllFrames();
</del><ins>+ if (m_page)
+ m_page->setNeedsRecalcStyleInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizingWindowSizeOverride)
</span><span class="lines">@@ -339,13 +343,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_textAutosizingWindowSizeOverride = textAutosizingWindowSizeOverride;
</span><del>- m_page->setNeedsRecalcStyleInAllFrames();
</del><ins>+ if (m_page)
+ m_page->setNeedsRecalcStyleInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> m_textAutosizingFontScaleFactor = fontScaleFactor;
</span><span class="cx">
</span><ins>+ if (!m_page)
+ return;
+
</ins><span class="cx"> // FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
</span><span class="cx"> for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext())
</span><span class="cx"> frame->document()->textAutosizer()->recalculateMultipliers();
</span><span class="lines">@@ -362,6 +370,9 @@
</span><span class="cx">
</span><span class="cx"> m_mediaTypeOverride = mediaTypeOverride;
</span><span class="cx">
</span><ins>+ if (!m_page)
+ return;
+
</ins><span class="cx"> FrameView* view = m_page->mainFrame().view();
</span><span class="cx"> ASSERT(view);
</span><span class="cx">
</span><span class="lines">@@ -394,6 +405,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isScriptEnabled = isScriptEnabled;
</span><ins>+
+ if (!m_page)
+ return;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_page->setNeedsRecalcStyleInAllFrames();
</span><span class="cx"> #endif
</span><span class="lines">@@ -434,7 +449,8 @@
</span><span class="cx">
</span><span class="cx"> m_userStyleSheetLocation = userStyleSheetLocation;
</span><span class="cx">
</span><del>- m_page->userStyleSheetLocationChanged();
</del><ins>+ if (m_page)
+ m_page->userStyleSheetLocationChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This quirk is needed because of Radar 4674537 and 5211271. We need to phase it out once Adobe
</span><span class="lines">@@ -456,11 +472,14 @@
</span><span class="cx">
</span><span class="cx"> void Settings::setMinDOMTimerInterval(double interval)
</span><span class="cx"> {
</span><del>- m_page->setMinimumTimerInterval(interval);
</del><ins>+ if (m_page)
+ m_page->setMinimumTimerInterval(interval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double Settings::minDOMTimerInterval()
</span><span class="cx"> {
</span><ins>+ if (!m_page)
+ return 0;
</ins><span class="cx"> return m_page->minimumTimerInterval();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -476,6 +495,8 @@
</span><span class="cx">
</span><span class="cx"> double Settings::domTimerAlignmentInterval() const
</span><span class="cx"> {
</span><ins>+ if (!m_page)
+ return 0;
</ins><span class="cx"> return m_page->timerAlignmentInterval();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -492,6 +513,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_usesPageCache = usesPageCache;
</span><ins>+
+ if (!m_page)
+ return;
+
</ins><span class="cx"> if (!m_usesPageCache) {
</span><span class="cx"> int first = -m_page->backForward().backCount();
</span><span class="cx"> int last = m_page->backForward().forwardCount();
</span><span class="lines">@@ -505,7 +530,9 @@
</span><span class="cx"> if (m_screenFontSubstitutionEnabled == enabled)
</span><span class="cx"> return;
</span><span class="cx"> m_screenFontSubstitutionEnabled = enabled;
</span><del>- m_page->setNeedsRecalcStyleInAllFrames();
</del><ins>+
+ if (m_page)
+ m_page->setNeedsRecalcStyleInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setFontRenderingMode(FontRenderingMode mode)
</span><span class="lines">@@ -513,7 +540,8 @@
</span><span class="cx"> if (fontRenderingMode() == mode)
</span><span class="cx"> return;
</span><span class="cx"> m_fontRenderingMode = mode;
</span><del>- m_page->setNeedsRecalcStyleInAllFrames();
</del><ins>+ if (m_page)
+ m_page->setNeedsRecalcStyleInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontRenderingMode Settings::fontRenderingMode() const
</span><span class="lines">@@ -534,7 +562,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_dnsPrefetchingEnabled = dnsPrefetchingEnabled;
</span><del>- m_page->dnsPrefetchingStateChanged();
</del><ins>+ if (m_page)
+ m_page->dnsPrefetchingStateChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setShowTiledScrollingIndicator(bool enabled)
</span><span class="lines">@@ -558,7 +587,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_storageBlockingPolicy = enabled;
</span><del>- m_page->storageBlockingStateChanged();
</del><ins>+ if (m_page)
+ m_page->storageBlockingStateChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setBackgroundShouldExtendBeyondPage(bool shouldExtend)
</span><span class="lines">@@ -568,7 +598,8 @@
</span><span class="cx">
</span><span class="cx"> m_backgroundShouldExtendBeyondPage = shouldExtend;
</span><span class="cx">
</span><del>- m_page->mainFrame().view()->updateExtendBackgroundIfNecessary();
</del><ins>+ if (m_page)
+ m_page->mainFrame().view()->updateExtendBackgroundIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="lines">@@ -597,7 +628,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_scrollingPerformanceLoggingEnabled = enabled;
</span><span class="cx">
</span><del>- if (m_page->mainFrame().view())
</del><ins>+ if (m_page && m_page->mainFrame().view())
</ins><span class="cx"> m_page->mainFrame().view()->setScrollingPerformanceLoggingEnabled(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -639,7 +670,8 @@
</span><span class="cx"> if (m_hiddenPageDOMTimerThrottlingEnabled == flag)
</span><span class="cx"> return;
</span><span class="cx"> m_hiddenPageDOMTimerThrottlingEnabled = flag;
</span><del>- m_page->hiddenPageDOMTimerThrottlingStateChanged();
</del><ins>+ if (m_page)
+ m_page->hiddenPageDOMTimerThrottlingStateChanged();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -648,7 +680,8 @@
</span><span class="cx"> if (m_hiddenPageCSSAnimationSuspensionEnabled == flag)
</span><span class="cx"> return;
</span><span class="cx"> m_hiddenPageCSSAnimationSuspensionEnabled = flag;
</span><del>- m_page->hiddenPageCSSAnimationSuspensionStateChanged();
</del><ins>+ if (m_page)
+ m_page->hiddenPageCSSAnimationSuspensionStateChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setFontFallbackPrefersPictographs(bool preferPictographs)
</span><span class="lines">@@ -657,7 +690,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_fontFallbackPrefersPictographs = preferPictographs;
</span><del>- m_page->setNeedsRecalcStyleInAllFrames();
</del><ins>+ if (m_page)
+ m_page->setNeedsRecalcStyleInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Settings::setLowPowerVideoAudioBufferSizeEnabled(bool flag)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (175346 => 175347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2014-10-29 21:32:06 UTC (rev 175346)
+++ trunk/Source/WebCore/page/Settings.h 2014-10-29 21:59:48 UTC (rev 175347)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> static PassRefPtr<Settings> create(Page*);
</span><span class="cx"> ~Settings();
</span><span class="cx">
</span><ins>+ void pageDestroyed() { m_page = nullptr; }
+
</ins><span class="cx"> WEBCORE_EXPORT void setStandardFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON);
</span><span class="cx"> WEBCORE_EXPORT const AtomicString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>