| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "webkit/tools/test_shell/webwidget_host.h" | 5 #include "webkit/tools/test_shell/webwidget_host.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "skia/ext/platform_canvas.h" | 8 #include "skia/ext/platform_canvas.h" |
| 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 void WebWidgetHost::Paint() { | 233 void WebWidgetHost::Paint() { |
| 234 RECT r; | 234 RECT r; |
| 235 GetClientRect(view_, &r); | 235 GetClientRect(view_, &r); |
| 236 gfx::Rect client_rect(r); | 236 gfx::Rect client_rect(r); |
| 237 | 237 |
| 238 // Allocate a canvas if necessary | 238 // Allocate a canvas if necessary |
| 239 if (!canvas_.get()) { | 239 if (!canvas_.get()) { |
| 240 ResetScrollRect(); | 240 ResetScrollRect(); |
| 241 paint_rect_ = client_rect; | 241 paint_rect_ = client_rect; |
| 242 canvas_.reset(new skia::PlatformCanvas( | 242 canvas_.reset(new skia::PlatformCanvas( |
| 243 paint_rect_.width(), paint_rect_.height(), true)); | 243 paint_rect_.width(), paint_rect_.height(), |
| 244 skia::PlatformDevice::FLAGS_OPAQUE | |
| 245 skia::PlatformDevice::FLAGS_INITIALIZED)); |
| 244 } | 246 } |
| 245 | 247 |
| 246 webwidget_->animate(0.0); | 248 webwidget_->animate(0.0); |
| 247 | 249 |
| 248 // This may result in more invalidation | 250 // This may result in more invalidation |
| 249 webwidget_->layout(); | 251 webwidget_->layout(); |
| 250 | 252 |
| 251 // Scroll the canvas if necessary | 253 // Scroll the canvas if necessary |
| 252 scroll_rect_ = client_rect.Intersect(scroll_rect_); | 254 scroll_rect_ = client_rect.Intersect(scroll_rect_); |
| 253 if (!scroll_rect_.IsEmpty()) { | 255 if (!scroll_rect_.IsEmpty()) { |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { | 375 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { |
| 374 #ifndef NDEBUG | 376 #ifndef NDEBUG |
| 375 DCHECK(!painting_); | 377 DCHECK(!painting_); |
| 376 #endif | 378 #endif |
| 377 DCHECK(canvas_.get()); | 379 DCHECK(canvas_.get()); |
| 378 | 380 |
| 379 set_painting(true); | 381 set_painting(true); |
| 380 webwidget_->paint(canvas_.get(), rect); | 382 webwidget_->paint(canvas_.get(), rect); |
| 381 set_painting(false); | 383 set_painting(false); |
| 382 } | 384 } |
| OLD | NEW |