OLD | NEW |
1 // Copyright (c) 2008-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008-2009 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 | 6 |
7 #include "webkit/tools/test_shell/webwidget_host.h" | 7 #include "webkit/tools/test_shell/webwidget_host.h" |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "gfx/rect.h" | |
11 #include "gfx/size.h" | |
12 #include "skia/ext/platform_canvas.h" | 10 #include "skia/ext/platform_canvas.h" |
13 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact
ory.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" |
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" | 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
| 17 #include "ui/gfx/rect.h" |
| 18 #include "ui/gfx/size.h" |
19 #include "webkit/glue/webkit_glue.h" | 19 #include "webkit/glue/webkit_glue.h" |
20 #include "webkit/tools/test_shell/test_shell.h" | 20 #include "webkit/tools/test_shell/test_shell.h" |
21 | 21 |
22 using WebKit::WebInputEvent; | 22 using WebKit::WebInputEvent; |
23 using WebKit::WebInputEventFactory; | 23 using WebKit::WebInputEventFactory; |
24 using WebKit::WebKeyboardEvent; | 24 using WebKit::WebKeyboardEvent; |
25 using WebKit::WebMouseEvent; | 25 using WebKit::WebMouseEvent; |
26 using WebKit::WebMouseWheelEvent; | 26 using WebKit::WebMouseWheelEvent; |
27 using WebKit::WebPopupMenu; | 27 using WebKit::WebPopupMenu; |
28 using WebKit::WebScreenInfo; | 28 using WebKit::WebScreenInfo; |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { | 277 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { |
278 #ifndef NDEBUG | 278 #ifndef NDEBUG |
279 DCHECK(!painting_); | 279 DCHECK(!painting_); |
280 #endif | 280 #endif |
281 DCHECK(canvas_.get()); | 281 DCHECK(canvas_.get()); |
282 | 282 |
283 set_painting(true); | 283 set_painting(true); |
284 webwidget_->paint(webkit_glue::ToWebCanvas(canvas_.get()), rect); | 284 webwidget_->paint(webkit_glue::ToWebCanvas(canvas_.get()), rect); |
285 set_painting(false); | 285 set_painting(false); |
286 } | 286 } |
OLD | NEW |