Title: [186963] trunk/Source/WebCore
- Revision
- 186963
- Author
- [email protected]
- Date
- 2015-07-17 12:35:57 -0700 (Fri, 17 Jul 2015)
Log Message
ScrollView.h should be self-contained
https://bugs.webkit.org/show_bug.cgi?id=147004
Reviewed by Sam Weinig.
* platform/ScrollView.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186962 => 186963)
--- trunk/Source/WebCore/ChangeLog 2015-07-17 19:23:43 UTC (rev 186962)
+++ trunk/Source/WebCore/ChangeLog 2015-07-17 19:35:57 UTC (rev 186963)
@@ -1,3 +1,12 @@
+2015-07-17 Anders Carlsson <[email protected]>
+
+ ScrollView.h should be self-contained
+ https://bugs.webkit.org/show_bug.cgi?id=147004
+
+ Reviewed by Sam Weinig.
+
+ * platform/ScrollView.h:
+
2015-07-17 Brady Eidson <[email protected]>
Rolling r186895 back in, in its entirety.
Modified: trunk/Source/WebCore/platform/ScrollView.h (186962 => 186963)
--- trunk/Source/WebCore/platform/ScrollView.h 2015-07-17 19:23:43 UTC (rev 186962)
+++ trunk/Source/WebCore/platform/ScrollView.h 2015-07-17 19:35:57 UTC (rev 186963)
@@ -37,13 +37,8 @@
#include <wtf/HashSet.h>
#if PLATFORM(IOS)
-#ifdef __OBJC__
-@class WAKScrollView;
-@class WAKView;
-#else
-class WAKScrollView;
-class WAKView;
-#endif
+OBJC_CLASS WAKScrollView;
+OBJC_CLASS WAKView;
#ifndef NSScrollView
#define NSScrollView WAKScrollView
@@ -55,6 +50,7 @@
#endif // PLATFORM(IOS)
#if PLATFORM(COCOA) && defined __OBJC__
+@class NSScrollView;
@protocol WebCoreFrameScrollView;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
