Commit f5554e64 authored by evan@chromium.org's avatar evan@chromium.org

Add OVERRIDE to all RenderWidgetHostView implementations

Review URL: http://codereview.chromium.org/7598006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95900 0039d316-1c4b-4281-b951-d872f2087c98
parent c7fffe5a
...@@ -229,9 +229,10 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView { ...@@ -229,9 +229,10 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
// Methods associated with GPU-accelerated plug-in instances and the // Methods associated with GPU-accelerated plug-in instances and the
// accelerated compositor. // accelerated compositor.
virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle(bool opaque, virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle(
bool root); bool opaque, bool root) OVERRIDE;
virtual void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window); virtual void DestroyFakePluginWindowHandle(
gfx::PluginWindowHandle window) OVERRIDE;
// Exposed for testing. // Exposed for testing.
AcceleratedPluginView* ViewForPluginWindowHandle( AcceleratedPluginView* ViewForPluginWindowHandle(
......
...@@ -173,15 +173,6 @@ BackingStore* TestRenderWidgetHostView::AllocBackingStore( ...@@ -173,15 +173,6 @@ BackingStore* TestRenderWidgetHostView::AllocBackingStore(
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void TestRenderWidgetHostView::ShowPopupWithItems(
gfx::Rect bounds,
int item_height,
double item_font_size,
int selected_item,
const std::vector<WebMenuItem>& items,
bool right_aligned) {
}
gfx::Rect TestRenderWidgetHostView::GetViewCocoaBounds() const { gfx::Rect TestRenderWidgetHostView::GetViewCocoaBounds() const {
return gfx::Rect(); return gfx::Rect();
} }
......
...@@ -53,87 +53,75 @@ class TestRenderWidgetHostView : public RenderWidgetHostView { ...@@ -53,87 +53,75 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
virtual ~TestRenderWidgetHostView(); virtual ~TestRenderWidgetHostView();
virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
const gfx::Rect& pos) {} const gfx::Rect& pos) OVERRIDE {}
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) {} virtual void InitAsFullscreen(
virtual RenderWidgetHost* GetRenderWidgetHost() const; RenderWidgetHostView* reference_host_view) OVERRIDE {}
virtual void DidBecomeSelected() {} virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
virtual void WasHidden() {} virtual void DidBecomeSelected() OVERRIDE {}
virtual void SetSize(const gfx::Size& size) {} virtual void WasHidden() OVERRIDE {}
virtual void SetBounds(const gfx::Rect& rect) {} virtual void SetSize(const gfx::Size& size) OVERRIDE {}
virtual gfx::NativeView GetNativeView(); virtual void SetBounds(const gfx::Rect& rect) OVERRIDE {}
virtual gfx::NativeView GetNativeView() OVERRIDE;
virtual void MovePluginWindows( virtual void MovePluginWindows(
const std::vector<webkit::npapi::WebPluginGeometry>& moves) {} const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE {}
#if defined(OS_WIN) virtual void Focus() OVERRIDE {}
virtual void ForwardMouseEventToRenderer(UINT message, virtual void Blur() OVERRIDE {}
WPARAM wparam, virtual bool HasFocus() OVERRIDE;
LPARAM lparam) {} virtual void Show() OVERRIDE;
#endif virtual void Hide() OVERRIDE;
virtual void Focus() {} virtual bool IsShowing() OVERRIDE;
virtual void Blur() {} virtual gfx::Rect GetViewBounds() const OVERRIDE;
virtual bool HasFocus(); virtual void SetIsLoading(bool is_loading) OVERRIDE {}
virtual void AdvanceFocus(bool reverse) {} virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE {}
virtual void Show();
virtual void Hide();
virtual bool IsShowing();
virtual gfx::Rect GetViewBounds() const;
virtual void SetIsLoading(bool is_loading) {}
virtual void UpdateCursor(const WebCursor& cursor) {}
virtual void UpdateCursorIfOverSelf() {}
virtual void ImeUpdateTextInputState(ui::TextInputType state, virtual void ImeUpdateTextInputState(ui::TextInputType state,
bool can_compose_inline, bool can_compose_inline,
const gfx::Rect& caret_rect) {} const gfx::Rect& caret_rect) OVERRIDE {}
virtual void ImeCancelComposition() {} virtual void ImeCancelComposition() OVERRIDE {}
virtual void DidUpdateBackingStore( virtual void DidUpdateBackingStore(
const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
const std::vector<gfx::Rect>& rects) {} const std::vector<gfx::Rect>& rects) OVERRIDE {}
virtual void RenderViewGone(base::TerminationStatus status, virtual void RenderViewGone(base::TerminationStatus status,
int error_code); int error_code) OVERRIDE;
virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) { } virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) { }
virtual void Destroy() {} virtual void Destroy() OVERRIDE {}
virtual void PrepareToDestroy() {} virtual void SetTooltipText(const std::wstring& tooltip_text) OVERRIDE {}
virtual void SetTooltipText(const std::wstring& tooltip_text) {} virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
virtual BackingStore* AllocBackingStore(const gfx::Size& size);
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
virtual void SetTakesFocusOnlyOnMouseDown(bool flag) {} virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE {}
virtual void ShowPopupWithItems(gfx::Rect bounds, virtual gfx::Rect GetViewCocoaBounds() const OVERRIDE;
int item_height, virtual gfx::Rect GetRootWindowRect() OVERRIDE;
double item_font_size, virtual void SetActive(bool active) OVERRIDE;
int selected_item, virtual void SetWindowVisibility(bool visible) OVERRIDE {}
const std::vector<WebMenuItem>& items, virtual void WindowFrameChanged() OVERRIDE {}
bool right_aligned); virtual void PluginFocusChanged(bool focused, int plugin_id) OVERRIDE;
virtual gfx::Rect GetViewCocoaBounds() const; virtual void StartPluginIme() OVERRIDE;
virtual gfx::Rect GetRootWindowRect();
virtual void SetActive(bool active);
virtual void SetWindowVisibility(bool visible) {}
virtual void WindowFrameChanged() {}
virtual void PluginFocusChanged(bool focused, int plugin_id);
virtual void StartPluginIme();
virtual bool PostProcessEventForPluginIme( virtual bool PostProcessEventForPluginIme(
const NativeWebKeyboardEvent& event); const NativeWebKeyboardEvent& event) OVERRIDE;
virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle( virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle(
bool opaque, bool opaque,
bool root); bool root) OVERRIDE;
virtual void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window); virtual void DestroyFakePluginWindowHandle(
gfx::PluginWindowHandle window) OVERRIDE;
virtual void AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window, virtual void AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
int32 width, int32 width,
int32 height, int32 height,
uint64 surface_id); uint64 surface_id) OVERRIDE;
virtual void AcceleratedSurfaceSetTransportDIB( virtual void AcceleratedSurfaceSetTransportDIB(
gfx::PluginWindowHandle window, gfx::PluginWindowHandle window,
int32 width, int32 width,
int32 height, int32 height,
TransportDIB::Handle transport_dib); TransportDIB::Handle transport_dib) OVERRIDE;
virtual void AcceleratedSurfaceBuffersSwapped( virtual void AcceleratedSurfaceBuffersSwapped(
gfx::PluginWindowHandle window, gfx::PluginWindowHandle window,
uint64 surface_id, uint64 surface_id,
int renderer_id, int renderer_id,
int32 route_id, int32 route_id,
int gpu_host_id, int gpu_host_id,
uint64 swap_buffers_count); uint64 swap_buffers_count) OVERRIDE;
virtual void GpuRenderingStateDidChange(); virtual void GpuRenderingStateDidChange() OVERRIDE;
#elif defined(OS_WIN) #elif defined(OS_WIN)
virtual void WillWmDestroy(); virtual void WillWmDestroy() OVERRIDE;
virtual void ShowCompositorHostWindow(bool show); virtual void ShowCompositorHostWindow(bool show) OVERRIDE;
#endif #endif
virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) { } virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) { }
...@@ -150,7 +138,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostView { ...@@ -150,7 +138,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
virtual void AcceleratedCompositingActivated(bool activated) { } virtual void AcceleratedCompositingActivated(bool activated) { }
#endif #endif
virtual gfx::PluginWindowHandle GetCompositingSurface(); virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE;
bool is_showing() const { return is_showing_; } bool is_showing() const { return is_showing_; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment