| Index: webkit/tools/test_shell/webwidget_host.h
|
| ===================================================================
|
| --- webkit/tools/test_shell/webwidget_host.h (revision 20851)
|
| +++ webkit/tools/test_shell/webwidget_host.h (working copy)
|
| @@ -11,14 +11,13 @@
|
| #include "base/scoped_ptr.h"
|
| #include "skia/ext/platform_canvas.h"
|
|
|
| -class WebWidget;
|
| -class WebWidgetDelegate;
|
| -
|
| namespace gfx {
|
| class Size;
|
| }
|
|
|
| namespace WebKit {
|
| +class WebWidget;
|
| +class WebWidgetClient;
|
| struct WebScreenInfo;
|
| }
|
|
|
| @@ -37,14 +36,14 @@
|
| // The newly created window should be resized after it is created, using the
|
| // MoveWindow (or equivalent) function.
|
| static WebWidgetHost* Create(gfx::NativeView parent_view,
|
| - WebWidgetDelegate* delegate);
|
| + WebKit::WebWidgetClient* client);
|
|
|
| #if defined(OS_MACOSX)
|
| static void HandleEvent(gfx::NativeView view, NSEvent* event);
|
| #endif
|
|
|
| gfx::NativeView view_handle() const { return view_; }
|
| - WebWidget* webwidget() const { return webwidget_; }
|
| + WebKit::WebWidget* webwidget() const { return webwidget_; }
|
|
|
| void DidInvalidateRect(const gfx::Rect& rect);
|
| void DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect);
|
| @@ -115,7 +114,7 @@
|
| }
|
|
|
| gfx::NativeView view_;
|
| - WebWidget* webwidget_;
|
| + WebKit::WebWidget* webwidget_;
|
| scoped_ptr<skia::PlatformCanvas> canvas_;
|
|
|
| // specifies the portion of the webwidget that needs painting
|
|
|