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/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
