| 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/gfx/rect.h" | 9 #include "base/gfx/rect.h" |
| 10 #include "base/gfx/size.h" | 10 #include "base/gfx/size.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "skia/ext/platform_canvas.h" | 12 #include "skia/ext/platform_canvas.h" |
| 13 #include "webkit/api/public/mac/WebInputEventFactory.h" | 13 #include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" |
| 14 #include "webkit/api/public/mac/WebScreenInfoFactory.h" | 14 #include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h" |
| 15 #include "webkit/api/public/WebInputEvent.h" | 15 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" |
| 16 #include "webkit/api/public/WebPopupMenu.h" | 16 #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" |
| 17 #include "webkit/api/public/WebScreenInfo.h" | 17 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" |
| 18 #include "webkit/api/public/WebSize.h" | 18 #include "third_party/WebKit/WebKit/chromium/public/WebSize.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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { | 268 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { |
| 269 #ifndef NDEBUG | 269 #ifndef NDEBUG |
| 270 DCHECK(!painting_); | 270 DCHECK(!painting_); |
| 271 #endif | 271 #endif |
| 272 DCHECK(canvas_.get()); | 272 DCHECK(canvas_.get()); |
| 273 | 273 |
| 274 set_painting(true); | 274 set_painting(true); |
| 275 webwidget_->paint(webkit_glue::ToWebCanvas(canvas_.get()), rect); | 275 webwidget_->paint(webkit_glue::ToWebCanvas(canvas_.get()), rect); |
| 276 set_painting(false); | 276 set_painting(false); |
| 277 } | 277 } |
| OLD | NEW |