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

Side by Side Diff: content/browser/web_contents/aura/overscroll_navigation_overlay.cc

Issue 464643003: Stop painting when receiving delegated frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittest DCHECK OOPS Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/browser/web_contents/aura/overscroll_navigation_overlay.h" 5 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
6 6
7 #include "content/browser/frame_host/navigation_entry_impl.h" 7 #include "content/browser/frame_host/navigation_entry_impl.h"
8 #include "content/browser/renderer_host/render_view_host_impl.h" 8 #include "content/browser/renderer_host/render_view_host_impl.h"
9 #include "content/browser/web_contents/aura/image_window_delegate.h" 9 #include "content/browser/web_contents/aura/image_window_delegate.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } else { 43 } else {
44 SkISize size = canvas->sk_canvas()->getDeviceSize(); 44 SkISize size = canvas->sk_canvas()->getDeviceSize();
45 if (size.width() != image_size_.width() || 45 if (size.width() != image_size_.width() ||
46 size.height() != image_size_.height()) { 46 size.height() != image_size_.height()) {
47 canvas->DrawColor(SK_ColorWHITE); 47 canvas->DrawColor(SK_ColorWHITE);
48 } 48 }
49 canvas->DrawImageInt(image_.AsImageSkia(), 0, 0); 49 canvas->DrawImageInt(image_.AsImageSkia(), 0, 0);
50 } 50 }
51 } 51 }
52 52
53 virtual void OnDelegatedFrameDamage(
54 const gfx::Rect& damage_rect_in_dip) OVERRIDE {}
55
53 // Called when the layer's device scale factor has changed. 56 // Called when the layer's device scale factor has changed.
54 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE { 57 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {
55 } 58 }
56 59
57 // Invoked prior to the bounds changing. The returned closured is run after 60 // Invoked prior to the bounds changing. The returned closured is run after
58 // the bounds change. 61 // the bounds change.
59 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE { 62 virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
60 return base::Closure(); 63 return base::Closure();
61 } 64 }
62 65
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 // pending entry has been created. 296 // pending entry has been created.
294 int committed_entry_id = 297 int committed_entry_id =
295 web_contents_->GetController().GetLastCommittedEntry()->GetUniqueID(); 298 web_contents_->GetController().GetLastCommittedEntry()->GetUniqueID();
296 if (committed_entry_id == pending_entry_id_ || !pending_entry_id_) { 299 if (committed_entry_id == pending_entry_id_ || !pending_entry_id_) {
297 loading_complete_ = true; 300 loading_complete_ = true;
298 StopObservingIfDone(); 301 StopObservingIfDone();
299 } 302 }
300 } 303 }
301 304
302 } // namespace content 305 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698