Title: [91692] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91691 => 91692)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-25 18:58:17 UTC (rev 91691)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-25 18:59:29 UTC (rev 91692)
@@ -1,3 +1,14 @@
+2011-07-25 Lucas Forschler <[email protected]>
+
+ Merged 91147.
+
+ 2011-07-22 Lucas Forschler <[email protected]>
+
+ Fix the build.
+
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::updateEnabledState):
+
2011-07-22 Lucas Forschler <[email protected]>
Merged 87171.
Modified: branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (91691 => 91692)
--- branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2011-07-25 18:58:17 UTC (rev 91691)
+++ branches/safari-534.51-branch/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2011-07-25 18:59:29 UTC (rev 91692)
@@ -450,6 +450,8 @@
{
#if USE(WK_SCROLLBAR_PAINTER)
wkScrollbarPainterSetEnabled(scrollbarMap()->get(scrollbar).get(), scrollbar->enabled());
+#else
+ UNUSED_PARAM(scrollbar);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
