Changeset 181884 in webkit

Timestamp:

Mar 23, 2015, 6:12:26 PM (11 years ago)

Author:

Joseph Pecoraro

Message:

Unreviewed, attempt to fix 32-bit build after r181881.

• UIProcess/API/Cocoa/WKViewPrivate.h:
• UIProcess/API/mac/WKView.mm:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-23  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Unreviewed, attempt to fix 32-bit build after r181881.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        * UIProcess/API/mac/WKView.mm:
+
 2015-03-19  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -100 +100 @@
 @property (copy, nonatomic) NSColor *underlayColor;
 
+#if WK_API_ENABLED
 @property (strong, nonatomic, setter=_setInspectorAttachmentView:) NSView *_inspectorAttachmentView WK_AVAILABLE(WK_MAC_TBA, NA);
+#endif
 
 - (NSView*)fullScreenPlaceholderView;

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -181 +181 @@
 #if WK_API_ENABLED
     RetainPtr<WKBrowsingContextController> _browsingContextController;
+    RetainPtr<NSView> _inspectorAttachmentView;
 #endif
 
@@ -193 +194 @@
 
     RetainPtr<id> _remoteAccessibilityChild;
-
-    RetainPtr<NSView> _inspectorAttachmentView;
 
     // For asynchronous validation.
@@ -4136 +4135 @@
 }
 
+#if WK_API_ENABLED
 - (NSView *)_inspectorAttachmentView
 {
@@ -4151 +4151 @@
     _data->_page->inspector()->attachmentViewDidChange(oldView ? oldView : self, newView ? newView : self);
 }
+#endif
 
 - (NSView *)fullScreenPlaceholderView