OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ | 5 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ |
6 #define WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ | 6 #define WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/task.h" |
9 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
10 #include "gfx/native_widget_types.h" | 11 #include "gfx/native_widget_types.h" |
11 #include "gfx/rect.h" | 12 #include "gfx/rect.h" |
12 #include "skia/ext/platform_canvas.h" | 13 #include "skia/ext/platform_canvas.h" |
13 | 14 |
14 namespace gfx { | 15 namespace gfx { |
15 class Size; | 16 class Size; |
16 } | 17 } |
17 | 18 |
18 namespace WebKit { | 19 namespace WebKit { |
(...skipping 22 matching lines...) Expand all Loading... |
41 #if defined(OS_MACOSX) | 42 #if defined(OS_MACOSX) |
42 static void HandleEvent(gfx::NativeView view, NSEvent* event); | 43 static void HandleEvent(gfx::NativeView view, NSEvent* event); |
43 #endif | 44 #endif |
44 | 45 |
45 gfx::NativeView view_handle() const { return view_; } | 46 gfx::NativeView view_handle() const { return view_; } |
46 WebKit::WebWidget* webwidget() const { return webwidget_; } | 47 WebKit::WebWidget* webwidget() const { return webwidget_; } |
47 | 48 |
48 void DidInvalidateRect(const gfx::Rect& rect); | 49 void DidInvalidateRect(const gfx::Rect& rect); |
49 void DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect); | 50 void DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect); |
50 void ScheduleComposite(); | 51 void ScheduleComposite(); |
| 52 void ScheduleAnimation(); |
51 #if defined(OS_WIN) | 53 #if defined(OS_WIN) |
52 void SetCursor(HCURSOR cursor); | 54 void SetCursor(HCURSOR cursor); |
53 #endif | 55 #endif |
54 | 56 |
55 void DiscardBackingStore(); | 57 void DiscardBackingStore(); |
56 // Allow clients to update the paint rect. For example, if we get a gdk | 58 // Allow clients to update the paint rect. For example, if we get a gdk |
57 // expose or WM_PAINT event, we need to update the paint rect. | 59 // expose or WM_PAINT event, we need to update the paint rect. |
58 void UpdatePaintRect(const gfx::Rect& rect); | 60 void UpdatePaintRect(const gfx::Rect& rect); |
59 void Paint(); | 61 void Paint(); |
60 | 62 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 | 144 |
143 #if defined(TOOLKIT_USES_GTK) | 145 #if defined(TOOLKIT_USES_GTK) |
144 // Since GtkWindow resize is asynchronous, we have to stash the dimensions, | 146 // Since GtkWindow resize is asynchronous, we have to stash the dimensions, |
145 // so that the backing store doesn't have to wait for sizing to take place. | 147 // so that the backing store doesn't have to wait for sizing to take place. |
146 gfx::Size logical_size_; | 148 gfx::Size logical_size_; |
147 #endif | 149 #endif |
148 | 150 |
149 #ifndef NDEBUG | 151 #ifndef NDEBUG |
150 bool painting_; | 152 bool painting_; |
151 #endif | 153 #endif |
| 154 |
| 155 private: |
| 156 ScopedRunnableMethodFactory<WebWidgetHost> factory_; |
152 }; | 157 }; |
153 | 158 |
154 #endif // WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ | 159 #endif // WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_ |
OLD | NEW |