Title: [115677] trunk/Source/WebKit2
- Revision
- 115677
- Author
- [email protected]
- Date
- 2012-04-30 15:14:15 -0700 (Mon, 30 Apr 2012)
Log Message
Fix ALL the build failures!
* UIProcess/API/mac/WKView.mm:
(-[WKView WebKit::]):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115676 => 115677)
--- trunk/Source/WebKit2/ChangeLog 2012-04-30 22:06:17 UTC (rev 115676)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-30 22:14:15 UTC (rev 115677)
@@ -1,5 +1,14 @@
2012-04-30 Anders Carlsson <[email protected]>
+ Fix ALL the build failures!
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView WebKit::]):
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+
+2012-04-30 Anders Carlsson <[email protected]>
+
Build fix.
* Shared/DrawingAreaInfo.h:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (115676 => 115677)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-04-30 22:06:17 UTC (rev 115676)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-04-30 22:14:15 UTC (rev 115677)
@@ -2208,8 +2208,10 @@
- (PassOwnPtr<WebKit::DrawingAreaProxy>)_createDrawingAreaProxy
{
+#if ENABLE(THREADED_SCROLLING)
if ([self _shouldUseTiledDrawingArea])
return TiledCoreAnimationDrawingAreaProxy::create(_data->_page.get());
+#endif
return DrawingAreaProxyImpl::create(_data->_page.get());
}
Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (115676 => 115677)
--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2012-04-30 22:06:17 UTC (rev 115676)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2012-04-30 22:14:15 UTC (rev 115677)
@@ -26,6 +26,8 @@
#ifndef TiledCoreAnimationDrawingAreaProxy_h
#define TiledCoreAnimationDrawingAreaProxy_h
+#if ENABLE(THREADED_SCROLLING)
+
#include "DrawingAreaProxy.h"
#include <wtf/PassOwnPtr.h>
@@ -63,4 +65,6 @@
} // namespace WebKit
+#endif // ENABLE(THREADED_SCROLLING)
+
#endif // TiledCoreAnimationDrawingAreaProxy_h
Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (115676 => 115677)
--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2012-04-30 22:06:17 UTC (rev 115676)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2012-04-30 22:14:15 UTC (rev 115677)
@@ -26,6 +26,8 @@
#import "config.h"
#import "TiledCoreAnimationDrawingAreaProxy.h"
+#if ENABLE(THREADED_SCROLLING)
+
#import "DrawingAreaMessages.h"
#import "DrawingAreaProxyMessages.h"
#import "LayerTreeContext.h"
@@ -125,3 +127,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(THREADED_SCROLLING)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
