Merge FrameView and ScrollView.

Source/web/PopupListBox.h

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef PopupListBox_h
 #define PopupListBox_h
 
 #include "core/dom/Element.h"
+#include "platform/Widget.h"
 #include "platform/scroll/ScrollTypes.h"
-#include "platform/scroll/ScrollView.h"
+#include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextDirection.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Font;
 class GraphicsContext;
 class IntRect;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
@@ skipping 263 matching lines @@
     PopupContainer* m_container;
 
     RefPtr<Scrollbar> m_verticalScrollbar;
     IntSize m_contentsSize;
     IntPoint m_scrollOffset;
 };
 
 } // namespace blink
 
 #endif