third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp - Issue 2227563003: Refactoring button field and its type

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mac/win errors Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('K') | « third_party/WebKit/Source/core/input/PointerEventManager.cpp ('k') | third_party/WebKit/Source/core/page/AutoscrollController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp b/third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp

index be3aa68e1c81eb1b2fbf8b213ba43ab9999d977e..6f88d569750ec58d1995028f74b1dbc5177b4b73 100644

--- a/third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutFrameSet.cpp

@@ -472,7 +472,7 @@ bool LayoutFrameSet::userResize(MouseEvent* evt)

if (!m_isResizing) {

if (needsLayout())

return false;

- if (evt->type() == EventTypeNames::mousedown && evt->button() == LeftButton) {

+ if (evt->type() == EventTypeNames::mousedown && evt->button() == static_cast<short>(WebPointerProperties::Button::Left)) {

FloatPoint localPos = absoluteToLocal(FloatPoint(evt->absoluteLocation()), UseTransforms);

startResizing(m_cols, localPos.x());

startResizing(m_rows, localPos.y());

@@ -482,11 +482,11 @@ bool LayoutFrameSet::userResize(MouseEvent* evt)

}

} else {

- if (evt->type() == EventTypeNames::mousemove || (evt->type() == EventTypeNames::mouseup && evt->button() == LeftButton)) {

+ if (evt->type() == EventTypeNames::mousemove || (evt->type() == EventTypeNames::mouseup && evt->button() == static_cast<short>(WebPointerProperties::Button::Left))) {

FloatPoint localPos = absoluteToLocal(FloatPoint(evt->absoluteLocation()), UseTransforms);

continueResizing(m_cols, localPos.x());

continueResizing(m_rows, localPos.y());

- if (evt->type() == EventTypeNames::mouseup && evt->button() == LeftButton) {

+ if (evt->type() == EventTypeNames::mouseup && evt->button() == static_cast<short>(WebPointerProperties::Button::Left)) {

setIsResizing(false);

return true;

}