Title: [181884] trunk/Source/WebKit2
- Revision
- 181884
- Author
- [email protected]
- Date
- 2015-03-23 18:12:26 -0700 (Mon, 23 Mar 2015)
Log Message
Unreviewed, attempt to fix 32-bit build after r181881.
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181883 => 181884)
--- trunk/Source/WebKit2/ChangeLog 2015-03-24 01:01:55 UTC (rev 181883)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-24 01:12:26 UTC (rev 181884)
@@ -1,3 +1,10 @@
+2015-03-23 Joseph Pecoraro <[email protected]>
+
+ Unreviewed, attempt to fix 32-bit build after r181881.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+
2015-03-19 Timothy Hatcher <[email protected]>
Web Inspector: Support attaching to another view other than the WKView
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (181883 => 181884)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-03-24 01:01:55 UTC (rev 181883)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-03-24 01:12:26 UTC (rev 181884)
@@ -99,7 +99,9 @@
@property (readonly) NSColor *_pageExtendedBackgroundColor;
@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;
- (NSWindow*)createFullScreenWindow;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (181883 => 181884)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-24 01:01:55 UTC (rev 181883)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-24 01:12:26 UTC (rev 181884)
@@ -180,6 +180,7 @@
#if WK_API_ENABLED
RetainPtr<WKBrowsingContextController> _browsingContextController;
+ RetainPtr<NSView> _inspectorAttachmentView;
#endif
RetainPtr<NSTrackingArea> _primaryTrackingArea;
@@ -193,8 +194,6 @@
RetainPtr<id> _remoteAccessibilityChild;
- RetainPtr<NSView> _inspectorAttachmentView;
-
// For asynchronous validation.
ValidationMap _validationMap;
@@ -4135,6 +4134,7 @@
_data->_page->setUnderlayColor(colorFromNSColor(underlayColor));
}
+#if WK_API_ENABLED
- (NSView *)_inspectorAttachmentView
{
NSView *attachmentView = _data->_inspectorAttachmentView.get();
@@ -4150,6 +4150,7 @@
_data->_inspectorAttachmentView = newView;
_data->_page->inspector()->attachmentViewDidChange(oldView ? oldView : self, newView ? newView : self);
}
+#endif
- (NSView *)fullScreenPlaceholderView
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
