Commit f62cc7f8 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] drop using statement from header file

This fixes the following jumbo build error:

In file included from gen/third_party/WebKit/Source/platform/blink_platform_unittests_sources_jumbo_3.cc:26:
In file included from ./../../third_party/WebKit/Source/platform/graphics/paint/DrawingRecorderTest.cpp:8:
../../third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.h:19:23: error: target of using declaration conflicts with declaration already in scope
using blink::testing::DefaultPaintChunkProperties;
                      ^
../../third_party/WebKit/Source/platform/testing/PaintPropertyTestHelpers.h:29:36: note: target of using declaration
static inline PaintChunkProperties DefaultPaintChunkProperties() {
                                   ^
./../../third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp:43:22: note: conflicting declaration
PaintChunkProperties DefaultPaintChunkProperties() {
                     ^
1 error generated.

Followup to https://chromium-review.googlesource.com/c/chromium/src/+/922391

TBR=chrishtr@chromium.org

Bug: 811269
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Icb472581bb3b9fc46c82d21b0566572b61732876
Reviewed-on: https://chromium-review.googlesource.com/924863
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: default avatarMostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#537559}
parent 9c9ce21c
...@@ -532,7 +532,7 @@ TEST_P(PaintControllerTest, UpdateClip) { ...@@ -532,7 +532,7 @@ TEST_P(PaintControllerTest, UpdateClip) {
{ {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
PaintChunk::Id id(first, kClipType); PaintChunk::Id id(first, kClipType);
PaintChunkProperties properties = DefaultPaintChunkProperties(); PaintChunkProperties properties = testing::DefaultPaintChunkProperties();
properties.property_tree_state.SetClip(clip.get()); properties.property_tree_state.SetClip(clip.get());
GetPaintController().UpdateCurrentPaintChunkProperties(id, properties); GetPaintController().UpdateCurrentPaintChunkProperties(id, properties);
} }
...@@ -594,7 +594,7 @@ TEST_P(PaintControllerTest, UpdateClip) { ...@@ -594,7 +594,7 @@ TEST_P(PaintControllerTest, UpdateClip) {
{ {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
PaintChunk::Id id(second, kClipType); PaintChunk::Id id(second, kClipType);
PaintChunkProperties properties = DefaultPaintChunkProperties(); PaintChunkProperties properties = testing::DefaultPaintChunkProperties();
properties.property_tree_state.SetClip(clip2.get()); properties.property_tree_state.SetClip(clip2.get());
GetPaintController().UpdateCurrentPaintChunkProperties(id, properties); GetPaintController().UpdateCurrentPaintChunkProperties(id, properties);
...@@ -831,7 +831,7 @@ TEST_P(PaintControllerTest, CachedSubsequenceForcePaintChunk) { ...@@ -831,7 +831,7 @@ TEST_P(PaintControllerTest, CachedSubsequenceForcePaintChunk) {
GraphicsContext context(GetPaintController()); GraphicsContext context(GetPaintController());
FakeDisplayItemClient root("root"); FakeDisplayItemClient root("root");
auto root_properties = DefaultPaintChunkProperties(); auto root_properties = testing::DefaultPaintChunkProperties();
PaintChunk::Id root_id(root, DisplayItem::kCaret); PaintChunk::Id root_id(root, DisplayItem::kCaret);
// Record a first chunk with backface_hidden == false // Record a first chunk with backface_hidden == false
GetPaintController().UpdateCurrentPaintChunkProperties(root_id, GetPaintController().UpdateCurrentPaintChunkProperties(root_id,
...@@ -841,7 +841,7 @@ TEST_P(PaintControllerTest, CachedSubsequenceForcePaintChunk) { ...@@ -841,7 +841,7 @@ TEST_P(PaintControllerTest, CachedSubsequenceForcePaintChunk) {
FakeDisplayItemClient container("container"); FakeDisplayItemClient container("container");
{ {
// Record a second chunk with backface_hidden == true // Record a second chunk with backface_hidden == true
auto container_properties = DefaultPaintChunkProperties(); auto container_properties = testing::DefaultPaintChunkProperties();
container_properties.backface_hidden = true; container_properties.backface_hidden = true;
PaintChunk::Id container_id(container, DisplayItem::kCaret); PaintChunk::Id container_id(container, DisplayItem::kCaret);
...@@ -887,8 +887,10 @@ TEST_P(PaintControllerTest, CachedSubsequenceSwapOrder) { ...@@ -887,8 +887,10 @@ TEST_P(PaintControllerTest, CachedSubsequenceSwapOrder) {
FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200)); FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
GraphicsContext context(GetPaintController()); GraphicsContext context(GetPaintController());
PaintChunkProperties container1_properties = DefaultPaintChunkProperties(); PaintChunkProperties container1_properties =
PaintChunkProperties container2_properties = DefaultPaintChunkProperties(); testing::DefaultPaintChunkProperties();
PaintChunkProperties container2_properties =
testing::DefaultPaintChunkProperties();
{ {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
...@@ -1152,8 +1154,10 @@ TEST_P(PaintControllerTest, UpdateSwapOrderCrossingChunks) { ...@@ -1152,8 +1154,10 @@ TEST_P(PaintControllerTest, UpdateSwapOrderCrossingChunks) {
FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200)); FakeDisplayItemClient content2("content2", LayoutRect(100, 200, 50, 200));
GraphicsContext context(GetPaintController()); GraphicsContext context(GetPaintController());
PaintChunkProperties container1_properties = DefaultPaintChunkProperties(); PaintChunkProperties container1_properties =
PaintChunkProperties container2_properties = DefaultPaintChunkProperties(); testing::DefaultPaintChunkProperties();
PaintChunkProperties container2_properties =
testing::DefaultPaintChunkProperties();
{ {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
...@@ -1287,13 +1291,15 @@ TEST_P(PaintControllerTest, CachedNestedSubsequenceUpdate) { ...@@ -1287,13 +1291,15 @@ TEST_P(PaintControllerTest, CachedNestedSubsequenceUpdate) {
GraphicsContext context(GetPaintController()); GraphicsContext context(GetPaintController());
PaintChunkProperties container1_background_properties = PaintChunkProperties container1_background_properties =
DefaultPaintChunkProperties(); testing::DefaultPaintChunkProperties();
PaintChunkProperties content1_properties = DefaultPaintChunkProperties(); PaintChunkProperties content1_properties =
testing::DefaultPaintChunkProperties();
PaintChunkProperties container1_foreground_properties = PaintChunkProperties container1_foreground_properties =
DefaultPaintChunkProperties(); testing::DefaultPaintChunkProperties();
PaintChunkProperties container2_background_properties = PaintChunkProperties container2_background_properties =
DefaultPaintChunkProperties(); testing::DefaultPaintChunkProperties();
PaintChunkProperties content2_properties = DefaultPaintChunkProperties(); PaintChunkProperties content2_properties =
testing::DefaultPaintChunkProperties();
{ {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
...@@ -1778,7 +1784,7 @@ TEST_P(PaintControllerTest, SmallPaintControllerHasOnePaintChunk) { ...@@ -1778,7 +1784,7 @@ TEST_P(PaintControllerTest, SmallPaintControllerHasOnePaintChunk) {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
GetPaintController().UpdateCurrentPaintChunkProperties( GetPaintController().UpdateCurrentPaintChunkProperties(
WTF::nullopt, DefaultPaintChunkProperties()); WTF::nullopt, testing::DefaultPaintChunkProperties());
} }
GraphicsContext context(GetPaintController()); GraphicsContext context(GetPaintController());
DrawRect(context, client, kBackgroundType, FloatRect(0, 0, 100, 100)); DrawRect(context, client, kBackgroundType, FloatRect(0, 0, 100, 100));
......
...@@ -16,8 +16,6 @@ namespace blink { ...@@ -16,8 +16,6 @@ namespace blink {
class GraphicsContext; class GraphicsContext;
using blink::testing::DefaultPaintChunkProperties;
class PaintControllerTestBase : public ::testing::Test { class PaintControllerTestBase : public ::testing::Test {
public: public:
PaintControllerTestBase() PaintControllerTestBase()
...@@ -48,7 +46,7 @@ class PaintControllerTestBase : public ::testing::Test { ...@@ -48,7 +46,7 @@ class PaintControllerTestBase : public ::testing::Test {
void InitRootChunk() { void InitRootChunk() {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) { if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
GetPaintController().UpdateCurrentPaintChunkProperties( GetPaintController().UpdateCurrentPaintChunkProperties(
root_paint_chunk_id_, DefaultPaintChunkProperties()); root_paint_chunk_id_, testing::DefaultPaintChunkProperties());
} }
} }
......
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