Title: [92343] trunk/Source/WebCore
- Revision
- 92343
- Author
- [email protected]
- Date
- 2011-08-03 19:35:41 -0700 (Wed, 03 Aug 2011)
Log Message
Chromium Mac: Make ScrollbarOverlayUtilitiesChromiumMac.h c++ compatible
https://bugs.webkit.org/show_bug.cgi?id=65659
Patch by Sailesh Agrawal <[email protected]> on 2011-08-03
Reviewed by James Robinson.
ScrollbarOverlayUtilitiesChromiumMac.h couldn't be included from pure c++ code because it used NSInteger. I fixed this by checking for __OBJC__ before using NSInteger.
Currently no pure c++ files are including ScrollbarOverlayUtilitiesChromiumMac.h but this will change in future patches from [email protected].
* platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
* platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
(wkScrollbarPainterControllerStyle):
(wkSetScrollbarPainterControllerStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92342 => 92343)
--- trunk/Source/WebCore/ChangeLog 2011-08-04 02:09:19 UTC (rev 92342)
+++ trunk/Source/WebCore/ChangeLog 2011-08-04 02:35:41 UTC (rev 92343)
@@ -1,3 +1,19 @@
+2011-08-03 Sailesh Agrawal <[email protected]>
+
+ Chromium Mac: Make ScrollbarOverlayUtilitiesChromiumMac.h c++ compatible
+ https://bugs.webkit.org/show_bug.cgi?id=65659
+
+ Reviewed by James Robinson.
+
+ ScrollbarOverlayUtilitiesChromiumMac.h couldn't be included from pure c++ code because it used NSInteger. I fixed this by checking for __OBJC__ before using NSInteger.
+
+ Currently no pure c++ files are including ScrollbarOverlayUtilitiesChromiumMac.h but this will change in future patches from [email protected].
+
+ * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:
+ * platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm:
+ (wkScrollbarPainterControllerStyle):
+ (wkSetScrollbarPainterControllerStyle):
+
2011-08-03 Luke Macpherson <[email protected]>
Support cast between CSSPrimitiveValue and EBoxSizing, use in CSSStyleSelector.
Modified: trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h (92342 => 92343)
--- trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h 2011-08-04 02:09:19 UTC (rev 92342)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h 2011-08-04 02:35:41 UTC (rev 92343)
@@ -35,9 +35,14 @@
NSScrollerStyleLegacy = 0,
NSScrollerStyleOverlay = 1
};
+
+#ifdef __OBJC__
typedef NSInteger NSScrollerStyle;
#endif
+#endif
+typedef uint32 wkScrollerStyle;
+
#ifdef __OBJC__
@class NSScrollerImp;
@class NSScrollerImpPair;
@@ -93,11 +98,11 @@
void wkDidBeginScrollGesture(WKScrollbarPainterControllerRef);
void wkDidEndScrollGesture(WKScrollbarPainterControllerRef);
void wkScrollbarPainterForceFlashScrollers(WKScrollbarPainterControllerRef);
-void wkSetScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef, int newStyle);
+void wkSetScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef, wkScrollerStyle newStyle);
void wkSetPainterForPainterController(WKScrollbarPainterControllerRef, WKScrollbarPainterRef, bool isHorizontal);
WKScrollbarPainterRef wkVerticalScrollbarPainterForController(WKScrollbarPainterControllerRef);
WKScrollbarPainterRef wkHorizontalScrollbarPainterForController(WKScrollbarPainterControllerRef);
-NSScrollerStyle wkScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef);
+wkScrollerStyle wkScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef);
#endif // USE(WK_SCROLLBAR_PAINTER)
Modified: trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (92342 => 92343)
--- trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm 2011-08-04 02:09:19 UTC (rev 92342)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm 2011-08-04 02:35:41 UTC (rev 92343)
@@ -218,7 +218,7 @@
return [controller horizontalScrollerImp];
}
-NSScrollerStyle wkScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef controller)
+wkScrollerStyle wkScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef controller)
{
return [controller scrollerStyle];
}
@@ -241,7 +241,7 @@
[controller setVerticalScrollerImp:painter];
}
-void wkSetScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef painter, int newStyle)
+void wkSetScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef painter, wkScrollerStyle newStyle)
{
[painter setScrollerStyle:newStyle];
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
