<!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>[159770] 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/159770">159770</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-11-25 15:50:27 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Remove some indirection that was only necessary for supporting the legacy Objective-C runtime
https://bugs.webkit.org/show_bug.cgi?id=123065
Reviewed by Sam Weinig.
* UIProcess/API/mac/WKBrowsingContextController.h: Removed _data ivar and
WKBrowsingContextControllerData class declaration.
* UIProcess/API/mac/WKBrowsingContextController.mm:
(-[WKBrowsingContextController dealloc]): Removed
WKBrowsingContextControllerData class and moved ivars directly into
WKBrowsingContextController, declaring them in the @implementation. Removed ivar and
accessors for the delegate properties, letting the compiler synthesize them.
(-[WKBrowsingContextController _pageRef]): Removed indirection via _data.
(-[WKBrowsingContextController loadRequest:userData:]): Removed indirection via -_pageRef.
(-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:userData:]): Ditto.
(-[WKBrowsingContextController loadHTMLString:baseURL:userData:]): Ditto.
(-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]): Ditto.
(-[WKBrowsingContextController stopLoading]): Ditto.
(-[WKBrowsingContextController reload]): Ditto.
(-[WKBrowsingContextController reloadFromOrigin]): Ditto.
(-[WKBrowsingContextController goForward]): Ditto.
(-[WKBrowsingContextController canGoForward]): Ditto.
(-[WKBrowsingContextController goBack]): Ditto.
(-[WKBrowsingContextController canGoBack]): Ditto.
(-[WKBrowsingContextController goToBackForwardListItem:]): Ditto.
(-[WKBrowsingContextController backForwardList]): Ditto.
(-[WKBrowsingContextController activeURL]): Ditto.
(-[WKBrowsingContextController provisionalURL]): Ditto.
(-[WKBrowsingContextController committedURL]): Ditto.
(-[WKBrowsingContextController unreachableURL]): Removed idirection via _data.
(-[WKBrowsingContextController estimatedProgress]): Removed indirection via -_pageRef.
(-[WKBrowsingContextController title]): Ditto.
(-[WKBrowsingContextController textZoom]): Ditto.
(-[WKBrowsingContextController setTextZoom:]): Ditto.
(-[WKBrowsingContextController pageZoom]): Ditto.
(-[WKBrowsingContextController setPageZoom:]): Ditto.
(-[WKBrowsingContextController setPaginationMode:]): Ditto.
(-[WKBrowsingContextController paginationMode]): Ditto.
(-[WKBrowsingContextController setPaginationBehavesLikeColumns:]): Ditto.
(-[WKBrowsingContextController paginationBehavesLikeColumns]): Ditto.
(-[WKBrowsingContextController setPageLength:]): Ditto.
(-[WKBrowsingContextController pageLength]): Ditto.
(-[WKBrowsingContextController setGapBetweenPages:]): Ditto.
(-[WKBrowsingContextController gapBetweenPages]): Ditto.
(-[WKBrowsingContextController pageCount]): Ditto.
(-[WKBrowsingContextController handle]): Ditto.
(-[WKBrowsingContextController _initWithPageRef:]): Removed indirection via _data.
* UIProcess/API/mac/WKBrowsingContextGroup.h: Removed _data ivar and
WKBrowsingContextGroupData class declaration.
* UIProcess/API/mac/WKBrowsingContextGroup.mm: Removed WKBrowsingContextGroupData class and
moved _pageGroupRef ivar directly into WKBrowsingContextGroup, declaring it in the
@implementation.
(-[WKBrowsingContextGroup initWithIdentifier:]): Removed indirection via _data.
(-[WKBrowsingContextGroup allowsJavaScript]): Removed indirection via -_pageGroupRef.
(-[WKBrowsingContextGroup setAllowsJavaScript:]): Ditto.
(-[WKBrowsingContextGroup allowsJavaScriptMarkup]): Ditto.
(-[WKBrowsingContextGroup setAllowsJavaScriptMarkup:]): Ditto.
(-[WKBrowsingContextGroup allowsPlugIns]): Ditto.
(-[WKBrowsingContextGroup setAllowsPlugIns:]): Ditto.
(-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Ditto.
(-[WKBrowsingContextGroup removeAllUserStyleSheets]): Ditto.
(-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Ditto.
(-[WKBrowsingContextGroup removeAllUserScripts]): Ditto.
(-[WKBrowsingContextGroup _pageGroupRef]): Removed indirection via _data.
* UIProcess/API/mac/WKConnection.h: Removed _data ivar and WKConnectionData class declaration.
* UIProcess/API/mac/WKConnection.mm: Removed WKConnectionData class and moved _connectionRef
ivar directly into WKConnection, declaring it in the @implementation. Removed ivar and
accessors for the delegate property, letting the compiler synthesize them.
(-[WKConnection dealloc]): Removed indirection via _data.
(-[WKConnection sendMessageWithName:body:]): Ditto.
(-[WKConnection remoteObjectRegistry]): Ditto.
(didReceiveMessage): Ditto.
(-[WKConnection _initWithConnectionRef:]): Ditto.
* UIProcess/API/mac/WKProcessGroup.h: Replaced forward declaration of WKConnection with an
import. Removed _data ivar and WKProcessGroupData class declaration.
* UIProcess/API/mac/WKProcessGroup.mm: Removed WKProcessGroupData class and moved
_contextRef ivar directly into WKProcessGroup, declaring it in the @implementation. Removed
ivar and accessors for the delegate property, letting the compiler synthesize them.
(-[WKProcessGroup initWithInjectedBundleURL:]): Removed indirection via _data.
(-[WKProcessGroup dealloc]): Ditto.
(-[WKProcessGroup _contextRef]): Ditto.
(-[WKProcessGroup _geolocationProvider]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllerh">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextGrouph">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKBrowsingContextGroupmm">trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKConnectionh">trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKConnectionmm">trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKProcessGrouph">trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -1,3 +1,91 @@
</span><ins>+2013-11-25 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Remove some indirection that was only necessary for supporting the legacy Objective-C runtime
+ https://bugs.webkit.org/show_bug.cgi?id=123065
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/mac/WKBrowsingContextController.h: Removed _data ivar and
+ WKBrowsingContextControllerData class declaration.
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController dealloc]): Removed
+ WKBrowsingContextControllerData class and moved ivars directly into
+ WKBrowsingContextController, declaring them in the @implementation. Removed ivar and
+ accessors for the delegate properties, letting the compiler synthesize them.
+ (-[WKBrowsingContextController _pageRef]): Removed indirection via _data.
+ (-[WKBrowsingContextController loadRequest:userData:]): Removed indirection via -_pageRef.
+ (-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:userData:]): Ditto.
+ (-[WKBrowsingContextController loadHTMLString:baseURL:userData:]): Ditto.
+ (-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]): Ditto.
+ (-[WKBrowsingContextController stopLoading]): Ditto.
+ (-[WKBrowsingContextController reload]): Ditto.
+ (-[WKBrowsingContextController reloadFromOrigin]): Ditto.
+ (-[WKBrowsingContextController goForward]): Ditto.
+ (-[WKBrowsingContextController canGoForward]): Ditto.
+ (-[WKBrowsingContextController goBack]): Ditto.
+ (-[WKBrowsingContextController canGoBack]): Ditto.
+ (-[WKBrowsingContextController goToBackForwardListItem:]): Ditto.
+ (-[WKBrowsingContextController backForwardList]): Ditto.
+ (-[WKBrowsingContextController activeURL]): Ditto.
+ (-[WKBrowsingContextController provisionalURL]): Ditto.
+ (-[WKBrowsingContextController committedURL]): Ditto.
+ (-[WKBrowsingContextController unreachableURL]): Removed idirection via _data.
+ (-[WKBrowsingContextController estimatedProgress]): Removed indirection via -_pageRef.
+ (-[WKBrowsingContextController title]): Ditto.
+ (-[WKBrowsingContextController textZoom]): Ditto.
+ (-[WKBrowsingContextController setTextZoom:]): Ditto.
+ (-[WKBrowsingContextController pageZoom]): Ditto.
+ (-[WKBrowsingContextController setPageZoom:]): Ditto.
+ (-[WKBrowsingContextController setPaginationMode:]): Ditto.
+ (-[WKBrowsingContextController paginationMode]): Ditto.
+ (-[WKBrowsingContextController setPaginationBehavesLikeColumns:]): Ditto.
+ (-[WKBrowsingContextController paginationBehavesLikeColumns]): Ditto.
+ (-[WKBrowsingContextController setPageLength:]): Ditto.
+ (-[WKBrowsingContextController pageLength]): Ditto.
+ (-[WKBrowsingContextController setGapBetweenPages:]): Ditto.
+ (-[WKBrowsingContextController gapBetweenPages]): Ditto.
+ (-[WKBrowsingContextController pageCount]): Ditto.
+ (-[WKBrowsingContextController handle]): Ditto.
+ (-[WKBrowsingContextController _initWithPageRef:]): Removed indirection via _data.
+
+ * UIProcess/API/mac/WKBrowsingContextGroup.h: Removed _data ivar and
+ WKBrowsingContextGroupData class declaration.
+ * UIProcess/API/mac/WKBrowsingContextGroup.mm: Removed WKBrowsingContextGroupData class and
+ moved _pageGroupRef ivar directly into WKBrowsingContextGroup, declaring it in the
+ @implementation.
+ (-[WKBrowsingContextGroup initWithIdentifier:]): Removed indirection via _data.
+ (-[WKBrowsingContextGroup allowsJavaScript]): Removed indirection via -_pageGroupRef.
+ (-[WKBrowsingContextGroup setAllowsJavaScript:]): Ditto.
+ (-[WKBrowsingContextGroup allowsJavaScriptMarkup]): Ditto.
+ (-[WKBrowsingContextGroup setAllowsJavaScriptMarkup:]): Ditto.
+ (-[WKBrowsingContextGroup allowsPlugIns]): Ditto.
+ (-[WKBrowsingContextGroup setAllowsPlugIns:]): Ditto.
+ (-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Ditto.
+ (-[WKBrowsingContextGroup removeAllUserStyleSheets]): Ditto.
+ (-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Ditto.
+ (-[WKBrowsingContextGroup removeAllUserScripts]): Ditto.
+ (-[WKBrowsingContextGroup _pageGroupRef]): Removed indirection via _data.
+
+ * UIProcess/API/mac/WKConnection.h: Removed _data ivar and WKConnectionData class declaration.
+ * UIProcess/API/mac/WKConnection.mm: Removed WKConnectionData class and moved _connectionRef
+ ivar directly into WKConnection, declaring it in the @implementation. Removed ivar and
+ accessors for the delegate property, letting the compiler synthesize them.
+ (-[WKConnection dealloc]): Removed indirection via _data.
+ (-[WKConnection sendMessageWithName:body:]): Ditto.
+ (-[WKConnection remoteObjectRegistry]): Ditto.
+ (didReceiveMessage): Ditto.
+ (-[WKConnection _initWithConnectionRef:]): Ditto.
+
+ * UIProcess/API/mac/WKProcessGroup.h: Replaced forward declaration of WKConnection with an
+ import. Removed _data ivar and WKProcessGroupData class declaration.
+ * UIProcess/API/mac/WKProcessGroup.mm: Removed WKProcessGroupData class and moved
+ _contextRef ivar directly into WKProcessGroup, declaring it in the @implementation. Removed
+ ivar and accessors for the delegate property, letting the compiler synthesize them.
+ (-[WKProcessGroup initWithInjectedBundleURL:]): Removed indirection via _data.
+ (-[WKProcessGroup dealloc]): Ditto.
+ (-[WKProcessGroup _contextRef]): Ditto.
+ (-[WKProcessGroup _geolocationProvider]): Ditto.
+
</ins><span class="cx"> 2013-11-25 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r159740.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@class WKBrowsingContextControllerData;
</del><span class="cx"> @class WKBackForwardList;
</span><span class="cx"> @class WKBackForwardListItem;
</span><span class="cx"> @protocol WKBrowsingContextHistoryDelegate;
</span><span class="lines">@@ -36,10 +35,7 @@
</span><span class="cx"> @protocol WKBrowsingContextPolicyDelegate;
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><del>-@interface WKBrowsingContextController : NSObject {
-@private
- WKBrowsingContextControllerData *_data;
-}
</del><ins>+@interface WKBrowsingContextController : NSObject
</ins><span class="cx">
</span><span class="cx"> #pragma mark Delegates
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -97,66 +97,27 @@
</span><span class="cx"> NSString * const WKActionOriginatingFrameURLKey = @"WKActionOriginatingFrameURLKey";
</span><span class="cx"> NSString * const WKActionCanShowMIMETypeKey = @"WKActionCanShowMIMETypeKey";
</span><span class="cx">
</span><del>-@interface WKBrowsingContextControllerData : NSObject {
-@public
</del><ins>+@implementation WKBrowsingContextController {
</ins><span class="cx"> // Underlying WKPageRef.
</span><span class="cx"> WKRetainPtr<WKPageRef> _pageRef;
</span><del>-
- // Delegate for load callbacks.
- id<WKBrowsingContextLoadDelegate> _loadDelegate;
-#if PLATFORM(IOS)
- id <WKBrowsingContextLoadDelegateInternal> _loadDelegateInternal;
-#endif // PLATFORM(IOS)
</del><span class="cx">
</span><del>- // Delegate for policy callbacks.
- id<WKBrowsingContextPolicyDelegate> _policyDelegate;
-
</del><span class="cx"> std::unique_ptr<PageLoadStateObserver> _pageLoadStateObserver;
</span><span class="cx"> }
</span><del>-@end
</del><span class="cx">
</span><del>-@implementation WKBrowsingContextControllerData
-@end
-
-@implementation WKBrowsingContextController
-
</del><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- toImpl(_data->_pageRef.get())->pageLoadState().removeObserver(*_data->_pageLoadStateObserver);
- WKPageSetPageLoaderClient(_data->_pageRef.get(), nullptr);
- WKPageSetPagePolicyClient(_data->_pageRef.get(), nullptr);
</del><ins>+ toImpl(_pageRef.get())->pageLoadState().removeObserver(*_pageLoadStateObserver);
+ WKPageSetPageLoaderClient(_pageRef.get(), nullptr);
+ WKPageSetPagePolicyClient(_pageRef.get(), nullptr);
</ins><span class="cx">
</span><del>- [_data release];
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKPageRef)_pageRef
</span><span class="cx"> {
</span><del>- return _data->_pageRef.get();
</del><ins>+ return _pageRef.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark Delegates
-
-- (id<WKBrowsingContextLoadDelegate>)loadDelegate
-{
- return _data->_loadDelegate;
-}
-
-- (void)setLoadDelegate:(id<WKBrowsingContextLoadDelegate>)loadDelegate
-{
- _data->_loadDelegate = loadDelegate;
-}
-
-- (id<WKBrowsingContextPolicyDelegate>)policyDelegate
-{
- return _data->_policyDelegate;
-}
-
-- (void)setPolicyDelegate:(id<WKBrowsingContextPolicyDelegate>)policyDelegate
-{
- _data->_policyDelegate = policyDelegate;
-}
-
</del><span class="cx"> #pragma mark Loading
</span><span class="cx">
</span><span class="cx"> + (void)registerSchemeForCustomProtocol:(NSString *)scheme
</span><span class="lines">@@ -192,7 +153,7 @@
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- WKPageLoadURLRequestWithUserData(self._pageRef, wkRequest.get(), (WKTypeRef)wkUserData.get());
</del><ins>+ WKPageLoadURLRequestWithUserData(_pageRef.get(), wkRequest.get(), (WKTypeRef)wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
</span><span class="lines">@@ -212,7 +173,7 @@
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- WKPageLoadFileWithUserData(self._pageRef, wkURL.get(), wkAllowedDirectory.get(), (WKTypeRef)wkUserData.get());
</del><ins>+ WKPageLoadFileWithUserData(_pageRef.get(), wkURL.get(), wkAllowedDirectory.get(), (WKTypeRef)wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL
</span><span class="lines">@@ -234,7 +195,7 @@
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- WKPageLoadHTMLStringWithUserData(self._pageRef, wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
</del><ins>+ WKPageLoadHTMLStringWithUserData(_pageRef.get(), wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL
</span><span class="lines">@@ -271,54 +232,54 @@
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- WKPageLoadDataWithUserData(self._pageRef, toAPI(wkData.get()), wkMIMEType.get(), wkEncodingName.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
</del><ins>+ WKPageLoadDataWithUserData(_pageRef.get(), toAPI(wkData.get()), wkMIMEType.get(), wkEncodingName.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopLoading
</span><span class="cx"> {
</span><del>- WKPageStopLoading(self._pageRef);
</del><ins>+ WKPageStopLoading(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)reload
</span><span class="cx"> {
</span><del>- WKPageReload(self._pageRef);
</del><ins>+ WKPageReload(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)reloadFromOrigin
</span><span class="cx"> {
</span><del>- WKPageReloadFromOrigin(self._pageRef);
</del><ins>+ WKPageReloadFromOrigin(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Back/Forward
</span><span class="cx">
</span><span class="cx"> - (void)goForward
</span><span class="cx"> {
</span><del>- WKPageGoForward(self._pageRef);
</del><ins>+ WKPageGoForward(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canGoForward
</span><span class="cx"> {
</span><del>- return WKPageCanGoForward(self._pageRef);
</del><ins>+ return WKPageCanGoForward(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)goBack
</span><span class="cx"> {
</span><del>- WKPageGoBack(self._pageRef);
</del><ins>+ WKPageGoBack(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canGoBack
</span><span class="cx"> {
</span><del>- return WKPageCanGoBack(self._pageRef);
</del><ins>+ return WKPageCanGoBack(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)goToBackForwardListItem:(WKBackForwardListItem *)item
</span><span class="cx"> {
</span><del>- toImpl(self._pageRef)->goToBackForwardItem(&item._item);
</del><ins>+ toImpl(_pageRef.get())->goToBackForwardItem(&item._item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKBackForwardList *)backForwardList
</span><span class="cx"> {
</span><del>- WebBackForwardList* list = toImpl(self._pageRef)->backForwardList();
</del><ins>+ WebBackForwardList* list = toImpl(_pageRef.get())->backForwardList();
</ins><span class="cx"> if (!list)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -329,56 +290,56 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)activeURL
</span><span class="cx"> {
</span><del>- return autoreleased(WKPageCopyActiveURL(self._pageRef));
</del><ins>+ return autoreleased(WKPageCopyActiveURL(_pageRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)provisionalURL
</span><span class="cx"> {
</span><del>- return autoreleased(WKPageCopyProvisionalURL(self._pageRef));
</del><ins>+ return autoreleased(WKPageCopyProvisionalURL(_pageRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)committedURL
</span><span class="cx"> {
</span><del>- return autoreleased(WKPageCopyCommittedURL(self._pageRef));
</del><ins>+ return autoreleased(WKPageCopyCommittedURL(_pageRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)unreachableURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:toImpl(_data->_pageRef.get())->pageLoadState().unreachableURL() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:toImpl(_pageRef.get())->pageLoadState().unreachableURL() relativeToURL:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)estimatedProgress
</span><span class="cx"> {
</span><del>- return toImpl(self._pageRef)->estimatedProgress();
</del><ins>+ return toImpl(_pageRef.get())->estimatedProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Active Document Introspection
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="cx"> {
</span><del>- return autoreleased(WKPageCopyTitle(self._pageRef));
</del><ins>+ return autoreleased(WKPageCopyTitle(_pageRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Zoom
</span><span class="cx">
</span><span class="cx"> - (CGFloat)textZoom
</span><span class="cx"> {
</span><del>- return WKPageGetTextZoomFactor(self._pageRef);
</del><ins>+ return WKPageGetTextZoomFactor(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setTextZoom:(CGFloat)textZoom
</span><span class="cx"> {
</span><del>- return WKPageSetTextZoomFactor(self._pageRef, textZoom);
</del><ins>+ return WKPageSetTextZoomFactor(_pageRef.get(), textZoom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGFloat)pageZoom
</span><span class="cx"> {
</span><del>- return WKPageGetPageZoomFactor(self._pageRef);
</del><ins>+ return WKPageGetPageZoomFactor(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPageZoom:(CGFloat)pageZoom
</span><span class="cx"> {
</span><del>- return WKPageSetPageZoomFactor(self._pageRef, pageZoom);
</del><ins>+ return WKPageSetPageZoomFactor(_pageRef.get(), pageZoom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -408,12 +369,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WKPageSetPaginationMode(self._pageRef, mode);
</del><ins>+ WKPageSetPaginationMode(_pageRef.get(), mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKBrowsingContextPaginationMode)paginationMode
</span><span class="cx"> {
</span><del>- switch (WKPageGetPaginationMode(self._pageRef)) {
</del><ins>+ switch (WKPageGetPaginationMode(_pageRef.get())) {
</ins><span class="cx"> case kWKPaginationModeUnpaginated:
</span><span class="cx"> return WKPaginationModeUnpaginated;
</span><span class="cx"> case kWKPaginationModeLeftToRight:
</span><span class="lines">@@ -432,42 +393,42 @@
</span><span class="cx">
</span><span class="cx"> - (void)setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
</span><span class="cx"> {
</span><del>- WKPageSetPaginationBehavesLikeColumns(self._pageRef, behavesLikeColumns);
</del><ins>+ WKPageSetPaginationBehavesLikeColumns(_pageRef.get(), behavesLikeColumns);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)paginationBehavesLikeColumns
</span><span class="cx"> {
</span><del>- return WKPageGetPaginationBehavesLikeColumns(self._pageRef);
</del><ins>+ return WKPageGetPaginationBehavesLikeColumns(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPageLength:(CGFloat)pageLength
</span><span class="cx"> {
</span><del>- WKPageSetPageLength(self._pageRef, pageLength);
</del><ins>+ WKPageSetPageLength(_pageRef.get(), pageLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGFloat)pageLength
</span><span class="cx"> {
</span><del>- return WKPageGetPageLength(self._pageRef);
</del><ins>+ return WKPageGetPageLength(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setGapBetweenPages:(CGFloat)gapBetweenPages
</span><span class="cx"> {
</span><del>- WKPageSetGapBetweenPages(self._pageRef, gapBetweenPages);
</del><ins>+ WKPageSetGapBetweenPages(_pageRef.get(), gapBetweenPages);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGFloat)gapBetweenPages
</span><span class="cx"> {
</span><del>- return WKPageGetGapBetweenPages(self._pageRef);
</del><ins>+ return WKPageGetGapBetweenPages(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSUInteger)pageCount
</span><span class="cx"> {
</span><del>- return WKPageGetPageCount(self._pageRef);
</del><ins>+ return WKPageGetPageCount(_pageRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKBrowsingContextHandle *)handle
</span><span class="cx"> {
</span><del>- return [[[WKBrowsingContextHandle alloc] _initWithPageID:toImpl(self._pageRef)->pageID()] autorelease];
</del><ins>+ return [[[WKBrowsingContextHandle alloc] _initWithPageID:toImpl(_pageRef.get())->pageID()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -686,18 +647,6 @@
</span><span class="cx"> WKPageSetPagePolicyClient(pageRef, &policyClient);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-- (id <WKBrowsingContextLoadDelegateInternal>)loadDelegateInternal
-{
- return _data->_loadDelegateInternal;
-}
-
-- (void)setLoadDelegateInternal:(id <WKBrowsingContextLoadDelegateInternal>)loadDelegateInternal
-{
- _data->_loadDelegateInternal = loadDelegateInternal;
-}
-#endif // PLATFORM(IOS)
-
</del><span class="cx"> /* This should only be called from associate view. */
</span><span class="cx">
</span><span class="cx"> - (id)_initWithPageRef:(WKPageRef)pageRef
</span><span class="lines">@@ -706,11 +655,10 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _data = [[WKBrowsingContextControllerData alloc] init];
- _data->_pageRef = pageRef;
</del><ins>+ _pageRef = pageRef;
</ins><span class="cx">
</span><del>- _data->_pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self);
- toImpl(_data->_pageRef.get())->pageLoadState().addObserver(*_data->_pageLoadStateObserver);
</del><ins>+ _pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self);
+ toImpl(_pageRef.get())->pageLoadState().addObserver(*_pageLoadStateObserver);
</ins><span class="cx">
</span><span class="cx"> setUpPageLoaderClient(self, pageRef);
</span><span class="cx"> setUpPagePolicyClient(self, pageRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -30,13 +30,8 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <WebKit2/WKUserScriptInjectionTime.h>
</span><span class="cx">
</span><del>-@class WKBrowsingContextGroupData;
-
</del><span class="cx"> WK_API_CLASS
</span><del>-@interface WKBrowsingContextGroup : NSObject {
-@private
- WKBrowsingContextGroupData *_data;
-}
</del><ins>+@interface WKBrowsingContextGroup : NSObject
</ins><span class="cx">
</span><span class="cx"> - (id)initWithIdentifier:(NSString *)identifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKBrowsingContextGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -42,69 +42,55 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-@interface WKBrowsingContextGroupData : NSObject {
-@public
</del><ins>+@implementation WKBrowsingContextGroup {
</ins><span class="cx"> WKRetainPtr<WKPageGroupRef> _pageGroupRef;
</span><span class="cx"> }
</span><del>-@end
</del><span class="cx">
</span><del>-@implementation WKBrowsingContextGroupData
-@end
-
-@implementation WKBrowsingContextGroup
-
</del><span class="cx"> - (id)initWithIdentifier:(NSString *)identifier
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _data = [[WKBrowsingContextGroupData alloc] init];
- _data->_pageGroupRef = adoptWK(WKPageGroupCreateWithIdentifier(adoptWK(WKStringCreateWithCFString((CFStringRef)identifier)).get()));
</del><ins>+ _pageGroupRef = adoptWK(WKPageGroupCreateWithIdentifier(adoptWK(WKStringCreateWithCFString((CFStringRef)identifier)).get()));
</ins><span class="cx">
</span><span class="cx"> // Give the WKBrowsingContextGroup a identifier-less preferences, so that they
</span><span class="cx"> // don't get automatically written to the disk. The automatic writing has proven
</span><span class="cx"> // confusing to users of the API.
</span><span class="cx"> WKRetainPtr<WKPreferencesRef> preferences = adoptWK(WKPreferencesCreate());
</span><del>- WKPageGroupSetPreferences(_data->_pageGroupRef.get(), preferences.get());
</del><ins>+ WKPageGroupSetPreferences(_pageGroupRef.get(), preferences.get());
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)dealloc
-{
- [_data release];
- [super dealloc];
-}
-
</del><span class="cx"> - (BOOL)allowsJavaScript
</span><span class="cx"> {
</span><del>- return WKPreferencesGetJavaScriptEnabled(WKPageGroupGetPreferences(self._pageGroupRef));
</del><ins>+ return WKPreferencesGetJavaScriptEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setAllowsJavaScript:(BOOL)allowsJavaScript
</span><span class="cx"> {
</span><del>- WKPreferencesSetJavaScriptEnabled(WKPageGroupGetPreferences(self._pageGroupRef), allowsJavaScript);
</del><ins>+ WKPreferencesSetJavaScriptEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()), allowsJavaScript);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)allowsJavaScriptMarkup
</span><span class="cx"> {
</span><del>- return WKPreferencesGetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(self._pageGroupRef));
</del><ins>+ return WKPreferencesGetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setAllowsJavaScriptMarkup:(BOOL)allowsJavaScriptMarkup
</span><span class="cx"> {
</span><del>- WKPreferencesSetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(self._pageGroupRef), allowsJavaScriptMarkup);
</del><ins>+ WKPreferencesSetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()), allowsJavaScriptMarkup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)allowsPlugIns
</span><span class="cx"> {
</span><del>- return WKPreferencesGetPluginsEnabled(WKPageGroupGetPreferences(self._pageGroupRef));
</del><ins>+ return WKPreferencesGetPluginsEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setAllowsPlugIns:(BOOL)allowsPlugIns
</span><span class="cx"> {
</span><del>- WKPreferencesSetPluginsEnabled(WKPageGroupGetPreferences(self._pageGroupRef), allowsPlugIns);
</del><ins>+ WKPreferencesSetPluginsEnabled(WKPageGroupGetPreferences(_pageGroupRef.get()), allowsPlugIns);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
</span><span class="lines">@@ -136,12 +122,12 @@
</span><span class="cx"> auto wkBlacklist = createWKArray(blacklist);
</span><span class="cx"> WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
</span><span class="cx">
</span><del>- WKPageGroupAddUserStyleSheet(self._pageGroupRef, wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames);
</del><ins>+ WKPageGroupAddUserStyleSheet(_pageGroupRef.get(), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeAllUserStyleSheets
</span><span class="cx"> {
</span><del>- WKPageGroupRemoveAllUserStyleSheets(self._pageGroupRef);
</del><ins>+ WKPageGroupRemoveAllUserStyleSheets(_pageGroupRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist injectionTime:(WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly
</span><span class="lines">@@ -155,12 +141,12 @@
</span><span class="cx"> auto wkBlacklist = createWKArray(blacklist);
</span><span class="cx"> WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
</span><span class="cx">
</span><del>- WKPageGroupAddUserScript(self._pageGroupRef, wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames, injectionTime);
</del><ins>+ WKPageGroupAddUserScript(_pageGroupRef.get(), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames, injectionTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeAllUserScripts
</span><span class="cx"> {
</span><del>- WKPageGroupRemoveAllUserScripts(self._pageGroupRef);
</del><ins>+ WKPageGroupRemoveAllUserScripts(_pageGroupRef.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -169,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKPageGroupRef)_pageGroupRef
</span><span class="cx"> {
</span><del>- return _data->_pageGroupRef.get();
</del><ins>+ return _pageGroupRef.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><span class="cx"> @class WKConnection;
</span><del>-@class WKConnectionData;
</del><span class="cx"> @class WKRemoteObjectRegistry;
</span><span class="cx">
</span><span class="cx"> @protocol WKConnectionDelegate <NSObject>
</span><span class="lines">@@ -41,14 +40,11 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><del>-@interface WKConnection : NSObject {
-@private
- WKConnectionData *_data;
-}
</del><ins>+@interface WKConnection : NSObject
</ins><span class="cx">
</span><span class="cx"> - (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody;
</span><span class="cx">
</span><del>-@property(assign) id <WKConnectionDelegate> delegate;
</del><ins>+@property (assign) id <WKConnectionDelegate> delegate;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) WKRemoteObjectRegistry *remoteObjectRegistry;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -32,35 +32,23 @@
</span><span class="cx"> #import "WKConnectionRef.h"
</span><span class="cx"> #import "WKData.h"
</span><span class="cx"> #import "WKRetainPtr.h"
</span><del>-#import "WKString.h"
</del><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-@interface WKConnectionData : NSObject {
-@public
</del><ins>+@implementation WKConnection {
</ins><span class="cx"> // Underlying connection object.
</span><span class="cx"> WKRetainPtr<WKConnectionRef> _connectionRef;
</span><span class="cx">
</span><del>- // Delegate for callbacks.
- id<WKConnectionDelegate> _delegate;
-
</del><span class="cx"> RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><span class="cx"> }
</span><del>-@end
</del><span class="cx">
</span><del>-@implementation WKConnectionData
-@end
-
-@implementation WKConnection
-
</del><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- WKConnectionSetConnectionClient(_data->_connectionRef.get(), 0);
</del><ins>+ WKConnectionSetConnectionClient(_connectionRef.get(), 0);
</ins><span class="cx">
</span><del>- [_data release];
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -69,25 +57,15 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> wkMessageName = adoptWK(WKStringCreateWithCFString((CFStringRef)messageName));
</span><span class="cx"> RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
</span><span class="cx">
</span><del>- WKConnectionPostMessage(_data->_connectionRef.get(), wkMessageName.get(), (WKTypeRef)wkMessageBody.get());
</del><ins>+ WKConnectionPostMessage(_connectionRef.get(), wkMessageName.get(), (WKTypeRef)wkMessageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (id <WKConnectionDelegate>)delegate
-{
- return _data->_delegate;
-}
-
-- (void)setDelegate:(id <WKConnectionDelegate>)delegate
-{
- _data->_delegate = delegate;
-}
-
</del><span class="cx"> - (WKRemoteObjectRegistry *)remoteObjectRegistry
</span><span class="cx"> {
</span><del>- if (!_data->_remoteObjectRegistry)
- _data->_remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:_data->_connectionRef.get()]);
</del><ins>+ if (!_remoteObjectRegistry)
+ _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:_connectionRef.get()]);
</ins><span class="cx">
</span><del>- return _data->_remoteObjectRegistry.get();
</del><ins>+ return _remoteObjectRegistry.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -98,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> WKConnection *connection = (WKConnection *)clientInfo;
</span><span class="cx">
</span><del>- if ([connection->_data->_remoteObjectRegistry _handleMessageWithName:messageName body:messageBody])
</del><ins>+ if ([connection->_remoteObjectRegistry _handleMessageWithName:messageName body:messageBody])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ([connection.delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
</span><span class="lines">@@ -136,10 +114,9 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _data = [[WKConnectionData alloc] init];
- _data->_connectionRef = connectionRef;
</del><ins>+ _connectionRef = connectionRef;
</ins><span class="cx">
</span><del>- setUpClient(self, _data->_connectionRef.get());
</del><ins>+ setUpClient(self, _connectionRef.get());
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKProcessGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -28,8 +28,9 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><ins>+#import <WebKit2/WKConnection.h>
</ins><span class="cx">
</span><del>-@class WKProcessGroup, WKProcessGroupData, WKConnection;
</del><ins>+@class WKProcessGroup;
</ins><span class="cx">
</span><span class="cx"> @protocol WKProcessGroupDelegate <NSObject>
</span><span class="cx"> @optional
</span><span class="lines">@@ -43,17 +44,14 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><del>-@interface WKProcessGroup : NSObject {
-@private
- WKProcessGroupData *_data;
-}
</del><ins>+@interface WKProcessGroup : NSObject
</ins><span class="cx">
</span><span class="cx"> - (id)initWithInjectedBundleURL:(NSURL *)bundleURL;
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #pragma mark Delegates
</span><span class="cx">
</span><del>-@property(assign) id<WKProcessGroupDelegate> delegate;
</del><ins>+@property (assign) id <WKProcessGroupDelegate> delegate;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm (159769 => 159770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm 2013-11-25 23:21:47 UTC (rev 159769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm 2013-11-25 23:50:27 UTC (rev 159770)
</span><span class="lines">@@ -51,25 +51,15 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-@interface WKProcessGroupData : NSObject {
-@public
</del><ins>+@implementation WKProcessGroup {
</ins><span class="cx"> // Underlying context object.
</span><span class="cx"> WKRetainPtr<WKContextRef> _contextRef;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<WKGeolocationProviderIOS> _geolocationProvider;
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><del>-
- // Delegate for callbacks.
- id<WKProcessGroupDelegate> _delegate;
</del><span class="cx"> }
</span><del>-@end
</del><span class="cx">
</span><del>-@implementation WKProcessGroupData
-@end
-
-@implementation WKProcessGroup
-
</del><span class="cx"> static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
</span><span class="lines">@@ -181,60 +171,47 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _data = [[WKProcessGroupData alloc] init];
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: Remove once <rdar://problem/15256572> is fixed.
</del><ins>+ // FIXME: Remove once <rdar://problem/15256572> is fixed.
</ins><span class="cx"> InitWebCoreThreadSystemInterface();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (bundleURL)
</span><del>- _data->_contextRef = adoptWK(WKContextCreateWithInjectedBundlePath(adoptWK(WKStringCreateWithCFString((CFStringRef)[bundleURL path])).get()));
</del><ins>+ _contextRef = adoptWK(WKContextCreateWithInjectedBundlePath(adoptWK(WKStringCreateWithCFString((CFStringRef)[bundleURL path])).get()));
</ins><span class="cx"> else
</span><del>- _data->_contextRef = adoptWK(WKContextCreate());
</del><ins>+ _contextRef = adoptWK(WKContextCreate());
</ins><span class="cx">
</span><del>- setUpConnectionClient(self, _data->_contextRef.get());
- setUpInectedBundleClient(self, _data->_contextRef.get());
- setUpHistoryClient(self, _data->_contextRef.get());
</del><ins>+ setUpConnectionClient(self, _contextRef.get());
+ setUpInectedBundleClient(self, _contextRef.get());
+ setUpHistoryClient(self, _contextRef.get());
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- WKContextSetConnectionClient(_data->_contextRef.get(), 0);
- WKContextSetInjectedBundleClient(_data->_contextRef.get(), 0);
- WKContextSetHistoryClient(_data->_contextRef.get(), 0);
</del><ins>+ WKContextSetConnectionClient(_contextRef.get(), 0);
+ WKContextSetInjectedBundleClient(_contextRef.get(), 0);
+ WKContextSetHistoryClient(_contextRef.get(), 0);
</ins><span class="cx">
</span><del>- [_data release];
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id<WKProcessGroupDelegate>)delegate
-{
- return _data->_delegate;
-}
-
-- (void)setDelegate:(id<WKProcessGroupDelegate>)delegate
-{
- _data->_delegate = delegate;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKProcessGroup (Private)
</span><span class="cx">
</span><span class="cx"> - (WKContextRef)_contextRef
</span><span class="cx"> {
</span><del>- return _data->_contextRef.get();
</del><ins>+ return _contextRef.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (WKGeolocationProviderIOS *)_geolocationProvider
</span><span class="cx"> {
</span><del>- if (!_data->_geolocationProvider)
- _data->_geolocationProvider = adoptNS([[WKGeolocationProviderIOS alloc] initWithContext:toImpl(_data->_contextRef.get())]);
- return _data->_geolocationProvider.get();
</del><ins>+ if (!_geolocationProvider)
+ _geolocationProvider = adoptNS([[WKGeolocationProviderIOS alloc] initWithContext:toImpl(_contextRef.get())]);
+ return _geolocationProvider.get();
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>