Title: [166334] trunk/Source/WebKit2
- Revision
- 166334
- Author
- simon.fra...@apple.com
- Date
- 2014-03-26 19:25:14 -0700 (Wed, 26 Mar 2014)
Log Message
Fix the build: include UIKit headers inside the iOS #ifdef.
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166333 => 166334)
--- trunk/Source/WebKit2/ChangeLog 2014-03-27 02:15:48 UTC (rev 166333)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 02:25:14 UTC (rev 166334)
@@ -1,5 +1,11 @@
2014-03-26 Simon Fraser <simon.fra...@apple.com>
+ Fix the build: include UIKit headers inside the iOS #ifdef.
+
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+
+2014-03-26 Simon Fraser <simon.fra...@apple.com>
+
Hook up -webkit-overflow-scrolling:touch for iOS WK2
https://bugs.webkit.org/show_bug.cgi?id=130809
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (166333 => 166334)
--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-03-27 02:15:48 UTC (rev 166333)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-03-27 02:25:14 UTC (rev 166334)
@@ -25,13 +25,14 @@
#import "config.h"
#import "ScrollingTreeOverflowScrollingNodeIOS.h"
+
+#if PLATFORM(IOS)
+#if ENABLE(ASYNC_SCROLLING)
+
#import <WebCore/BlockExceptions.h>
#import <WebCore/ScrollingStateScrollingNode.h>
#import <UIKit/UIScrollView.h>
-#if PLATFORM(IOS)
-#if ENABLE(ASYNC_SCROLLING)
-
using namespace WebCore;
namespace WebKit {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
