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

Unified Diff: cc/blink/web_layer_impl.cc

Issue 784463002: Add initial CC support for scroll-blocks-on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with trunk Created 5 years, 11 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
Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index 6ce8ac5cbcdcc16424a6b5a1591f859744a5d56a..b54d6258e0d80d19dcd2c48fc9ab7137b0968571 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -383,6 +383,30 @@ WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const {
return result;
}
+COMPILE_ASSERT(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnNone) ==
+ ScrollBlocksOnNone,
+ ScrollBlocksOn_enum_mismatch);
+COMPILE_ASSERT(
+ static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnStartTouch) ==
+ ScrollBlocksOnStartTouch,
+ ScrollBlocksOn_enum_mismatch);
+COMPILE_ASSERT(
+ static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnWheelEvent) ==
+ ScrollBlocksOnWheelEvent,
+ ScrollBlocksOn_enum_mismatch);
+COMPILE_ASSERT(
+ static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnScrollEvent) ==
+ ScrollBlocksOnScrollEvent,
+ ScrollBlocksOn_enum_mismatch);
+
+void WebLayerImpl::setScrollBlocksOn(blink::WebScrollBlocksOn blocks) {
+ layer_->SetScrollBlocksOn(static_cast<ScrollBlocksOn>(blocks));
+}
+
+blink::WebScrollBlocksOn WebLayerImpl::scrollBlocksOn() const {
+ return static_cast<blink::WebScrollBlocksOn>(layer_->scroll_blocks_on());
+}
+
void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) {
layer_->SetIsContainerForFixedPositionLayers(enable);
}
« no previous file with comments | « cc/blink/web_layer_impl.h ('k') | cc/input/input_handler.h » ('j') | cc/input/input_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698