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

Side by Side Diff: third_party/WebKit/Source/core/page/scrolling/ScrollState.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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/page/scrolling/ScrollState.h" 5 #include "core/page/scrolling/ScrollState.h"
6 6
7 #include "core/dom/DOMNodeIds.h" 7 #include "core/dom/DOMNodeIds.h"
8 #include "core/dom/Element.h" 8 #include "core/dom/Element.h"
9 #include "core/dom/ExceptionCode.h" 9 #include "core/dom/ExceptionCode.h"
10 #include "platform/graphics/CompositorElementId.h" 10 #include "platform/graphics/CompositorElementId.h"
(...skipping 10 matching lines...) Expand all
21 return nullptr; 21 return nullptr;
22 ASSERT(node->isElementNode()); 22 ASSERT(node->isElementNode());
23 if (!node->isElementNode()) 23 if (!node->isElementNode())
24 return nullptr; 24 return nullptr;
25 return static_cast<Element*>(node); 25 return static_cast<Element*>(node);
26 } 26 }
27 } // namespace 27 } // namespace
28 28
29 ScrollState* ScrollState::create(ScrollStateInit init) { 29 ScrollState* ScrollState::create(ScrollStateInit init) {
30 std::unique_ptr<ScrollStateData> scrollStateData = 30 std::unique_ptr<ScrollStateData> scrollStateData =
31 makeUnique<ScrollStateData>(); 31 WTF::makeUnique<ScrollStateData>();
32 scrollStateData->delta_x = init.deltaX(); 32 scrollStateData->delta_x = init.deltaX();
33 scrollStateData->delta_y = init.deltaY(); 33 scrollStateData->delta_y = init.deltaY();
34 scrollStateData->position_x = init.positionX(); 34 scrollStateData->position_x = init.positionX();
35 scrollStateData->position_y = init.positionY(); 35 scrollStateData->position_y = init.positionY();
36 scrollStateData->velocity_x = init.velocityX(); 36 scrollStateData->velocity_x = init.velocityX();
37 scrollStateData->velocity_y = init.velocityY(); 37 scrollStateData->velocity_y = init.velocityY();
38 scrollStateData->is_beginning = init.isBeginning(); 38 scrollStateData->is_beginning = init.isBeginning();
39 scrollStateData->is_in_inertial_phase = init.isInInertialPhase(); 39 scrollStateData->is_in_inertial_phase = init.isInInertialPhase();
40 scrollStateData->is_ending = init.isEnding(); 40 scrollStateData->is_ending = init.isEnding();
41 scrollStateData->should_propagate = init.shouldPropagate(); 41 scrollStateData->should_propagate = init.shouldPropagate();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 m_data->set_current_native_scrolling_element(createCompositorElementId( 103 m_data->set_current_native_scrolling_element(createCompositorElementId(
104 DOMNodeIds::idForNode(element), CompositorSubElementId::Scroll)); 104 DOMNodeIds::idForNode(element), CompositorSubElementId::Scroll));
105 } 105 }
106 106
107 void ScrollState::setCurrentNativeScrollingElementById(int elementId) { 107 void ScrollState::setCurrentNativeScrollingElementById(int elementId) {
108 m_data->set_current_native_scrolling_element( 108 m_data->set_current_native_scrolling_element(
109 createCompositorElementId(elementId, CompositorSubElementId::Scroll)); 109 createCompositorElementId(elementId, CompositorSubElementId::Scroll));
110 } 110 }
111 111
112 } // namespace blink 112 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698