Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Side by Side Diff: webkit/tools/test_shell/webwidget_host_win.cc

Issue 8215002: base::Bind: Cleanup in test_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/tools/test_shell/webwidget_host_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 void WebWidgetHost::DiscardBackingStore() { 194 void WebWidgetHost::DiscardBackingStore() {
195 canvas_.reset(); 195 canvas_.reset();
196 } 196 }
197 197
198 WebWidgetHost::WebWidgetHost() 198 WebWidgetHost::WebWidgetHost()
199 : view_(NULL), 199 : view_(NULL),
200 webwidget_(NULL), 200 webwidget_(NULL),
201 track_mouse_leave_(false), 201 track_mouse_leave_(false),
202 scroll_dx_(0), 202 scroll_dx_(0),
203 scroll_dy_(0), 203 scroll_dy_(0),
204 ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) { 204 ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
205 set_painting(false); 205 set_painting(false);
206 } 206 }
207 207
208 WebWidgetHost::~WebWidgetHost() { 208 WebWidgetHost::~WebWidgetHost() {
209 ui::SetWindowUserData(view_, 0); 209 ui::SetWindowUserData(view_, 0);
210 210
211 TrackMouseLeave(false); 211 TrackMouseLeave(false);
212 212
213 webwidget_->close(); 213 webwidget_->close();
214 } 214 }
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { 373 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
374 #ifndef NDEBUG 374 #ifndef NDEBUG
375 DCHECK(!painting_); 375 DCHECK(!painting_);
376 #endif 376 #endif
377 DCHECK(canvas_.get()); 377 DCHECK(canvas_.get());
378 378
379 set_painting(true); 379 set_painting(true);
380 webwidget_->paint(canvas_.get(), rect); 380 webwidget_->paint(canvas_.get(), rect);
381 set_painting(false); 381 set_painting(false);
382 } 382 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/webwidget_host_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698