Commit e4bb7ea7 authored by tzik's avatar tzik Committed by Commit Bot

Use base/memory/scoped_refptr.h instead of ref_counted.h in Blink

scoped_refptr.h is allowed in Blink, and ref_counted.h is allowed only on wtf now.
This CL updates existing ref_counted.h inclusion to scoped_refptr.h.

Bug: 763844
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I3837118b1cb4176c427ad9e39e43ade2769aeaf9
Reviewed-on: https://chromium-review.googlesource.com/712274Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509306}
parent 08cfd25e
......@@ -4,11 +4,11 @@
#include "platform/animation/CompositorAnimationHost.h"
#include "base/memory/ref_counted.h"
#include <memory>
#include "base/memory/scoped_refptr.h"
#include "platform/animation/CompositorAnimationTimeline.h"
#include "platform/testing/CompositorTest.h"
#include "platform/testing/WebLayerTreeViewImplForTesting.h"
#include <memory>
namespace blink {
......
......@@ -6,7 +6,7 @@
#define CompositorAnimationPlayer_h
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "cc/animation/animation_delegate.h"
#include "cc/animation/animation_player.h"
#include "platform/PlatformExport.h"
......
......@@ -6,7 +6,7 @@
#define CompositorAnimationTimeline_h
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "cc/animation/animation_timeline.h"
#include "platform/PlatformExport.h"
#include "platform/wtf/Noncopyable.h"
......
......@@ -4,13 +4,13 @@
#include "platform/animation/CompositorAnimationTimeline.h"
#include "base/memory/ref_counted.h"
#include <memory>
#include "base/memory/scoped_refptr.h"
#include "cc/animation/animation_host.h"
#include "platform/animation/CompositorAnimationHost.h"
#include "platform/animation/CompositorAnimationPlayer.h"
#include "platform/testing/CompositorTest.h"
#include "platform/testing/WebLayerTreeViewImplForTesting.h"
#include <memory>
namespace blink {
......
......@@ -6,7 +6,7 @@
#define SurfaceLayerBridge_h
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/common/surfaces/surface_reference_factory.h"
......
......@@ -6,7 +6,7 @@
#define PaintArtifactCompositor_h
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "platform/PlatformExport.h"
#include "platform/graphics/GraphicsLayerClient.h"
#include "platform/graphics/compositing/PropertyTreeManager.h"
......
......@@ -5,7 +5,7 @@
#ifndef PaintChunksToCcLayer_h
#define PaintChunksToCcLayer_h
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "cc/paint/display_item_list.h"
#include "platform/PlatformExport.h"
#include "platform/geometry/IntRect.h"
......
......@@ -6,7 +6,6 @@
#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TEST_TIME_SOURCE_H_
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/time/tick_clock.h"
......
......@@ -10,8 +10,6 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "platform/scheduler/base/intrusive_heap.h"
#include "platform/scheduler/base/lazy_now.h"
......
......@@ -8,7 +8,7 @@
#include <memory>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "platform/PlatformExport.h"
#include "platform/scheduler/base/task_queue.h"
......
......@@ -9,7 +9,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "platform/PlatformExport.h"
#include "platform/WebTaskRunner.h"
......
......@@ -5,7 +5,7 @@
#include "platform/scheduler/renderer/idle_time_estimator.h"
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/test/simple_test_tick_clock.h"
#include "components/viz/test/ordered_simple_task_runner.h"
#include "platform/scheduler/base/task_queue.h"
......
......@@ -9,7 +9,7 @@
#include <set>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/trace_event/trace_event.h"
#include "platform/PlatformExport.h"
......
......@@ -9,7 +9,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "platform/WebTaskRunner.h"
#include "platform/wtf/RefPtr.h"
......
......@@ -6,7 +6,7 @@
#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_UTILITY_WEBTHREAD_IMPL_FOR_UTILITY_THREAD_H_
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "platform/PlatformExport.h"
#include "public/platform/scheduler/child/webthread_base.h"
......
......@@ -5,7 +5,7 @@
#ifndef CompositorTest_h
#define CompositorTest_h
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/test/test_mock_time_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "platform/wtf/Noncopyable.h"
......
......@@ -6,7 +6,7 @@
#define TestPaintArtifact_h
#include <memory>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "platform/graphics/Color.h"
#include "platform/graphics/paint/DisplayItemList.h"
#include "platform/graphics/paint/PaintArtifact.h"
......
......@@ -22,11 +22,8 @@
#ifndef WTF_RefPtr_h
#define WTF_RefPtr_h
#include <algorithm>
#include <utility>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "platform/wtf/Allocator.h"
#include "platform/wtf/allocator/PartitionAllocator.h"
namespace WTF {
......
......@@ -26,6 +26,7 @@
#include <limits.h>
#include <string.h>
#include "base/memory/ref_counted.h"
#include "build/build_config.h"
#include "platform/wtf/ASCIICType.h"
#include "platform/wtf/Forward.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment