Remove WebLayer alias, use cc::Layer type directly.
Replace includes of web_layer.h in header files to forward declarations
of cc::Layer. Rename variables from web_*layer to cc_*layer or just
layer.
This does not rename the SetWebLayer() GetWebLayer() or PlatformLayer()
methods yet.
[email protected], [email protected], [email protected]
Bug: 838693
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I606d7af50633e1fb57cd86a648b4f7433cb13da7
Reviewed-on: https://chromium-review.googlesource.com/1062016
Commit-Queue: danakj <[email protected]>
Reviewed-by: danakj <[email protected]>
Reviewed-by: Jeremy Roman <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: Antoine Labour <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Philip Rogers <[email protected]>
Reviewed-by: Dale Curtis <[email protected]>
Cr-Commit-Position: refs/heads/master@{#559561}diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 3f9d74d..e6eb03a 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -38,7 +38,6 @@
#include "third_party/blink/public/platform/web_coalesced_input_event.h"
#include "third_party/blink/public/platform/web_gesture_event.h"
#include "third_party/blink/public/platform/web_input_event.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
#include "third_party/blink/public/platform/web_rect.h"
#include "third_party/blink/public/web/web_ax_object.h"
@@ -857,7 +856,7 @@
}
#endif
-blink::WebLayer* BrowserPlugin::GetLayer() {
+cc::Layer* BrowserPlugin::GetLayer() {
return embedded_layer_.get();
}
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index e0486ec4..8ab2c1b 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -35,6 +35,7 @@
}
namespace cc {
+class Layer;
class RenderFrameMetadata;
}
@@ -220,7 +221,7 @@
#endif
// ChildFrameCompositor:
- blink::WebLayer* GetLayer() override;
+ cc::Layer* GetLayer() override;
void SetLayer(scoped_refptr<cc::Layer> layer,
bool prevent_contents_opaque_changes) override;
SkBitmap* GetSadPageBitmap() override;
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index 8bf2912..8ef6f5b 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -14,7 +14,6 @@
#include "cc/paint/paint_image_builder.h"
#include "content/renderer/child_frame_compositor.h"
#include "skia/ext/image_operations.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImage.h"
#include "ui/gfx/geometry/point_f.h"
@@ -117,9 +116,9 @@
}
void ChildFrameCompositingHelper::UpdateVisibility(bool visible) {
- blink::WebLayer* web_layer = child_frame_compositor_->GetLayer();
- if (web_layer)
- web_layer->SetIsDrawable(visible);
+ cc::Layer* layer = child_frame_compositor_->GetLayer();
+ if (layer)
+ layer->SetIsDrawable(visible);
}
} // namespace content
diff --git a/content/renderer/child_frame_compositing_helper_unittest.cc b/content/renderer/child_frame_compositing_helper_unittest.cc
index f7a4f02f3..d2c3e49 100644
--- a/content/renderer/child_frame_compositing_helper_unittest.cc
+++ b/content/renderer/child_frame_compositing_helper_unittest.cc
@@ -4,9 +4,9 @@
#include "content/renderer/child_frame_compositing_helper.h"
+#include "cc/layers/layer.h"
#include "content/renderer/child_frame_compositor.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/web_layer.h"
namespace content {
@@ -20,7 +20,7 @@
sad_page_bitmap_.allocN32Pixels(width, height);
}
- blink::WebLayer* GetLayer() override { return layer_.get(); }
+ cc::Layer* GetLayer() override { return layer_.get(); }
void SetLayer(scoped_refptr<cc::Layer> layer,
bool prevent_contents_opaque_changes) override {
diff --git a/content/renderer/child_frame_compositor.h b/content/renderer/child_frame_compositor.h
index 74c81f9f..f93b026 100644
--- a/content/renderer/child_frame_compositor.h
+++ b/content/renderer/child_frame_compositor.h
@@ -5,20 +5,18 @@
#ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITOR_H_
#define CONTENT_RENDERER_CHILD_FRAME_COMPOSITOR_H_
-#include "third_party/blink/public/platform/web_layer.h"
-
namespace cc {
class Layer;
}
namespace content {
-// A ChildFrameCompositor is an owner of a blink::WebLayer that embeds a child
+// A ChildFrameCompositor is an owner of a cc::Layer that embeds a child
// frame.
class ChildFrameCompositor {
public:
- // Get the child frame's cc::Layer wrapped as a blink::WebLayer.
- virtual blink::WebLayer* GetLayer() = 0;
+ // Get the child frame's cc::Layer.
+ virtual cc::Layer* GetLayer() = 0;
// Passes ownership of a cc::Layer to the ChildFrameCompositor.
virtual void SetLayer(scoped_refptr<cc::Layer> layer,
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 51bb19a..9912bda 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -66,7 +66,6 @@
#include "media/base/media_switches.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "third_party/blink/public/platform/scheduler/web_main_thread_scheduler.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_runtime_features.h"
#include "third_party/blink/public/platform/web_size.h"
#include "third_party/blink/public/web/blink.h"
@@ -785,12 +784,12 @@
return frame_sink_id_;
}
-void RenderWidgetCompositor::SetRootLayer(blink::WebLayer* layer) {
- layer_tree_host_->SetRootLayer(layer);
+void RenderWidgetCompositor::SetRootLayer(scoped_refptr<cc::Layer> layer) {
+ layer_tree_host_->SetRootLayer(std::move(layer));
}
void RenderWidgetCompositor::ClearRootLayer() {
- layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>());
+ layer_tree_host_->SetRootLayer(nullptr);
}
cc::AnimationHost* RenderWidgetCompositor::CompositorAnimationHost() {
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 2f3a147..933ed48 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -128,7 +128,7 @@
// WebLayerTreeView implementation.
viz::FrameSinkId GetFrameSinkId() override;
- void SetRootLayer(blink::WebLayer* layer) override;
+ void SetRootLayer(scoped_refptr<cc::Layer> layer) override;
void ClearRootLayer() override;
cc::AnimationHost* CompositorAnimationHost() override;
blink::WebSize GetViewportSize() const override;
diff --git a/content/renderer/media/stream/webmediaplayer_ms.cc b/content/renderer/media/stream/webmediaplayer_ms.cc
index faec8e1..cac09cf5 100644
--- a/content/renderer/media/stream/webmediaplayer_ms.cc
+++ b/content/renderer/media/stream/webmediaplayer_ms.cc
@@ -34,7 +34,6 @@
#include "media/blink/webmediaplayer_util.h"
#include "media/video/gpu_memory_buffer_video_frame_pool.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_media_player_client.h"
#include "third_party/blink/public/platform/web_media_player_source.h"
#include "third_party/blink/public/platform/web_rect.h"
@@ -1005,8 +1004,8 @@
DCHECK(thread_checker_.CalledOnValidThread());
video_rotation_ = video_rotation;
- // Keep the old |video_layer_| and |video_weblayer_| alive until SetWebLayer
- // is called with a new pointer, as it may use the pointer from the last call.
+ // Keep the old |video_layer_| alive until SetWebLayer() is called with a new
+ // pointer, as it may use the pointer from the last call.
auto new_video_layer =
cc::VideoLayer::Create(compositor_.get(), video_rotation);
new_video_layer->SetContentsOpaque(is_opaque);
diff --git a/content/renderer/media/stream/webmediaplayer_ms.h b/content/renderer/media/stream/webmediaplayer_ms.h
index 896ed27..5d059bd 100644
--- a/content/renderer/media/stream/webmediaplayer_ms.h
+++ b/content/renderer/media/stream/webmediaplayer_ms.h
@@ -19,7 +19,6 @@
#include "media/blink/webmediaplayer_util.h"
#include "media/renderers/paint_canvas_video_renderer.h"
#include "media/video/gpu_video_accelerator_factories.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_media_player.h"
#include "third_party/blink/public/platform/web_media_stream.h"
diff --git a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
index b801dde..bb44b51 100644
--- a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
@@ -12,6 +12,7 @@
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "build/build_config.h"
+#include "cc/layers/layer.h"
#include "content/public/renderer/media_stream_renderer_factory.h"
#include "content/renderer/media/stream/webmediaplayer_ms.h"
#include "content/renderer/media/stream/webmediaplayer_ms_compositor.h"
@@ -21,7 +22,6 @@
#include "media/video/mock_gpu_memory_buffer_video_frame_pool.h"
#include "media/video/mock_gpu_video_accelerator_factories.h"
#include "third_party/blink/public/platform/web_fullscreen_video_status.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_media_player.h"
#include "third_party/blink/public/platform/web_media_player_client.h"
#include "third_party/blink/public/platform/web_media_player_source.h"
@@ -444,8 +444,9 @@
// content::MediaStreamVideoRenderer.
// 2. content::MediaStreamVideoRenderer will start pushing frames into
// WebMediaPlayerMS repeatedly.
-// 3. On WebMediaPlayerMS receiving the first frame, a WebLayer will be created.
-// 4. The WebLayer will call
+// 3. On WebMediaPlayerMS receiving the first frame, a cc::Layer will be
+// created.
+// 4. The cc::Layer will call
// WebMediaPlayerMSCompositor::SetVideoFrameProviderClient, which in turn
// will trigger cc::VideoFrameProviderClient::StartRendering.
// 5. Then cc::VideoFrameProviderClient will start calling
@@ -480,7 +481,7 @@
message_loop_.task_runner(),
gpu_factories_.get(),
blink::WebString())),
- web_layer_set_(false),
+ layer_set_(false),
rendering_(false),
background_rendering_(false) {}
~WebMediaPlayerMSTest() override {
@@ -498,7 +499,7 @@
void DurationChanged() override {}
void SizeChanged() override;
void PlaybackStateChanged() override {}
- void SetWebLayer(blink::WebLayer* layer) override;
+ void SetWebLayer(cc::Layer* layer) override;
blink::WebMediaPlayer::TrackId AddAudioTrack(const blink::WebString& id,
AudioTrackKind,
const blink::WebString& label,
@@ -587,7 +588,7 @@
std::unique_ptr<WebMediaPlayerMS> player_;
WebMediaPlayerMSCompositor* compositor_;
ReusableMessageLoopEvent message_loop_controller_;
- blink::WebLayer* web_layer_;
+ cc::Layer* layer_;
bool is_audio_element_ = false;
std::vector<base::OnceClosure> frame_ready_cbs_;
@@ -596,7 +597,7 @@
// rendering.
void RenderFrame();
- bool web_layer_set_;
+ bool layer_set_;
bool rendering_;
bool background_rendering_;
};
@@ -646,13 +647,13 @@
player_->Play();
}
-void WebMediaPlayerMSTest::SetWebLayer(blink::WebLayer* layer) {
+void WebMediaPlayerMSTest::SetWebLayer(cc::Layer* layer) {
// Make sure that the old layer is still alive, see http://crbug.com/705448.
- if (web_layer_set_)
- EXPECT_TRUE(web_layer_ != nullptr);
- web_layer_set_ = layer ? true : false;
+ if (layer_set_)
+ EXPECT_TRUE(layer_ != nullptr);
+ layer_set_ = layer ? true : false;
- web_layer_ = layer;
+ layer_ = layer;
if (layer)
compositor_->SetVideoFrameProviderClient(this);
DoSetWebLayer(!!layer);
@@ -988,20 +989,20 @@
CheckSizeChanged(gfx::Size(kStandardWidth, kStandardHeight)));
message_loop_controller_.RunAndWaitForStatus(
media::PipelineStatus::PIPELINE_OK);
- ASSERT_TRUE(web_layer_ != nullptr);
- EXPECT_TRUE(web_layer_->contents_opaque());
+ ASSERT_TRUE(layer_ != nullptr);
+ EXPECT_TRUE(layer_->contents_opaque());
// Push one transparent frame.
provider->QueueFrames(timestamps, false);
message_loop_controller_.RunAndWaitForStatus(
media::PipelineStatus::PIPELINE_OK);
- EXPECT_FALSE(web_layer_->contents_opaque());
+ EXPECT_FALSE(layer_->contents_opaque());
// Push another opaque frame.
provider->QueueFrames(timestamps, true);
message_loop_controller_.RunAndWaitForStatus(
media::PipelineStatus::PIPELINE_OK);
- EXPECT_TRUE(web_layer_->contents_opaque());
+ EXPECT_TRUE(layer_->contents_opaque());
testing::Mock::VerifyAndClearExpectations(this);
EXPECT_CALL(*this, DoSetWebLayer(false));
diff --git a/content/renderer/pepper/fullscreen_container.h b/content/renderer/pepper/fullscreen_container.h
index 74be5d2..2855b9e 100644
--- a/content/renderer/pepper/fullscreen_container.h
+++ b/content/renderer/pepper/fullscreen_container.h
@@ -5,13 +5,15 @@
#ifndef CONTENT_RENDERER_PEPPER_FULLSCREEN_CONTAINER_H_
#define CONTENT_RENDERER_PEPPER_FULLSCREEN_CONTAINER_H_
-#include "third_party/blink/public/platform/web_layer.h"
-
namespace blink {
struct WebCursorInfo;
struct WebRect;
} // namespace blink
+namespace cc {
+class Layer;
+}
+
namespace content {
// This class is like a lightweight WebPluginContainer for fullscreen PPAPI
@@ -34,7 +36,7 @@
// Notifies the container that the mouse cursor has changed.
virtual void PepperDidChangeCursor(const blink::WebCursorInfo& cursor) = 0;
- virtual void SetLayer(blink::WebLayer* layer) = 0;
+ virtual void SetLayer(cc::Layer* layer) = 0;
protected:
virtual ~FullscreenContainer() {}
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 766c19f..303291e 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -100,7 +100,6 @@
#include "third_party/blink/public/platform/web_float_rect.h"
#include "third_party/blink/public/platform/web_input_event.h"
#include "third_party/blink/public/platform/web_keyboard_event.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_mouse_event.h"
#include "third_party/blink/public/platform/web_pointer_event.h"
#include "third_party/blink/public/platform/web_rect.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h
index 9e46053..6d55411 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.h
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -57,7 +57,6 @@
#include "ppapi/thunk/ppb_gamepad_api.h"
#include "ppapi/thunk/resource_creation_api.h"
#include "third_party/blink/public/platform/web_canvas.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/platform/web_url_response.h"
#include "third_party/blink/public/web/web_associated_url_loader_client.h"
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 25b4494..fd11302 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -37,7 +37,6 @@
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_policy.h"
#include "third_party/blink/public/platform/url_conversion.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_rect.h"
#include "third_party/blink/public/platform/web_resource_timing_info.h"
#include "third_party/blink/public/platform/web_string.h"
@@ -864,7 +863,7 @@
}
#endif
-blink::WebLayer* RenderFrameProxy::GetLayer() {
+cc::Layer* RenderFrameProxy::GetLayer() {
return embedded_layer_.get();
}
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h
index 07992f5..649f4ee 100644
--- a/content/renderer/render_frame_proxy.h
+++ b/content/renderer/render_frame_proxy.h
@@ -264,7 +264,7 @@
#endif
// ChildFrameCompositor:
- blink::WebLayer* GetLayer() override;
+ cc::Layer* GetLayer() override;
void SetLayer(scoped_refptr<cc::Layer> layer,
bool prevent_contents_opaque_changes) override;
SkBitmap* GetSadPageBitmap() override;
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index b5eee66..1e908be 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -21,7 +21,6 @@
#include "third_party/blink/public/platform/web_canvas.h"
#include "third_party/blink/public/platform/web_cursor_info.h"
#include "third_party/blink/public/platform/web_gesture_event.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
#include "third_party/blink/public/platform/web_size.h"
#include "third_party/blink/public/web/web_widget.h"
@@ -333,7 +332,7 @@
}
// TODO(danakj): These should be a scoped_refptr<cc::Layer>.
-void RenderWidgetFullscreenPepper::SetLayer(blink::WebLayer* layer) {
+void RenderWidgetFullscreenPepper::SetLayer(cc::Layer* layer) {
layer_ = layer;
if (!layer_) {
if (compositor_)
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index 7aefd8e..0faccb2 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -13,10 +13,13 @@
#include "content/renderer/mouse_lock_dispatcher.h"
#include "content/renderer/pepper/fullscreen_container.h"
#include "content/renderer/render_widget.h"
-#include "third_party/blink/public/platform/web_layer.h"
#include "third_party/blink/public/web/web_widget.h"
#include "url/gurl.h"
+namespace cc {
+class Layer;
+}
+
namespace content {
class CompositorDependencies;
class PepperPluginInstanceImpl;
@@ -42,7 +45,7 @@
void ScrollRect(int dx, int dy, const blink::WebRect& rect) override;
void Destroy() override;
void PepperDidChangeCursor(const blink::WebCursorInfo& cursor) override;
- void SetLayer(blink::WebLayer* layer) override;
+ void SetLayer(cc::Layer* layer) override;
// RenderWidget overrides.
bool OnMessageReceived(const IPC::Message& msg) override;
@@ -81,7 +84,7 @@
// The plugin instance this widget wraps.
PepperPluginInstanceImpl* plugin_;
- blink::WebLayer* layer_;
+ cc::Layer* layer_;
std::unique_ptr<MouseLockDispatcher> mouse_lock_dispatcher_;
