Title: [92311] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92310 => 92311)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-03 21:04:14 UTC (rev 92310)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-03 21:16:57 UTC (rev 92311)
@@ -1,5 +1,16 @@
2011-08-03 Lucas Forschler <[email protected]>
+ Merged 91438.
+
+ 2011-07-20 Ryosuke Niwa <[email protected]>
+
+ Build fix after r91435.
+
+ * platform/mac/ScrollViewMac.mm:
+ (WebCore::ScrollView::platformSetScrollbarOverlayStyle):
+
+2011-08-03 Lucas Forschler <[email protected]>
+
Merged 91435.
2011-07-20 Tim Horton <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollViewMac.mm (92310 => 92311)
--- branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollViewMac.mm 2011-08-03 21:04:14 UTC (rev 92310)
+++ branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollViewMac.mm 2011-08-03 21:16:57 UTC (rev 92311)
@@ -32,6 +32,7 @@
#import "Logging.h"
#import "NotImplemented.h"
#import "WebCoreFrameView.h"
+#import <wtf/UnusedParam.h>
using namespace std;
@@ -203,6 +204,7 @@
return ![platformWidget() window] || ![[platformWidget() window] isVisible];
}
+#if USE(WK_SCROLLBAR_PAINTER)
static inline NSScrollerKnobStyle toNSScrollerKnobStyle(ScrollbarOverlayStyle style)
{
switch (style) {
@@ -214,10 +216,15 @@
return NSScrollerKnobStyleDefault;
}
}
+#endif
void ScrollView::platformSetScrollbarOverlayStyle(ScrollbarOverlayStyle overlayStyle)
{
+#if USE(WK_SCROLLBAR_PAINTER)
[scrollView() setScrollerKnobStyle:toNSScrollerKnobStyle(overlayStyle)];
+#else
+ UNUSED_PARAM(overlayStyle);
+#endif
}
void ScrollView::platformSetScrollOrigin(const IntPoint& origin, bool updatePositionAtAll, bool updatePositionSynchronously)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
