[webkit-changes] [109819] trunk/Source/WebKit2/UIProcess

[timothy]

Title: [109819] trunk/Source/WebKit2/UIProcess

Revision

109819

Author

timo...@apple.com

Date

2012-03-05 16:54:16 -0800 (Mon, 05 Mar 2012)

Log Message

Fix 32-bit builds.

Modified Paths

• trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h
• trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

Diff

Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h (109818 => 109819)

--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h	2012-03-06 00:51:37 UTC (rev 109818)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h	2012-03-06 00:54:16 UTC (rev 109819)
@@ -34,8 +34,12 @@
 
 // This class is the Web Inspector window delegate. It can be used to add interface
 // actions that need to work when the Web Inspector window is key.
-WK_EXPORT @interface WKWebInspectorProxyObjCAdapter : NSObject <NSWindowDelegate>
+WK_EXPORT @interface WKWebInspectorProxyObjCAdapter : NSObject <NSWindowDelegate> {
+    void* _inspectorProxy;
+}
+
 @property (readonly) WKInspectorRef inspectorRef;
+
 @end
 
 #ifdef __cplusplus

Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (109818 => 109819)

--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm	2012-03-06 00:51:37 UTC (rev 109818)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm	2012-03-06 00:54:16 UTC (rev 109819)
@@ -53,19 +53,15 @@
 
 @interface WKWebInspectorProxyObjCAdapter ()
 
-@property (assign) WebInspectorProxy* _inspectorProxy; // Not retained to prevent cycles
-
 - (id)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy;
 
 @end
 
 @implementation WKWebInspectorProxyObjCAdapter
 
-@synthesize _inspectorProxy;
-
 - (WKInspectorRef)inspectorRef
 {
-    return toAPI(_inspectorProxy);
+    return toAPI(static_cast<WebInspectorProxy*>(_inspectorProxy));
 }
 
 - (id)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy
@@ -75,19 +71,19 @@
     if (!(self = [super init]))
         return nil;
 
-    _inspectorProxy = inspectorProxy; // Not retained to prevent cycles
+    _inspectorProxy = static_cast<void*>(inspectorProxy); // Not retained to prevent cycles
 
     return self;
 }
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-    _inspectorProxy->close();
+    static_cast<WebInspectorProxy*>(_inspectorProxy)->close();
 }
 
 - (void)inspectedViewFrameDidChange:(NSNotification *)notification
 {
-    _inspectorProxy->inspectedViewFrameDidChange();
+    static_cast<WebInspectorProxy*>(_inspectorProxy)->inspectedViewFrameDidChange();
 }
 
 @end

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