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

Side by Side Diff: third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 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 10
11 namespace blink { 11 namespace blink {
12 12
13 namespace { 13 namespace {
14 Element* elementForId(int elementId) 14 Element* elementForId(int elementId)
15 { 15 {
16 Node* node = DOMNodeIds::nodeForId(elementId); 16 Node* node = DOMNodeIds::nodeForId(elementId);
17 ASSERT(node); 17 ASSERT(node);
18 if (!node) 18 if (!node)
19 return nullptr; 19 return nullptr;
20 ASSERT(node->isElementNode()); 20 ASSERT(node->isElementNode());
21 if (!node->isElementNode()) 21 if (!node->isElementNode())
22 return nullptr; 22 return nullptr;
23 return static_cast<Element*>(node); 23 return static_cast<Element*>(node);
24 } 24 }
25 } // namespace 25 } // namespace
26 26
27 PassRefPtrWillBeRawPtr<ScrollState> ScrollState::create(ScrollStateInit init) 27 RawPtr<ScrollState> ScrollState::create(ScrollStateInit init)
28 { 28 {
29 OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData()); 29 OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
30 scrollStateData->delta_x = init.deltaX(); 30 scrollStateData->delta_x = init.deltaX();
31 scrollStateData->delta_y = init.deltaY(); 31 scrollStateData->delta_y = init.deltaY();
32 scrollStateData->start_position_x = init.startPositionX(); 32 scrollStateData->start_position_x = init.startPositionX();
33 scrollStateData->start_position_y = init.startPositionY(); 33 scrollStateData->start_position_y = init.startPositionY();
34 scrollStateData->velocity_x = init.velocityX(); 34 scrollStateData->velocity_x = init.velocityX();
35 scrollStateData->velocity_y = init.velocityY(); 35 scrollStateData->velocity_y = init.velocityY();
36 scrollStateData->is_beginning = init.isBeginning(); 36 scrollStateData->is_beginning = init.isBeginning();
37 scrollStateData->is_in_inertial_phase = init.isInInertialPhase(); 37 scrollStateData->is_in_inertial_phase = init.isInInertialPhase();
38 scrollStateData->is_ending = init.isEnding(); 38 scrollStateData->is_ending = init.isEnding();
39 scrollStateData->should_propagate = init.shouldPropagate(); 39 scrollStateData->should_propagate = init.shouldPropagate();
40 scrollStateData->from_user_input = init.fromUserInput(); 40 scrollStateData->from_user_input = init.fromUserInput();
41 scrollStateData->is_direct_manipulation = init.isDirectManipulation(); 41 scrollStateData->is_direct_manipulation = init.isDirectManipulation();
42 scrollStateData->delta_granularity = init.deltaGranularity(); 42 scrollStateData->delta_granularity = init.deltaGranularity();
43 ScrollState* scrollState = new ScrollState(scrollStateData.release()); 43 ScrollState* scrollState = new ScrollState(scrollStateData.release());
44 return adoptRefWillBeNoop(scrollState); 44 return adoptRefWillBeNoop(scrollState);
45 } 45 }
46 46
47 PassRefPtrWillBeRawPtr<ScrollState> ScrollState::create(PassOwnPtr<ScrollStateDa ta> data) 47 RawPtr<ScrollState> ScrollState::create(PassOwnPtr<ScrollStateData> data)
48 { 48 {
49 ScrollState* scrollState = new ScrollState(data); 49 ScrollState* scrollState = new ScrollState(data);
50 return adoptRefWillBeNoop(scrollState); 50 return adoptRefWillBeNoop(scrollState);
51 } 51 }
52 52
53 ScrollState::ScrollState(PassOwnPtr<ScrollStateData> data) 53 ScrollState::ScrollState(PassOwnPtr<ScrollStateData> data)
54 : m_data(data) 54 : m_data(data)
55 { 55 {
56 } 56 }
57 57
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 { 102 {
103 m_data->set_current_native_scrolling_element(DOMNodeIds::idForNode(element)) ; 103 m_data->set_current_native_scrolling_element(DOMNodeIds::idForNode(element)) ;
104 } 104 }
105 105
106 void ScrollState::setCurrentNativeScrollingElementById(int elementId) 106 void ScrollState::setCurrentNativeScrollingElementById(int elementId)
107 { 107 {
108 m_data->set_current_native_scrolling_element(elementId); 108 m_data->set_current_native_scrolling_element(elementId);
109 } 109 }
110 110
111 } // namespace blink 111 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698