Merge FrameView and ScrollView.

Source/platform/mac/ThemeMac.h

Index: Source/platform/mac/ThemeMac.h
diff --git a/Source/platform/mac/ThemeMac.h b/Source/platform/mac/ThemeMac.h
index 1e945e385f747b2a76d1e0833420920588491cff..17e7e3903e638516e55f11fdf99c901cdfc2e319 100644
--- a/Source/platform/mac/ThemeMac.h
+++ b/Source/platform/mac/ThemeMac.h
@@ -51,7 +51,7 @@ public:
 
     virtual bool controlRequiresPreWhiteSpace(ControlPart part) const { return part == PushButtonPart; }
 
-    virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect&, float zoomFactor, ScrollView*) const;
+    virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect&, float zoomFactor, ScrollableArea*) const;
     virtual void inflateControlPaintRect(ControlPart, ControlStates, IntRect&, float zoomFactor) const;
 
     // Inflate an IntRect to accout for specific padding around margins.
@@ -72,7 +72,7 @@ public:
     static PLATFORM_EXPORT IntRect inflateRectForFocusRing(const IntRect&);
 
     // FIXME: Once RenderThemeMac is converted over to use Theme then this can be internal to ThemeMac.
-    static NSView* ensuredView(ScrollView*);
+    static NSView* ensuredView(ScrollableArea*);
     static void setFocusRingClipRect(const FloatRect&);
 };