Merge FrameView and ScrollView.

Source/platform/Theme.h

Index: Source/platform/Theme.h
diff --git a/Source/platform/Theme.h b/Source/platform/Theme.h
index 041b827ede426bd408ec032575872136d8b25166..dfaa30570ad105872bd431201d78636a8ca4a043 100644
--- a/Source/platform/Theme.h
+++ b/Source/platform/Theme.h
@@ -38,7 +38,7 @@
 namespace blink {
 
 class GraphicsContext;
-class ScrollView;
+class ScrollableArea;
 
 // Unlike other platform classes, Theme does extensively use virtual functions.  This design allows a platform to switch between multiple themes at runtime.
 class PLATFORM_EXPORT Theme {
@@ -94,7 +94,7 @@ public:
     virtual bool controlRequiresPreWhiteSpace(ControlPart) const { return false; }
 
     // Method for painting a control. The rect is in zoomed coordinates.
-    virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect& /*zoomedRect*/, float /*zoomFactor*/, ScrollView*) const { }
+    virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect& /*zoomedRect*/, float /*zoomFactor*/, ScrollableArea*) const { }
 
     // Some controls may spill out of their containers (e.g., the check on an OS X checkbox).  When these controls repaint,
     // the theme needs to communicate this inflated rect to the engine so that it can invalidate the whole control.