Commit 2a99bebf authored by Jose Dapena Paz's avatar Jose Dapena Paz Committed by Commit Bot

ScrollStateCallback: fix clash between enum class NativeScrollBehavior and getter

Rename NativeScrollBehavior getter to GetNativeScrollBehavior to avoid GCC
compilation error:

../../third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h:31:3: error: declaration of ‘blink::NativeScrollBehavior blink::ScrollStateCallback::NativeScrollBehavior() const’ [-fpermissive]
   }
   ^
../../third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h:15:12: error: changes meaning of ‘NativeScrollBehavior’ from ‘enum class blink::NativeScrollBehavior’ [-fpermissive]

Bug: 819294
Change-Id: Idb0fa5649c78171dce179a075222847053268324
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900998Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
Cr-Commit-Position: refs/heads/master@{#713116}
parent a4eed36e
...@@ -617,13 +617,13 @@ void Node::CallDistributeScroll(ScrollState& scroll_state) { ...@@ -617,13 +617,13 @@ void Node::CallDistributeScroll(ScrollState& scroll_state) {
NativeDistributeScroll(scroll_state); NativeDistributeScroll(scroll_state);
return; return;
} }
if (callback->NativeScrollBehavior() != if (callback->GetNativeScrollBehavior() !=
NativeScrollBehavior::kPerformAfterNativeScroll) NativeScrollBehavior::kPerformAfterNativeScroll)
callback->Invoke(&scroll_state); callback->Invoke(&scroll_state);
if (callback->NativeScrollBehavior() != if (callback->GetNativeScrollBehavior() !=
NativeScrollBehavior::kDisableNativeScroll) NativeScrollBehavior::kDisableNativeScroll)
NativeDistributeScroll(scroll_state); NativeDistributeScroll(scroll_state);
if (callback->NativeScrollBehavior() == if (callback->GetNativeScrollBehavior() ==
NativeScrollBehavior::kPerformAfterNativeScroll) NativeScrollBehavior::kPerformAfterNativeScroll)
callback->Invoke(&scroll_state); callback->Invoke(&scroll_state);
} }
...@@ -663,13 +663,13 @@ void Node::CallApplyScroll(ScrollState& scroll_state) { ...@@ -663,13 +663,13 @@ void Node::CallApplyScroll(ScrollState& scroll_state) {
NativeApplyScroll(scroll_state); NativeApplyScroll(scroll_state);
return; return;
} }
if (callback->NativeScrollBehavior() != if (callback->GetNativeScrollBehavior() !=
NativeScrollBehavior::kPerformAfterNativeScroll) NativeScrollBehavior::kPerformAfterNativeScroll)
callback->Invoke(&scroll_state); callback->Invoke(&scroll_state);
if (callback->NativeScrollBehavior() != if (callback->GetNativeScrollBehavior() !=
NativeScrollBehavior::kDisableNativeScroll) NativeScrollBehavior::kDisableNativeScroll)
NativeApplyScroll(scroll_state); NativeApplyScroll(scroll_state);
if (callback->NativeScrollBehavior() == if (callback->GetNativeScrollBehavior() ==
NativeScrollBehavior::kPerformAfterNativeScroll) NativeScrollBehavior::kPerformAfterNativeScroll)
callback->Invoke(&scroll_state); callback->Invoke(&scroll_state);
} }
......
...@@ -26,7 +26,7 @@ class ScrollStateCallback : public GarbageCollected<ScrollStateCallback> { ...@@ -26,7 +26,7 @@ class ScrollStateCallback : public GarbageCollected<ScrollStateCallback> {
virtual void Invoke(ScrollState*) = 0; virtual void Invoke(ScrollState*) = 0;
NativeScrollBehavior NativeScrollBehavior() const { NativeScrollBehavior GetNativeScrollBehavior() const {
return native_scroll_behavior_; return native_scroll_behavior_;
} }
......
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