[jumbo] avoid MockEventListener symbol clash in blink/renderer/core/p…

…aint Followup to https://chromium-review.googlesource.com/c/chromium/src/+/1069699 Bug: 836905 Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 Change-Id: Id11d4c4a086e5160174eb94eb55948a47f513321 Reviewed-on: https://chromium-review.googlesource.com/1096237 Reviewed-by: Philip Rogers <[email protected]> Commit-Queue: Mostyn Bramley-Moore <[email protected]> Cr-Commit-Position: refs/heads/master@{#566217}
feiyue1206 · Jun 12, 2018 · e0f0a19 · e0f0a19
1 parent 765249b
commit e0f0a19
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/third_party/blink/renderer/core/paint/block_painter_test.cc b/third_party/blink/renderer/core/paint/block_painter_test.cc
@@ -211,9 +211,9 @@ TEST_F(BlockPainterTestWithPaintTouchAction, TouchActionRectsWithoutPaint) {
 }
 
 namespace {
-class MockEventListener final : public EventListener {
+class BlockPainterMockEventListener final : public EventListener {
  public:
-  MockEventListener() : EventListener(kCPPEventListenerType) {}
+  BlockPainterMockEventListener() : EventListener(kCPPEventListenerType) {}
 
   bool operator==(const EventListener& other) const final {
     return this == &other;
@@ -245,7 +245,7 @@ TEST_F(BlockPainterTestWithPaintTouchAction, TouchHandlerRectsWithoutPaint) {
 
   // Add an event listener to parent and ensure that hit test display items are
   // created for both the parent and child.
-  MockEventListener* callback = new MockEventListener();
+  BlockPainterMockEventListener* callback = new BlockPainterMockEventListener();
   auto* parent_element = GetElementById("parent");
   parent_element->addEventListener(EventTypeNames::touchstart, callback);
   GetDocument().View()->UpdateAllLifecyclePhases();

diff --git a/third_party/blink/renderer/core/paint/pre_paint_tree_walk_test.cc b/third_party/blink/renderer/core/paint/pre_paint_tree_walk_test.cc
@@ -301,9 +301,9 @@ TEST_P(PrePaintTreeWalkTest, ClipChangeHasRadius) {
 }
 
 namespace {
-class MockEventListener final : public EventListener {
+class PrePaintTreeWalkMockEventListener final : public EventListener {
  public:
-  MockEventListener() : EventListener(kCPPEventListenerType) {}
+  PrePaintTreeWalkMockEventListener() : EventListener(kCPPEventListenerType) {}
 
   bool operator==(const EventListener& other) const final {
     return this == &other;
@@ -341,7 +341,8 @@ TEST_P(PrePaintTreeWalkTest, InsideBlockingTouchEventHandlerUpdate) {
   EXPECT_FALSE(handler.InsideBlockingTouchEventHandler());
   EXPECT_FALSE(descendant.InsideBlockingTouchEventHandler());
 
-  MockEventListener* callback = new MockEventListener();
+  PrePaintTreeWalkMockEventListener* callback =
+      new PrePaintTreeWalkMockEventListener();
   auto* handler_element = GetDocument().getElementById("handler");
   handler_element->addEventListener(EventTypeNames::touchstart, callback);