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

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollState.h

Issue 2881423004: Stop retrieving scrolling element id from the CompositorElementId. (Closed)
Patch Set: Merge branch 'master' into scrollstate Created 3 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/scrolling/ScrollState.h
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollState.h b/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
index 503e36d641b3672bbe4a27ca4d3b104e275665dd..d9d893931269f3ef5c8a72e73cf7f12586e3e405 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollState.h
@@ -9,6 +9,7 @@
#include <memory>
#include "bindings/core/v8/ExceptionState.h"
#include "core/CoreExport.h"
+#include "core/dom/Element.h"
#include "core/page/scrolling/ScrollStateInit.h"
#include "platform/bindings/ScriptWrappable.h"
#include "platform/scroll/ScrollStateData.h"
@@ -71,11 +72,9 @@ class CORE_EXPORT ScrollState final
scroll_chain_ = scroll_chain;
}
- Element* CurrentNativeScrollingElement() const;
+ Element* CurrentNativeScrollingElement();
void SetCurrentNativeScrollingElement(Element*);
- void SetCurrentNativeScrollingElementById(int element_id);
-
bool DeltaConsumedForScrollSequence() const {
return data_->delta_consumed_for_scroll_sequence;
}
@@ -89,7 +88,7 @@ class CORE_EXPORT ScrollState final
ScrollStateData* Data() const { return data_.get(); }
- DEFINE_INLINE_TRACE() {}
+ DEFINE_INLINE_TRACE() { visitor->Trace(element_); }
private:
ScrollState();
@@ -97,6 +96,7 @@ class CORE_EXPORT ScrollState final
std::unique_ptr<ScrollStateData> data_;
std::deque<int> scroll_chain_;
+ Member<Element> element_;
};
} // namespace blink
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698