Commit 2f4ef023 authored by Ella Ge's avatar Ella Ge Committed by Commit Bot

Retire FractionalMouseTypePointerEvent flag

Fractional Mouse type pointerEvent shipped in M64
https://chromium-review.googlesource.com/753511
https://www.chromestatus.com/feature/5117956774166528

Remove the flag and clean up related todo.

BUG=773813

Change-Id: Id8e17705b43d3bfe55deeed2a3bf7d39b61a71ed
Reviewed-on: https://chromium-review.googlesource.com/c/1230577Reviewed-by: default avatarMustaq Ahmed <mustaq@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604572}
parent 13fc02ff
...@@ -63,57 +63,12 @@ bool PointerEvent::IsPointerEvent() const { ...@@ -63,57 +63,12 @@ bool PointerEvent::IsPointerEvent() const {
return true; return true;
} }
double PointerEvent::screenX() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(screen_location_.X())
: screen_location_.X();
}
double PointerEvent::screenY() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(screen_location_.Y())
: screen_location_.Y();
}
double PointerEvent::clientX() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(client_location_.X())
: client_location_.X();
}
double PointerEvent::clientY() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(client_location_.Y())
: client_location_.Y();
}
double PointerEvent::pageX() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(page_location_.X())
: page_location_.X();
}
double PointerEvent::pageY() const {
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() &&
pointer_type_ == "mouse")
? static_cast<int>(page_location_.Y())
: page_location_.Y();
}
double PointerEvent::offsetX() { double PointerEvent::offsetX() {
if (!HasPosition()) if (!HasPosition())
return 0; return 0;
if (!has_cached_relative_position_) if (!has_cached_relative_position_)
ComputeRelativePosition(); ComputeRelativePosition();
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() && return offset_location_.X();
pointer_type_ == "mouse")
? std::round(offset_location_.X())
: offset_location_.X();
} }
double PointerEvent::offsetY() { double PointerEvent::offsetY() {
...@@ -121,10 +76,7 @@ double PointerEvent::offsetY() { ...@@ -121,10 +76,7 @@ double PointerEvent::offsetY() {
return 0; return 0;
if (!has_cached_relative_position_) if (!has_cached_relative_position_)
ComputeRelativePosition(); ComputeRelativePosition();
return (!RuntimeEnabledFeatures::FractionalMouseTypePointerEventEnabled() && return offset_location_.Y();
pointer_type_ == "mouse")
? std::round(offset_location_.Y())
: offset_location_.Y();
} }
void PointerEvent::ReceivedTarget() { void PointerEvent::ReceivedTarget() {
......
...@@ -39,14 +39,12 @@ class CORE_EXPORT PointerEvent final : public MouseEvent { ...@@ -39,14 +39,12 @@ class CORE_EXPORT PointerEvent final : public MouseEvent {
bool IsMouseEvent() const override; bool IsMouseEvent() const override;
bool IsPointerEvent() const override; bool IsPointerEvent() const override;
// TODO(eirage): Remove these override of coordinates getters when double screenX() const override { return screen_location_.X(); }
// fractional mouseevent flag is removed. double screenY() const override { return screen_location_.Y(); }
double screenX() const override; double clientX() const override { return client_location_.X(); }
double screenY() const override; double clientY() const override { return client_location_.Y(); }
double clientX() const override; double pageX() const override { return page_location_.X(); }
double clientY() const override; double pageY() const override { return page_location_.Y(); }
double pageX() const override;
double pageY() const override;
double offsetX() override; double offsetX() override;
double offsetY() override; double offsetY() override;
......
...@@ -521,10 +521,6 @@ ...@@ -521,10 +521,6 @@
{ {
name: "FractionalMouseEvent", name: "FractionalMouseEvent",
}, },
{
name: "FractionalMouseTypePointerEvent",
status: "stable",
},
{ {
name: "FractionalScrollOffsets", name: "FractionalScrollOffsets",
}, },
......
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