Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: third_party/WebKit/Source/core/input/ScrollManager.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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
Index: third_party/WebKit/Source/core/input/ScrollManager.cpp
diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp
index 925cd2a9a8d495bc6eafa43580f5ccaed8fe50a7..ce865367ca782346cdefeb3dd0436f97d1bd423d 100644
--- a/third_party/WebKit/Source/core/input/ScrollManager.cpp
+++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
@@ -224,7 +224,7 @@ WebInputEventResult ScrollManager::handleGestureScrollBegin(
m_currentScrollChain.clear();
std::unique_ptr<ScrollStateData> scrollStateData =
- makeUnique<ScrollStateData>();
+ WTF::makeUnique<ScrollStateData>();
scrollStateData->position_x = gestureEvent.position().x();
scrollStateData->position_y = gestureEvent.position().y();
scrollStateData->is_beginning = true;
@@ -270,7 +270,7 @@ WebInputEventResult ScrollManager::handleGestureScrollUpdate(
}
std::unique_ptr<ScrollStateData> scrollStateData =
- makeUnique<ScrollStateData>();
+ WTF::makeUnique<ScrollStateData>();
scrollStateData->delta_x = delta.width();
scrollStateData->delta_y = delta.height();
scrollStateData->delta_granularity =
@@ -326,7 +326,7 @@ WebInputEventResult ScrollManager::handleGestureScrollEnd(
if (node && node->layoutObject()) {
passScrollGestureEventToWidget(gestureEvent, node->layoutObject());
std::unique_ptr<ScrollStateData> scrollStateData =
- makeUnique<ScrollStateData>();
+ WTF::makeUnique<ScrollStateData>();
scrollStateData->is_ending = true;
scrollStateData->is_in_inertial_phase =
gestureEvent.inertialPhase() == ScrollInertialPhaseMomentum;
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698