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

Side by Side Diff: cc/blink/web_content_layer_impl.cc

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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
« no previous file with comments | « cc/blink/web_content_layer_impl.h ('k') | cc/blink/web_display_item_list_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "cc/blink/web_content_layer_impl.h" 5 #include "cc/blink/web_content_layer_impl.h"
6 6
7 #include "cc/blink/web_display_item_list_impl.h" 7 #include "cc/blink/web_display_item_list_impl.h"
8 #include "cc/layers/content_layer.h" 8 #include "cc/layers/content_layer.h"
9 #include "cc/layers/picture_layer.h" 9 #include "cc/layers/picture_layer.h"
10 #include "third_party/WebKit/public/platform/WebContentLayerClient.h" 10 #include "third_party/WebKit/public/platform/WebContentLayerClient.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void WebContentLayerImpl::PaintContents( 65 void WebContentLayerImpl::PaintContents(
66 SkCanvas* canvas, 66 SkCanvas* canvas,
67 const gfx::Rect& clip, 67 const gfx::Rect& clip,
68 cc::ContentLayerClient::PaintingControlSetting painting_control) { 68 cc::ContentLayerClient::PaintingControlSetting painting_control) {
69 if (!client_) 69 if (!client_)
70 return; 70 return;
71 71
72 client_->paintContents(canvas, clip, PaintingControlToWeb(painting_control)); 72 client_->paintContents(canvas, clip, PaintingControlToWeb(painting_control));
73 } 73 }
74 74
75 void WebContentLayerImpl::PaintContentsToDisplayList( 75 scoped_refptr<cc::DisplayItemList>
76 cc::DisplayItemList* display_list, 76 WebContentLayerImpl::PaintContentsToDisplayList(
77 const gfx::Rect& clip, 77 const gfx::Rect& clip,
78 cc::ContentLayerClient::PaintingControlSetting painting_control) { 78 cc::ContentLayerClient::PaintingControlSetting painting_control) {
79 if (!client_) 79 if (!client_)
80 return; 80 return cc::DisplayItemList::Create();
81 81
82 WebDisplayItemListImpl list(display_list); 82 WebDisplayItemListImpl list;
83 client_->paintContents(&list, clip, PaintingControlToWeb(painting_control)); 83 client_->paintContents(&list, clip, PaintingControlToWeb(painting_control));
84 return list.ToDisplayItemList();
84 } 85 }
85 86
86 bool WebContentLayerImpl::FillsBoundsCompletely() const { 87 bool WebContentLayerImpl::FillsBoundsCompletely() const {
87 return false; 88 return false;
88 } 89 }
89 90
90 } // namespace cc_blink 91 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_content_layer_impl.h ('k') | cc/blink/web_display_item_list_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698