Title: [159725] trunk/Source/WebKit2
- Revision
- 159725
- Author
- timothy_hor...@apple.com
- Date
- 2013-11-22 19:43:57 -0800 (Fri, 22 Nov 2013)
Log Message
Attempt build fixes for 32-bit after 159724.
There's probably a better fix, but this will work for now.
* UIProcess/API/mac/WKView.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159724 => 159725)
--- trunk/Source/WebKit2/ChangeLog 2013-11-23 03:29:50 UTC (rev 159724)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-23 03:43:57 UTC (rev 159725)
@@ -1,3 +1,11 @@
+2013-11-22 Tim Horton <timothy_hor...@apple.com>
+
+ Attempt build fixes for 32-bit after 159724.
+
+ There's probably a better fix, but this will work for now.
+
+ * UIProcess/API/mac/WKView.h:
+
2013-11-22 Enrica Casucci <enr...@apple.com>
Upstream iOS WebKit2 to OpenSource (part 3).
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.h (159724 => 159725)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2013-11-23 03:29:50 UTC (rev 159724)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2013-11-23 03:43:57 UTC (rev 159725)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <TargetConditionals.h>
+
#if TARGET_OS_IPHONE
#import <UIKit/UIKit.h>
#else
@@ -47,8 +49,13 @@
unsigned _unused;
}
+#if TARGET_OS_IPHONE
- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
+#else
+- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
+- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
+#endif
@property(readonly) WKBrowsingContextController *browsingContextController;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
