Index: Source/core/page/scrolling/ScrollingCoordinator.cpp |
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
index f603959fbaf09ab8d3fda31954308b855e303edd..e9f01bf4c49ee77a7c32a8a8b36e23da1fe12952 100644 |
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp |
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
@@ -46,7 +46,7 @@ |
#include "core/platform/graphics/IntRect.h" |
#include "core/platform/graphics/Region.h" |
#include "core/platform/graphics/transforms/TransformState.h" |
-#if OS(DARWIN) |
+#if OS(MACOSX) |
#include "core/platform/mac/ScrollAnimatorMac.h" |
#endif |
#include "core/plugins/PluginView.h" |
@@ -255,7 +255,7 @@ WebScrollbarLayer* ScrollingCoordinator::getWebScrollbarLayer(ScrollableArea* sc |
void ScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(ScrollableArea* scrollableArea, ScrollbarOrientation orientation) |
{ |
// FIXME: Instead of hardcode here, we should make a setting flag. |
-#if OS(DARWIN) |
+#if OS(MACOSX) |
static const bool platformSupportsCoordinatedScrollbar = ScrollAnimatorMac::canUseCoordinatedScrollbar(); |
static const bool platformSupportsMainFrameOnly = false; // Don't care. |
#elif OS(ANDROID) |
@@ -755,7 +755,7 @@ void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) |
updateShouldUpdateScrollLayerPositionOnMainThread(); |
} |
-#if OS(DARWIN) |
+#if OS(MACOSX) |
void ScrollingCoordinator::handleWheelEventPhase(PlatformWheelEventPhase phase) |
{ |
ASSERT(isMainThread()); |