[webkit-changes] [157681] trunk/Source/WebKit2

Sat, 19 Oct 2013 14:08:27 -0700

Title: [157681] trunk/Source/WebKit2

Diff

Modified: trunk/Source/WebKit2/ChangeLog (157680 => 157681)


--- trunk/Source/WebKit2/ChangeLog	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/ChangeLog	2013-10-19 21:09:29 UTC (rev 157681)
@@ -1,5 +1,9 @@
 2013-10-19  Dan Bernstein  <m...@apple.com>
 
+        Fix the Mac 32-bit build by reverting r157676, r157678, and r157679.
+
+2013-10-19  Dan Bernstein  <m...@apple.com>
+
         Try to fix the Mac 32-bit build.
 
         * UIProcess/mac/WKFullScreenWindowController.h:

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,14 +25,15 @@
 
 #import <Foundation/Foundation.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKFoundation.h>
 
-#if WK_API_ENABLED
-
+@class WKBrowsingContextControllerData;
 @protocol WKBrowsingContextLoadDelegate;
 
 WK_EXPORT
-@interface WKBrowsingContextController : NSObject
+@interface WKBrowsingContextController : NSObject {
+@private
+    WKBrowsingContextControllerData *_data;
+}
 
 #pragma mark Delegates
 
@@ -117,5 +118,3 @@
 @property CGFloat pageZoom;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -28,8 +28,6 @@
 #import "WKBrowsingContextControllerPrivate.h"
 #import "WKBrowsingContextControllerInternal.h"
 
-#if WK_API_ENABLED
-
 #import "ObjCObjectGraph.h"
 #import "WKErrorCF.h"
 #import "WKFrame.h"
@@ -59,23 +57,47 @@
     return url ? CFBridgingRelease(WKURLCopyCFURL(kCFAllocatorDefault, adoptWK(url).get())) : nil;
 }
 
-@implementation WKBrowsingContextController {
+@interface WKBrowsingContextControllerData : NSObject {
+@public
     // Underlying WKPageRef.
     WKRetainPtr<WKPageRef> _pageRef;
+    
+    // Delegate for load callbacks.
+    id<WKBrowsingContextLoadDelegate> _loadDelegate;
 }
+@end
 
+@implementation WKBrowsingContextControllerData
+@end
+
+
+@implementation WKBrowsingContextController
+
 - (void)dealloc
 {
-    WKPageSetPageLoaderClient(_pageRef.get(), 0);
+    WKPageSetPageLoaderClient(_data->_pageRef.get(), 0);
 
+    [_data release];
     [super dealloc];
 }
 
 - (WKPageRef)_pageRef
 {
-    return _pageRef.get();
+    return _data->_pageRef.get();
 }
 
+#pragma mark Delegates
+
+- (id<WKBrowsingContextLoadDelegate>)loadDelegate
+{
+    return _data->_loadDelegate;
+}
+
+- (void)setLoadDelegate:(id<WKBrowsingContextLoadDelegate>)loadDelegate
+{
+    _data->_loadDelegate = loadDelegate;
+}
+
 #pragma mark Loading
 
 + (void)registerSchemeForCustomProtocol:(NSString *)scheme
@@ -111,7 +133,7 @@
     if (userData)
         wkUserData = ObjCObjectGraph::create(userData);
 
-    WKPageLoadURLRequestWithUserData(_pageRef.get(), wkRequest.get(), (WKTypeRef)wkUserData.get());
+    WKPageLoadURLRequestWithUserData(self._pageRef, wkRequest.get(), (WKTypeRef)wkUserData.get());
 }
 
 - (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
@@ -131,7 +153,7 @@
     if (userData)
         wkUserData = ObjCObjectGraph::create(userData);
 
-    WKPageLoadFileWithUserData(_pageRef.get(), wkURL.get(), wkAllowedDirectory.get(), (WKTypeRef)wkUserData.get());
+    WKPageLoadFileWithUserData(self._pageRef, wkURL.get(), wkAllowedDirectory.get(), (WKTypeRef)wkUserData.get());
 }
 
 - (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL
@@ -153,7 +175,7 @@
     if (userData)
         wkUserData = ObjCObjectGraph::create(userData);
 
-    WKPageLoadHTMLStringWithUserData(_pageRef.get(), wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
+    WKPageLoadHTMLStringWithUserData(self._pageRef, wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
 }
 
 - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL
@@ -190,44 +212,44 @@
     if (userData)
         wkUserData = ObjCObjectGraph::create(userData);
 
-    WKPageLoadDataWithUserData(_pageRef.get(), toAPI(wkData.get()), wkMIMEType.get(), wkEncodingName.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
+    WKPageLoadDataWithUserData(self._pageRef, toAPI(wkData.get()), wkMIMEType.get(), wkEncodingName.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
 }
 
 - (void)stopLoading
 {
-    WKPageStopLoading(_pageRef.get());
+    WKPageStopLoading(self._pageRef);
 }
 
 - (void)reload
 {
-    WKPageReload(_pageRef.get());
+    WKPageReload(self._pageRef);
 }
 
 - (void)reloadFromOrigin
 {
-    WKPageReloadFromOrigin(_pageRef.get());
+    WKPageReloadFromOrigin(self._pageRef);
 }
 
 #pragma mark Back/Forward
 
 - (void)goForward
 {
-    WKPageGoForward(_pageRef.get());
+    WKPageGoForward(self._pageRef);
 }
 
 - (BOOL)canGoForward
 {
-    return WKPageCanGoForward(_pageRef.get());
+    return WKPageCanGoForward(self._pageRef);
 }
 
 - (void)goBack
 {
-    WKPageGoBack(_pageRef.get());
+    WKPageGoBack(self._pageRef);
 }
 
 - (BOOL)canGoBack
 {
-    return WKPageCanGoBack(_pageRef.get());
+    return WKPageCanGoBack(self._pageRef);
 }
 
 
@@ -235,46 +257,46 @@
 
 - (NSURL *)activeURL
 {
-    return autoreleased(WKPageCopyActiveURL(_pageRef.get()));
+    return autoreleased(WKPageCopyActiveURL(self._pageRef));
 }
 
 - (NSURL *)provisionalURL
 {
-    return autoreleased(WKPageCopyProvisionalURL(_pageRef.get()));
+    return autoreleased(WKPageCopyProvisionalURL(self._pageRef));
 }
 
 - (NSURL *)committedURL
 {
-    return autoreleased(WKPageCopyCommittedURL(_pageRef.get()));
+    return autoreleased(WKPageCopyCommittedURL(self._pageRef));
 }
 
 #pragma mark Active Document Introspection
 
 - (NSString *)title
 {
-    return autoreleased(WKPageCopyTitle(_pageRef.get()));
+    return autoreleased(WKPageCopyTitle(self._pageRef));
 }
 
 #pragma mark Zoom
 
 - (CGFloat)textZoom
 {
-    return WKPageGetTextZoomFactor(_pageRef.get());
+    return WKPageGetTextZoomFactor(self._pageRef);
 }
 
 - (void)setTextZoom:(CGFloat)textZoom
 {
-    return WKPageSetTextZoomFactor(_pageRef.get(), textZoom);
+    return WKPageSetTextZoomFactor(self._pageRef, textZoom);
 }
 
 - (CGFloat)pageZoom
 {
-    return WKPageGetPageZoomFactor(_pageRef.get());
+    return WKPageGetPageZoomFactor(self._pageRef);
 }
 
 - (void)setPageZoom:(CGFloat)pageZoom
 {
-    return WKPageSetPageZoomFactor(_pageRef.get(), pageZoom);
+    return WKPageSetPageZoomFactor(self._pageRef, pageZoom);
 }
 
 @end
@@ -304,12 +326,12 @@
         return;
     }
 
-    WKPageSetPaginationMode(_pageRef.get(), mode);
+    WKPageSetPaginationMode(self._pageRef, mode);
 }
 
 - (WKBrowsingContextPaginationMode)paginationMode
 {
-    switch (WKPageGetPaginationMode(_pageRef.get())) {
+    switch (WKPageGetPaginationMode(self._pageRef)) {
     case kWKPaginationModeUnpaginated:
         return WKPaginationModeUnpaginated;
     case kWKPaginationModeLeftToRight:
@@ -328,37 +350,37 @@
 
 - (void)setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
 {
-    WKPageSetPaginationBehavesLikeColumns(_pageRef.get(), behavesLikeColumns);
+    WKPageSetPaginationBehavesLikeColumns(self._pageRef, behavesLikeColumns);
 }
 
 - (BOOL)paginationBehavesLikeColumns
 {
-    return WKPageGetPaginationBehavesLikeColumns(_pageRef.get());
+    return WKPageGetPaginationBehavesLikeColumns(self._pageRef);
 }
 
 - (void)setPageLength:(CGFloat)pageLength
 {
-    WKPageSetPageLength(_pageRef.get(), pageLength);
+    WKPageSetPageLength(self._pageRef, pageLength);
 }
 
 - (CGFloat)pageLength
 {
-    return WKPageGetPageLength(_pageRef.get());
+    return WKPageGetPageLength(self._pageRef);
 }
 
 - (void)setGapBetweenPages:(CGFloat)gapBetweenPages
 {
-    WKPageSetGapBetweenPages(_pageRef.get(), gapBetweenPages);
+    WKPageSetGapBetweenPages(self._pageRef, gapBetweenPages);
 }
 
 - (CGFloat)gapBetweenPages
 {
-    return WKPageGetGapBetweenPages(_pageRef.get());
+    return WKPageGetGapBetweenPages(self._pageRef);
 }
 
 - (NSUInteger)pageCount
 {
-    return WKPageGetPageCount(_pageRef.get());
+    return WKPageGetPageCount(self._pageRef);
 }
 
 @end
@@ -455,7 +477,8 @@
     if (!self)
         return nil;
 
-    _pageRef = pageRef;
+    _data = [[WKBrowsingContextControllerData alloc] init];
+    _data->_pageRef = pageRef;
 
     setUpPageLoaderClient(self, pageRef);
 
@@ -474,5 +497,3 @@
 }
  
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerInternal.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,8 +25,6 @@
 
 #import <WebKit2/WKBrowsingContextController.h>
 
-#if WK_API_ENABLED
-
 @interface WKBrowsingContextController (Internal)
 
 /* This should only be called from associate view. */
@@ -38,5 +36,3 @@
 + (NSMutableSet *)customSchemes;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,8 +26,6 @@
 #import <WebKit2/WKBrowsingContextController.h>
 #import <WebKit2/WKBase.h>
 
-#if WK_API_ENABLED
-
 enum {
     WKPaginationModeUnpaginated,
     WKPaginationModeLeftToRight,
@@ -52,5 +50,3 @@
 @property(readonly) NSUInteger pageCount;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,13 +25,15 @@
 
 #import <Foundation/Foundation.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKFoundation.h>
 #import <WebKit2/WKUserScriptInjectionTime.h>
 
-#if WK_API_ENABLED
+@class WKBrowsingContextGroupData;
 
 WK_EXPORT
-@interface WKBrowsingContextGroup : NSObject
+@interface WKBrowsingContextGroup : NSObject {
+@private
+    WKBrowsingContextGroupData *_data;
+}
 
 - (id)initWithIdentifier:(NSString *)identifier;
 
@@ -57,5 +59,3 @@
 @property BOOL allowsPlugIns;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -27,8 +27,6 @@
 #import "WKBrowsingContextGroup.h"
 #import "WKBrowsingContextGroupPrivate.h"
 
-#if WK_API_ENABLED
-
 #import "WKArray.h"
 #import "WKPageGroup.h"
 #import "WKPreferences.h"
@@ -38,27 +36,41 @@
 #import "WKURLCF.h"
 #import <wtf/Vector.h>
 
-@implementation WKBrowsingContextGroup {
+@interface WKBrowsingContextGroupData : NSObject {
+@public
     WKRetainPtr<WKPageGroupRef> _pageGroupRef;
 }
+@end
 
+@implementation WKBrowsingContextGroupData
+@end
+
+@implementation WKBrowsingContextGroup
+
 - (id)initWithIdentifier:(NSString *)identifier
 {
     self = [super init];
     if (!self)
         return nil;
 
-    _pageGroupRef = adoptWK(WKPageGroupCreateWithIdentifier(adoptWK(WKStringCreateWithCFString((CFStringRef)identifier)).get()));
+    _data = [[WKBrowsingContextGroupData alloc] init];
+    _data->_pageGroupRef = adoptWK(WKPageGroupCreateWithIdentifier(adoptWK(WKStringCreateWithCFString((CFStringRef)identifier)).get()));
 
     // Give the WKBrowsingContextGroup a identifier-less preferences, so that they
     // don't get automatically written to the disk. The automatic writing has proven
     // confusing to users of the API.
     WKRetainPtr<WKPreferencesRef> preferences = adoptWK(WKPreferencesCreate());
-    WKPageGroupSetPreferences(_pageGroupRef.get(), preferences.get());
+    WKPageGroupSetPreferences(_data->_pageGroupRef.get(), preferences.get());
 
     return self;
 }
 
+- (void)dealloc
+{
+    [_data release];
+    [super dealloc];
+}
+
 - (BOOL)allowsJavaScript
 {
     return WKPreferencesGetJavaScriptEnabled(WKPageGroupGetPreferences(self._pageGroupRef));
@@ -151,9 +163,7 @@
 
 - (WKPageGroupRef)_pageGroupRef
 {
-    return _pageGroupRef.get();
+    return _data->_pageGroupRef.get();
 }
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,12 +26,8 @@
 #import <WebKit2/WKBrowsingContextGroup.h>
 #import <WebKit2/WKBase.h>
 
-#if WK_API_ENABLED
-
 @interface WKBrowsingContextGroup (Private)
 
 @property(readonly) WKPageGroupRef _pageGroupRef;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,12 +25,9 @@
 
 #import <Foundation/Foundation.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKFoundation.h>
 
-#if WK_API_ENABLED
+@class WKConnection, WKConnectionData;
 
-@class WKConnection;
-
 @protocol WKConnectionDelegate <NSObject>
 
 - (void)connection:(WKConnection *)connection didReceiveMessageWithName:(NSString *)messageName body:(id)messageBody;
@@ -39,7 +36,10 @@
 @end
 
 WK_EXPORT
-@interface WKConnection : NSObject
+@interface WKConnection : NSObject {
+@private
+    WKConnectionData *_data;
+}
 
 - (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody;
 
@@ -48,5 +48,3 @@
 @property(assign) id<WKConnectionDelegate> delegate;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -27,8 +27,6 @@
 #import "WKConnection.h"
 #import "WKConnectionInternal.h"
 
-#if WK_API_ENABLED
-
 #import "ObjCObjectGraph.h"
 #import "WKConnectionRef.h"
 #import "WKData.h"
@@ -39,15 +37,26 @@
 
 using namespace WebKit;
 
-@implementation WKConnection {
+@interface WKConnectionData : NSObject {
+@public
     // Underlying connection object.
     WKRetainPtr<WKConnectionRef> _connectionRef;
+
+    // Delegate for callbacks.
+    id<WKConnectionDelegate> _delegate;
 }
+@end
 
+@implementation WKConnectionData
+@end
+
+@implementation WKConnection
+
 - (void)dealloc
 {
-    WKConnectionSetConnectionClient(_connectionRef.get(), 0);
+    WKConnectionSetConnectionClient(_data->_connectionRef.get(), 0);
 
+    [_data release];
     [super dealloc];
 }
 
@@ -56,9 +65,21 @@
     WKRetainPtr<WKStringRef> wkMessageName = adoptWK(WKStringCreateWithCFString((CFStringRef)messageName));
     RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
 
-    WKConnectionPostMessage(_connectionRef.get(), wkMessageName.get(), (WKTypeRef)wkMessageBody.get());
+    WKConnectionPostMessage(_data->_connectionRef.get(), wkMessageName.get(), (WKTypeRef)wkMessageBody.get());
 }
 
+#pragma mark Delegates
+
+- (id<WKConnectionDelegate>)delegate
+{
+    return _data->_delegate;
+}
+
+- (void)setDelegate:(id<WKConnectionDelegate>)delegate
+{
+    _data->_delegate = delegate;
+}
+
 @end
 
 @implementation WKConnection (Internal)
@@ -101,13 +122,12 @@
     if (!self)
         return nil;
 
-    _connectionRef = connectionRef;
+    _data = [[WKConnectionData alloc] init];
+    _data->_connectionRef = connectionRef;
 
-    setUpClient(self, _connectionRef.get());
+    setUpClient(self, _data->_connectionRef.get());
 
     return self;
 }
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,12 +26,8 @@
 #import <WebKit2/WKConnection.h>
 #import <WebKit2/WKBase.h>
 
-#if WK_API_ENABLED
-
 @interface WKConnection (Internal)
 
 - (id)_initWithConnectionRef:(WKConnectionRef)connectionRef;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -24,14 +24,10 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKConnection.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKFoundation.h>
 
-#if WK_API_ENABLED
+@class WKProcessGroup, WKProcessGroupData, WKConnection;
 
-@class WKProcessGroup;
-
 @protocol WKProcessGroupDelegate <NSObject>
 @optional
 
@@ -44,14 +40,16 @@
 @end
 
 WK_EXPORT
-@interface WKProcessGroup : NSObject
+@interface WKProcessGroup : NSObject {
+@private
+    WKProcessGroupData *_data;
+}
 
 - (id)initWithInjectedBundleURL:(NSURL *)bundleURL;
 
+
 #pragma mark Delegates
 
 @property(assign) id<WKProcessGroupDelegate> delegate;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -27,8 +27,6 @@
 #import "WKProcessGroup.h"
 #import "WKProcessGroupPrivate.h"
 
-#if WK_API_ENABLED
-
 #import "ObjCObjectGraph.h"
 #import "WKConnectionInternal.h"
 #import "WKContext.h"
@@ -36,11 +34,21 @@
 #import "WKStringCF.h"
 #import <wtf/RetainPtr.h>
 
-@implementation WKProcessGroup {
+@interface WKProcessGroupData : NSObject {
+@public
     // Underlying context object.
     WKRetainPtr<WKContextRef> _contextRef;
+
+    // Delegate for callbacks.
+    id<WKProcessGroupDelegate> _delegate;
 }
+@end
 
+@implementation WKProcessGroupData
+@end
+
+@implementation WKProcessGroup
+
 static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
 {
     WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
@@ -97,34 +105,45 @@
     if (!self)
         return nil;
 
+    _data = [[WKProcessGroupData alloc] init];
+    
     if (bundleURL)
-        _contextRef = adoptWK(WKContextCreateWithInjectedBundlePath(adoptWK(WKStringCreateWithCFString((CFStringRef)[bundleURL path])).get()));
+        _data->_contextRef = adoptWK(WKContextCreateWithInjectedBundlePath(adoptWK(WKStringCreateWithCFString((CFStringRef)[bundleURL path])).get()));
     else
-        _contextRef = adoptWK(WKContextCreate());
+        _data->_contextRef = adoptWK(WKContextCreate());
 
-    setUpConnectionClient(self, _contextRef.get());
-    setUpInectedBundleClient(self, _contextRef.get());
+    setUpConnectionClient(self, _data->_contextRef.get());
+    setUpInectedBundleClient(self, _data->_contextRef.get());
 
     return self;
 }
 
 - (void)dealloc
 {
-    WKContextSetConnectionClient(_contextRef.get(), 0);
-    WKContextSetInjectedBundleClient(_contextRef.get(), 0);
+    WKContextSetConnectionClient(_data->_contextRef.get(), 0);
+    WKContextSetInjectedBundleClient(_data->_contextRef.get(), 0);
 
+    [_data release];
     [super dealloc];
 }
 
+- (id<WKProcessGroupDelegate>)delegate
+{
+    return _data->_delegate;
+}
+
+- (void)setDelegate:(id<WKProcessGroupDelegate>)delegate
+{
+    _data->_delegate = delegate;
+}
+
 @end
 
 @implementation WKProcessGroup (Private)
 
 - (WKContextRef)_contextRef
 {
-    return _contextRef.get();
+    return _data->_contextRef.get();
 }
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,12 +26,8 @@
 #import <WebKit2/WKProcessGroup.h>
 #import <WebKit2/WKBase.h>
 
-#if WK_API_ENABLED
-
 @interface WKProcessGroup (Private)
 
 @property(readonly) WKContextRef _contextRef;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,10 +25,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKFoundation.h>
 
-#if WK_API_ENABLED
-
 @class WKBrowsingContextController;
 @class WKBrowsingContextGroup;
 @class WKProcessGroup;
@@ -50,5 +47,3 @@
 @property BOOL drawsTransparentBackground;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "WKView.h"
 
-#if WK_API_ENABLED
-
 #if USE(DICTATION_ALTERNATIVES)
 #import <AppKit/NSTextAlternatives.h>
 #import <AppKit/NSAttributedString.h>
@@ -3391,5 +3389,3 @@
 }
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -29,8 +29,6 @@
 #import <wtf/Forward.h>
 #import <wtf/Vector.h>
 
-#if WK_API_ENABLED
-
 namespace CoreIPC {
     class DataReference;
 }
@@ -101,5 +99,3 @@
 - (BOOL)_isWindowOccluded;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -26,8 +26,6 @@
 #import <WebKit2/WKView.h>
 #import <WebKit2/WKBase.h>
 
-#if WK_API_ENABLED
-
 typedef enum {
     WKContentAnchorTopLeft,
     WKContentAnchorTopRight,
@@ -84,5 +82,3 @@
 - (void)waitForAsyncDrawingAreaSizeUpdate;
 
 @end
-
-#endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h	2013-10-19 21:09:29 UTC (rev 157681)
@@ -25,12 +25,9 @@
 
 #if ENABLE(FULLSCREEN_API)
 
-#import "WKFoundation.h"
 #import <wtf/OwnPtr.h>
 #import <wtf/RetainPtr.h>
 
-#if WK_API_ENABLED
-
 namespace WebKit { 
 class LayerTreeContext;
 class VoidCallback;
@@ -79,6 +76,4 @@
 
 @end
 
-#endif // WK_API_ENABLED
-
-#endif // ENABLE(FULLSCREEN_API)
+#endif

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (157680 => 157681)


--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2013-10-19 21:03:51 UTC (rev 157680)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2013-10-19 21:09:29 UTC (rev 157681)
@@ -29,8 +29,6 @@
 
 #import "WKFullScreenWindowController.h"
 
-#if WK_API_ENABLED
-
 #import "LayerTreeContext.h"
 #import "WKAPICast.h"
 #import "WKViewInternal.h"
@@ -661,6 +659,4 @@
 }
 @end
 
-#endif // WK_API_ENABLED
-
-#endif // ENABLE(FULLSCREEN_API)
+#endif

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to