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

Unified Diff: content/renderer/child_frame_compositing_helper.cc

Issue 2835373003: Plumb PaintImage to the PictureImageLayer. (Closed)
Patch Set: update Created 3 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/child_frame_compositing_helper.cc
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index 279d17ae2f9ac022ed1549a1b4206d879cafafac..78f1643b1ca34da8d5afce4b3c4f8979969d6d71 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -13,6 +13,7 @@
#include "cc/output/context_provider.h"
#include "cc/output/copy_output_request.h"
#include "cc/output/copy_output_result.h"
+#include "cc/paint/paint_image.h"
#include "cc/resources/single_release_callback.h"
#include "cc/surfaces/sequence_surface_reference_factory.h"
#include "content/child/thread_safe_sender.h"
@@ -191,7 +192,7 @@ void ChildFrameCompositingHelper::ChildFrameGone() {
web_layer_->Bounds().height > sad_bitmap->height()) {
scoped_refptr<cc::PictureImageLayer> sad_layer =
cc::PictureImageLayer::Create();
- sad_layer->SetImage(SkImage::MakeFromBitmap(*sad_bitmap));
+ sad_layer->SetImage(cc::PaintImage(SkImage::MakeFromBitmap(*sad_bitmap)));
sad_layer->SetBounds(
gfx::Size(sad_bitmap->width(), sad_bitmap->height()));
sad_layer->SetPosition(gfx::PointF(
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_masks.cc ('k') | third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698