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

Unified Diff: cc/layers/picture_image_layer.cc

Issue 2094813003: cc: Merge PictureImageLayerImpl and PictureLayerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: borders Created 4 years, 6 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
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/layers/picture_image_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_image_layer.cc
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc
index 4316812ec24ab169ca12c9992900919789cec90d..4971e481d77a5b10ac925420e6a468492387c8be 100644
--- a/cc/layers/picture_image_layer.cc
+++ b/cc/layers/picture_image_layer.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "cc/layers/picture_image_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
#include "cc/playback/display_item_list_settings.h"
#include "cc/playback/drawing_display_item.h"
#include "cc/trees/layer_tree_host.h"
@@ -29,7 +29,9 @@ PictureImageLayer::~PictureImageLayer() {
std::unique_ptr<LayerImpl> PictureImageLayer::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return PictureImageLayerImpl::Create(tree_impl, id(), is_mask());
+ auto layer_impl = PictureLayerImpl::Create(tree_impl, id(), is_mask());
+ layer_impl->set_is_directly_composited_image(true);
+ return std::move(layer_impl);
}
bool PictureImageLayer::HasDrawableContent() const {
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/layers/picture_image_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698