<!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>[179281] trunk/Source/WebKit2</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/179281">179281</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-28 13:16:56 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert WebPreferences and VisitedLinkProvider to be bridged API::Objects
https://bugs.webkit.org/show_bug.cgi?id=141002
Patch by Sam Weinig <sam@webkit.org> on 2015-01-28
Reviewed by Tim Horton.
* Shared/API/APIObject.h:
Add VisitedLinkProvider type.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Allocate WebPreferences and VisitedLinkProvider as their Objective-C counterpart.
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences init]):
Switch to constructInWrapper.
(-[WKPreferences dealloc]):
Call the WebPreferences destructor.
(-[WKPreferences _apiObject]):
Add implementation of the WKObject protocol.
* UIProcess/API/Cocoa/WKPreferencesInternal.h:
Convert to using ObjectStorage.
* UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm:
(-[_WKVisitedLinkProvider init]):
Switch to constructInWrapper.
(-[_WKVisitedLinkProvider dealloc]):
Call the VisitedLinkProvider destructor.
(-[_WKVisitedLinkProvider _apiObject]):
Add implementation of the WKObject protocol.
* UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h:
Convert to using ObjectStorage.
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::create):
* UIProcess/VisitedLinkProvider.h:
Switch create() to return a Ref.
* UIProcess/WebPreferences.h:
Make the constructor public for use by constructInWrapper.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createWebPage):
* UIProcess/WebProcessPool.h:
Store the VisitedLinkProvider in a Ref.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProvidermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProviderInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProvidercpp">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProviderh">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencesh">trunk/Source/WebKit2/UIProcess/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-01-28 Sam Weinig <sam@webkit.org>
+
+ Convert WebPreferences and VisitedLinkProvider to be bridged API::Objects
+ https://bugs.webkit.org/show_bug.cgi?id=141002
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/APIObject.h:
+ Add VisitedLinkProvider type.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ Allocate WebPreferences and VisitedLinkProvider as their Objective-C counterpart.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences init]):
+ Switch to constructInWrapper.
+
+ (-[WKPreferences dealloc]):
+ Call the WebPreferences destructor.
+
+ (-[WKPreferences _apiObject]):
+ Add implementation of the WKObject protocol.
+
+ * UIProcess/API/Cocoa/WKPreferencesInternal.h:
+ Convert to using ObjectStorage.
+
+ * UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm:
+ (-[_WKVisitedLinkProvider init]):
+ Switch to constructInWrapper.
+
+ (-[_WKVisitedLinkProvider dealloc]):
+ Call the VisitedLinkProvider destructor.
+
+ (-[_WKVisitedLinkProvider _apiObject]):
+ Add implementation of the WKObject protocol.
+
+ * UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h:
+ Convert to using ObjectStorage.
+
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::create):
+ * UIProcess/VisitedLinkProvider.h:
+ Switch create() to return a Ref.
+
+ * UIProcess/WebPreferences.h:
+ Make the constructor public for use by constructInWrapper.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createWebPage):
+ * UIProcess/WebProcessPool.h:
+ Store the VisitedLinkProvider in a Ref.
+
</ins><span class="cx"> 2015-01-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx"> UserMediaPermissionRequest,
</span><span class="cx"> Vibration,
</span><span class="cx"> ViewportAttributes,
</span><ins>+ VisitedLinkProvider,
</ins><span class="cx"> WebsiteDataStore,
</span><span class="cx">
</span><span class="cx"> // Bundle types
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #import "WKNSURLRequest.h"
</span><span class="cx"> #import "WKNavigationDataInternal.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><ins>+#import "WKPreferencesInternal.h"
</ins><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKUserContentControllerInternal.h"
</span><span class="cx"> #import "WKUserScriptInternal.h"
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> #import "_WKDownloadInternal.h"
</span><span class="cx"> #import "_WKFrameHandleInternal.h"
</span><span class="cx"> #import "_WKProcessPoolConfigurationInternal.h"
</span><ins>+#import "_WKVisitedLinkProviderInternal.h"
</ins><span class="cx"> #import "_WKWebsiteDataStoreInternal.h"
</span><span class="cx"> #import <objc/objc-auto.h>
</span><span class="cx">
</span><span class="lines">@@ -108,6 +110,10 @@
</span><span class="cx"> wrapper = NSAllocateObject([WKConnection self], size, nullptr);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::Preferences:
+ wrapper = [WKPreferences alloc];
+ break;
+
</ins><span class="cx"> case Type::ProcessPool:
</span><span class="cx"> wrapper = [WKProcessPool alloc];
</span><span class="cx"> break;
</span><span class="lines">@@ -168,6 +174,10 @@
</span><span class="cx"> wrapper = [WKUserScript alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::VisitedLinkProvider:
+ wrapper = [_WKVisitedLinkProvider alloc];
+ break;
+
</ins><span class="cx"> case Type::WebsiteDataStore:
</span><span class="cx"> wrapper = [_WKWebsiteDataStore alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -39,10 +39,17 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _preferences = WebKit::WebPreferences::create(String(), "WebKit", "WebKit");
</del><ins>+ API::Object::constructInWrapper<WebKit::WebPreferences>(self, String(), "WebKit", "WebKit");
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ _preferences->~WebPreferences();
+
+ [super dealloc];
+}
+
</ins><span class="cx"> - (CGFloat)minimumFontSize
</span><span class="cx"> {
</span><span class="cx"> return _preferences->minimumFontSize();
</span><span class="lines">@@ -99,6 +106,13 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_preferences;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKPreferences (WKPrivate)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -27,15 +27,22 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RefPtr.h>
</del><ins>+#import "WKObject.h"
+#import "WebPreferences.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-class WebPreferences;
</del><ins>+
+inline WKPreferences *wrapper(WebPreferences& preferences)
+{
+ ASSERT([preferences.wrapper() isKindOfClass:[WKPreferences class]]);
+ return (WKPreferences *)preferences.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WKPreferences () {
</del><ins>+}
+
+@interface WKPreferences () <WKObject> {
</ins><span class="cx"> @package
</span><del>- RefPtr<WebKit::WebPreferences> _preferences;
</del><ins>+ API::ObjectStorage<WebKit::WebPreferences> _preferences;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProvidermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -38,11 +38,18 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _visitedLinkProvider = WebKit::VisitedLinkProvider::create();
</del><ins>+ API::Object::constructInWrapper<WebKit::VisitedLinkProvider>(self);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ _visitedLinkProvider->~VisitedLinkProvider();
+
+ [super dealloc];
+}
+
</ins><span class="cx"> - (void)addVisitedLinkWithURL:(NSURL *)URL
</span><span class="cx"> {
</span><span class="cx"> auto linkHash = WebCore::visitedLinkHash(URL.absoluteString);
</span><span class="lines">@@ -55,6 +62,13 @@
</span><span class="cx"> _visitedLinkProvider->removeAll();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_visitedLinkProvider;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProviderInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -27,15 +27,22 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RefPtr.h>
</del><ins>+#import "VisitedLinkProvider.h"
+#import "WKObject.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-class VisitedLinkProvider;
</del><ins>+
+inline _WKVisitedLinkProvider *wrapper(VisitedLinkProvider& visitedLinkProvider)
+{
+ ASSERT([visitedLinkProvider.wrapper() isKindOfClass:[_WKVisitedLinkProvider class]]);
+ return (_WKVisitedLinkProvider *)visitedLinkProvider.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-@interface _WKVisitedLinkProvider () {
</del><ins>+}
+
+@interface _WKVisitedLinkProvider () <WKObject> {
</ins><span class="cx"> @package
</span><del>- RefPtr<WebKit::VisitedLinkProvider> _visitedLinkProvider;
</del><ins>+ API::ObjectStorage<WebKit::VisitedLinkProvider> _visitedLinkProvider;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> return ++identifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<VisitedLinkProvider> VisitedLinkProvider::create()
</del><ins>+Ref<VisitedLinkProvider> VisitedLinkProvider::create()
</ins><span class="cx"> {
</span><del>- return adoptRef(new VisitedLinkProvider);
</del><ins>+ return adoptRef(*new VisitedLinkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::~VisitedLinkProvider()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef VisitedLinkProvider_h
</span><span class="cx"> #define VisitedLinkProvider_h
</span><span class="cx">
</span><ins>+#include "APIObject.h"
</ins><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><span class="cx"> #include "WebProcessLifetimeObserver.h"
</span><span class="lines">@@ -40,11 +41,13 @@
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx">
</span><del>-class VisitedLinkProvider : public RefCounted<VisitedLinkProvider>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
</del><ins>+class VisitedLinkProvider final : public API::ObjectImpl<API::Object::Type::VisitedLinkProvider>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<VisitedLinkProvider> create();
- ~VisitedLinkProvider();
</del><ins>+ static Ref<VisitedLinkProvider> create();
</ins><span class="cx">
</span><ins>+ explicit VisitedLinkProvider();
+ virtual ~VisitedLinkProvider();
+
</ins><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx">
</span><span class="cx"> void addProcess(WebProcessProxy&);
</span><span class="lines">@@ -54,8 +57,6 @@
</span><span class="cx"> void removeAll();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- VisitedLinkProvider();
-
</del><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> static PassRefPtr<WebPreferences> create(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</span><span class="cx"> static PassRefPtr<WebPreferences> createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</span><span class="cx">
</span><ins>+ explicit WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
+ WebPreferences(const WebPreferences&);
+
</ins><span class="cx"> virtual ~WebPreferences();
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebPreferences> copy() const;
</span><span class="lines">@@ -71,9 +74,6 @@
</span><span class="cx"> static bool anyPagesAreUsingPrivateBrowsing();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
- WebPreferences(const WebPreferences&);
-
</del><span class="cx"> void platformInitializeStore();
</span><span class="cx">
</span><span class="cx"> void update();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> if (!configuration.preferences)
</span><span class="cx"> configuration.preferences = &configuration.pageGroup->preferences();
</span><span class="cx"> if (!configuration.visitedLinkProvider)
</span><del>- configuration.visitedLinkProvider = m_visitedLinkProvider.get();
</del><ins>+ configuration.visitedLinkProvider = m_visitedLinkProvider.ptr();
</ins><span class="cx"> if (!configuration.websiteDataStore) {
</span><span class="cx"> ASSERT(!configuration.sessionID.isValid());
</span><span class="cx"> configuration.websiteDataStore = m_websiteDataStore.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (179280 => 179281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-01-28 21:01:06 UTC (rev 179280)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-01-28 21:16:56 UTC (rev 179281)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> void registerURLSchemeAsCachePartitioned(const String&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- VisitedLinkProvider& visitedLinkProvider() { return *m_visitedLinkProvider; }
</del><ins>+ VisitedLinkProvider& visitedLinkProvider() { return m_visitedLinkProvider.get(); }
</ins><span class="cx">
</span><span class="cx"> void setCacheModel(CacheModel);
</span><span class="cx"> CacheModel cacheModel() const { return m_cacheModel; }
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PluginInfoStore m_pluginInfoStore;
</span><span class="cx"> #endif
</span><del>- RefPtr<VisitedLinkProvider> m_visitedLinkProvider;
</del><ins>+ Ref<VisitedLinkProvider> m_visitedLinkProvider;
</ins><span class="cx"> bool m_visitedLinksPopulated;
</span><span class="cx">
</span><span class="cx"> PlugInAutoStartProvider m_plugInAutoStartProvider;
</span></span></pre>
</div>
</div>
</body>
</html>