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

Unified Diff: content/renderer/child_frame_compositing_helper.cc

Issue 1739743003: Blink Compositor Animation: Erase old animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Exclude histograms.xml Created 4 years, 10 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 | « content/public/common/content_switches.cc ('k') | content/renderer/gpu/render_widget_compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 74e7eaa2fee8af3cf30dce272b20a677d8fe4d2e..2392e7b9aa7612ff922856138b4a102a1748252d 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "cc/blink/web_layer_impl.h"
+#include "cc/layers/layer_settings.h"
#include "cc/layers/solid_color_layer.h"
#include "cc/layers/surface_layer.h"
#include "cc/output/context_provider.h"
@@ -112,7 +113,7 @@ void ChildFrameCompositingHelper::OnContainerDestroy() {
void ChildFrameCompositingHelper::ChildFrameGone() {
scoped_refptr<cc::SolidColorLayer> crashed_layer =
- cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings());
+ cc::SolidColorLayer::Create(cc::LayerSettings());
crashed_layer->SetMasksToBounds(true);
crashed_layer->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0));
blink::WebLayer* layer = new cc_blink::WebLayerImpl(crashed_layer);
@@ -184,7 +185,7 @@ void ChildFrameCompositingHelper::OnSetSurface(
sender, host_routing_id_,
browser_plugin_->browser_plugin_instance_id());
scoped_refptr<cc::SurfaceLayer> surface_layer =
- cc::SurfaceLayer::Create(cc_blink::WebLayerImpl::LayerSettings(),
+ cc::SurfaceLayer::Create(cc::LayerSettings(),
satisfy_callback, require_callback);
// TODO(oshima): This is a stopgap fix so that the compositor does not
// scaledown the content when 2x frame data is added to 1x parent frame data.
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/gpu/render_widget_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698