summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 11:40:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 12:42:11 +0000
commit5d87695f37678f96492b258bbab36486c59866b4 (patch)
treebe9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc
parent6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
downloadqtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc26
1 files changed, 14 insertions, 12 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc b/chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc
index 267c8429e97..0c7b4deeb14 100644
--- a/chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc
+++ b/chromium/third_party/blink/renderer/core/paint/link_highlight_impl_test.cc
@@ -90,7 +90,7 @@ class LinkHighlightImplTest : public testing::Test,
// garbage collection would occur after ScopedBlinkGenPropertyTreesForTest
// is out of scope, so the settings would not apply in some destructors.
web_view_helper_.Reset();
- ThreadState::Current()->CollectAllGarbage();
+ ThreadState::Current()->CollectAllGarbageForTesting();
}
size_t ContentLayerCount() {
@@ -127,7 +127,7 @@ TEST_P(LinkHighlightImplTest, verifyWebViewImplIntegration) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
// The coordinates below are linked to absolute positions in the referenced
// .html file.
@@ -181,7 +181,7 @@ TEST_P(LinkHighlightImplTest, resetDuringNodeRemoval) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
touch_event.SetPositionInWidget(WebFloatPoint(20, 20));
GestureEventWithHitTestResults targeted_event = GetTargetedEvent(touch_event);
@@ -228,7 +228,7 @@ TEST_P(LinkHighlightImplTest, resetLayerTreeView) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
touch_event.SetPositionInWidget(WebFloatPoint(20, 20));
GestureEventWithHitTestResults targeted_event = GetTargetedEvent(touch_event);
@@ -261,7 +261,7 @@ TEST_P(LinkHighlightImplTest, HighlightInvalidation) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
touch_event.SetPositionInWidget(WebFloatPoint(20, 20));
GestureEventWithHitTestResults targeted_event = GetTargetedEvent(touch_event);
auto* touch_element = ToElement(web_view_impl->BestTapNode(targeted_event));
@@ -273,9 +273,11 @@ TEST_P(LinkHighlightImplTest, HighlightInvalidation) {
// Change the touched element's height to 12px.
auto& style = touch_element->getAttribute(html_names::kStyleAttr);
- String new_style = style.GetString();
- new_style.append("height: 12px;");
- touch_element->setAttribute(html_names::kStyleAttr, AtomicString(new_style));
+ StringBuilder new_style;
+ new_style.Append(style.GetString());
+ new_style.Append("height: 12px;");
+ touch_element->setAttribute(html_names::kStyleAttr,
+ new_style.ToAtomicString());
UpdateAllLifecyclePhases();
const auto& highlights =
@@ -304,7 +306,7 @@ TEST_P(LinkHighlightImplTest, HighlightLayerEffectNode) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
touch_event.SetPositionInWidget(WebFloatPoint(20, 20));
GestureEventWithHitTestResults targeted_event = GetTargetedEvent(touch_event);
@@ -334,7 +336,7 @@ TEST_P(LinkHighlightImplTest, HighlightLayerEffectNode) {
// node.
EXPECT_EQ(highlight->Effect().GetCompositorElementId(),
highlight->ElementIdForTesting());
- EXPECT_TRUE(highlight->Effect().RequiresCompositingForAnimation());
+ EXPECT_TRUE(highlight->Effect().HasActiveOpacityAnimation());
touch_node->remove(IGNORE_EXCEPTION_FOR_TESTING);
UpdateAllLifecyclePhases();
@@ -361,7 +363,7 @@ TEST_P(LinkHighlightImplTest, MultiColumn) {
WebGestureEvent touch_event(WebInputEvent::kGestureShowPress,
WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests(),
- kWebGestureDeviceTouchscreen);
+ WebGestureDevice::kTouchscreen);
// This will touch the link under multicol.
touch_event.SetPositionInWidget(WebFloatPoint(20, 300));
@@ -381,7 +383,7 @@ TEST_P(LinkHighlightImplTest, MultiColumn) {
// node.
const auto& effect = highlight->Effect();
EXPECT_EQ(effect.GetCompositorElementId(), highlight->ElementIdForTesting());
- EXPECT_TRUE(effect.RequiresCompositingForAnimation());
+ EXPECT_TRUE(effect.HasActiveOpacityAnimation());
const auto& first_fragment = touch_node->GetLayoutObject()->FirstFragment();
const auto* second_fragment = first_fragment.NextFragment();