<!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>[180286] 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/180286">180286</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 12:51:14 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page::userContentController() should return a reference, not a pointer
https://bugs.webkit.org/show_bug.cgi?id=141764
Reviewed by Jer Noble.
Source/WebCore:
No new tests (No behavior change)
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
* page/CaptionUserPreferences.cpp:
(WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::shouldHaveWebKitNamespaceForWorld):
* page/Frame.cpp:
(WebCore::Frame::injectUserScripts):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::~Page):
(WebCore::Page::setUserContentController):
* page/Page.h:
(WebCore::Page::userContentController):
* page/UserMessageHandlersNamespace.cpp:
(WebCore::UserMessageHandlersNamespace::handler):
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView setGroupName:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencescpp">trunk/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepageUserMessageHandlersNamespacecpp">trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-18 Brady Eidson <beidson@apple.com>
+
+ Page::userContentController() should return a reference, not a pointer
+ https://bugs.webkit.org/show_bug.cgi?id=141764
+
+ Reviewed by Jer Noble.
+
+ No new tests (No behavior change)
+
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::updateInjectedStyleSheetCache):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ * page/CaptionUserPreferences.cpp:
+ (WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::shouldHaveWebKitNamespaceForWorld):
+ * page/Frame.cpp:
+ (WebCore::Frame::injectUserScripts):
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::~Page):
+ (WebCore::Page::setUserContentController):
+ * page/Page.h:
+ (WebCore::Page::userContentController):
+ * page/UserMessageHandlersNamespace.cpp:
+ (WebCore::UserMessageHandlersNamespace::handler):
+
</ins><span class="cx"> 2015-02-18 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL2: Promote various WebGL1 extensions to core for WebGL2.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -137,11 +137,7 @@
</span><span class="cx"> if (!owningPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto* userContentController = owningPage->userContentController();
- if (!userContentController)
- return;
-
- const UserStyleSheetMap* userStyleSheets = userContentController->userStyleSheets();
</del><ins>+ const UserStyleSheetMap* userStyleSheets = owningPage->userContentController().userStyleSheets();
</ins><span class="cx"> if (!userStyleSheets)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- if (frame() && frame()->page() && frame()->page()->userContentController() && frame()->page()->userContentController()->contentFilterBlocksURL(url))
</del><ins>+ if (frame() && frame()->page() && frame()->page()->userContentController().contentFilterBlocksURL(url))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -276,20 +276,16 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(URL, captionsStyleSheetURL, (ParsedURLString, "user-captions-override:01F6AF12-C3B0-4F70-AF5E-A3E00234DC23"));
</span><span class="cx">
</span><span class="cx"> auto& pages = m_pageGroup.pages();
</span><del>- for (auto& page : pages) {
- if (auto* pageUserContentController = page->userContentController())
- pageUserContentController->removeUserStyleSheet(mainThreadNormalWorld(), captionsStyleSheetURL);
- }
</del><ins>+ for (auto& page : pages)
+ page->userContentController().removeUserStyleSheet(mainThreadNormalWorld(), captionsStyleSheetURL);
</ins><span class="cx">
</span><span class="cx"> String captionsOverrideStyleSheet = captionsStyleSheetOverride();
</span><span class="cx"> if (captionsOverrideStyleSheet.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& page : pages) {
</span><del>- if (auto* pageUserContentController = page->userContentController()) {
- auto userStyleSheet = std::make_unique<UserStyleSheet>(captionsOverrideStyleSheet, captionsStyleSheetURL, Vector<String>(), Vector<String>(), InjectInAllFrames, UserStyleAuthorLevel);
- pageUserContentController->addUserStyleSheet(mainThreadNormalWorld(), WTF::move(userStyleSheet), InjectInExistingDocuments);
- }
</del><ins>+ auto userStyleSheet = std::make_unique<UserStyleSheet>(captionsOverrideStyleSheet, captionsStyleSheetURL, Vector<String>(), Vector<String>(), InjectInAllFrames, UserStyleAuthorLevel);
+ page->userContentController().addUserStyleSheet(mainThreadNormalWorld(), WTF::move(userStyleSheet), InjectInExistingDocuments);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -758,11 +758,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto* userContentController = page->userContentController();
- if (!userContentController)
- return false;
-
- auto* descriptorMap = userContentController->userMessageHandlerDescriptors();
</del><ins>+ auto* descriptorMap = page->userContentController().userMessageHandlerDescriptors();
</ins><span class="cx"> if (!descriptorMap)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -695,12 +695,8 @@
</span><span class="cx"> if (loader().stateMachine().creatingInitialEmptyDocument() && !settings().shouldInjectUserScriptsInInitialEmptyDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto* userContentController = m_page->userContentController();
- if (!userContentController)
- return;
-
</del><span class="cx"> // Walk the hashtable. Inject by world.
</span><del>- const UserScriptMap* userScripts = userContentController->userScripts();
</del><ins>+ const UserScriptMap* userScripts = m_page->userContentController().userScripts();
</ins><span class="cx"> if (!userScripts)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/Page.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> , m_framesHandlingBeforeUnloadEvent(0)
</span><span class="cx"> , m_databaseProvider(*WTF::move(pageConfiguration.databaseProvider))
</span><span class="cx"> , m_storageNamespaceProvider(*WTF::move(pageConfiguration.storageNamespaceProvider))
</span><del>- , m_userContentController(WTF::move(pageConfiguration.userContentController))
</del><ins>+ , m_userContentController(*WTF::move(pageConfiguration.userContentController))
</ins><span class="cx"> , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
</span><span class="cx"> , m_sessionID(SessionID::defaultSessionID())
</span><span class="cx"> , m_isClosing(false)
</span><span class="lines">@@ -213,10 +213,7 @@
</span><span class="cx"> setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
</span><span class="cx">
</span><span class="cx"> m_storageNamespaceProvider->addPage(*this);
</span><del>-
- if (m_userContentController)
- m_userContentController->addPage(*this);
-
</del><ins>+ m_userContentController->addPage(*this);
</ins><span class="cx"> m_visitedLinkStore->addPage(*this);
</span><span class="cx">
</span><span class="cx"> if (!allPages) {
</span><span class="lines">@@ -268,9 +265,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_storageNamespaceProvider->removePage(*this);
</span><del>-
- if (m_userContentController)
- m_userContentController->removePage(*this);
</del><ins>+ m_userContentController->removePage(*this);
</ins><span class="cx"> m_visitedLinkStore->removePage(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1622,16 +1617,12 @@
</span><span class="cx"> return m_framesHandlingBeforeUnloadEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setUserContentController(UserContentController* userContentController)
</del><ins>+void Page::setUserContentController(Ref<UserContentController>&& userContentController)
</ins><span class="cx"> {
</span><del>- if (m_userContentController)
- m_userContentController->removePage(*this);
</del><ins>+ m_userContentController->removePage(*this);
+ m_userContentController = WTF::move(userContentController);
+ m_userContentController->addPage(*this);
</ins><span class="cx">
</span><del>- m_userContentController = userContentController;
-
- if (m_userContentController)
- m_userContentController->addPage(*this);
-
</del><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (Document *document = frame->document()) {
</span><span class="cx"> document->styleSheetCollection().invalidateInjectedStyleSheetCache();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/Page.h 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -406,8 +406,8 @@
</span><span class="cx"> StorageNamespaceProvider& storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
</span><span class="cx"> void setStorageNamespaceProvider(Ref<StorageNamespaceProvider>&&);
</span><span class="cx">
</span><del>- UserContentController* userContentController() { return m_userContentController.get(); }
- WEBCORE_EXPORT void setUserContentController(UserContentController*);
</del><ins>+ UserContentController& userContentController() { return m_userContentController.get(); }
+ WEBCORE_EXPORT void setUserContentController(Ref<UserContentController>&&);
</ins><span class="cx">
</span><span class="cx"> VisitedLinkStore& visitedLinkStore();
</span><span class="cx"> WEBCORE_EXPORT void setVisitedLinkStore(Ref<VisitedLinkStore>&&);
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<DatabaseProvider> m_databaseProvider;
</span><span class="cx"> Ref<StorageNamespaceProvider> m_storageNamespaceProvider;
</span><del>- RefPtr<UserContentController> m_userContentController;
</del><ins>+ Ref<UserContentController> m_userContentController;
</ins><span class="cx"> Ref<VisitedLinkStore> m_visitedLinkStore;
</span><span class="cx">
</span><span class="cx"> HashSet<ViewStateChangeObserver*> m_viewStateChangeObservers;
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserMessageHandlersNamespacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -59,12 +59,8 @@
</span><span class="cx"> Page* page = frame()->page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return nullptr;
</span><del>-
- const auto* userContentController = page->userContentController();
- if (!userContentController)
- return nullptr;
</del><span class="cx">
</span><del>- const auto* userMessageHandlerDescriptors = userContentController->userMessageHandlerDescriptors();
</del><ins>+ const auto* userMessageHandlerDescriptors = page->userContentController().userMessageHandlerDescriptors();
</ins><span class="cx"> if (!userMessageHandlerDescriptors)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Brady Eidson <beidson@apple.com>
+
+ Page::userContentController() should return a reference, not a pointer
+ https://bugs.webkit.org/show_bug.cgi?id=141764
+
+ Reviewed by Jer Noble.
+
+ * WebView/WebView.mm:
+ (-[WebView setGroupName:]):
+
</ins><span class="cx"> 2015-02-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access FontCache global instance via singleton() static member function
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (180285 => 180286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-02-18 20:42:53 UTC (rev 180285)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-02-18 20:51:14 UTC (rev 180286)
</span><span class="lines">@@ -6117,7 +6117,7 @@
</span><span class="cx"> if (!_private->page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _private->page->setUserContentController(&_private->group->userContentController());
</del><ins>+ _private->page->setUserContentController(_private->group->userContentController());
</ins><span class="cx"> _private->page->setVisitedLinkStore(_private->group->visitedLinkStore());
</span><span class="cx"> _private->page->setGroupName(groupName);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>