Index: webkit/compositor_bindings/WebLayerImpl.cpp |
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp |
index df3f430c49b8290eeb54907744fb2f1a9290083b..e3bda86606e4124f4ce293170704f2db18d0f51f 100644 |
--- a/webkit/compositor_bindings/WebLayerImpl.cpp |
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp |
@@ -348,21 +348,41 @@ void WebLayerImpl::setMaxScrollPosition(WebSize maxScrollPosition) |
m_layer->setMaxScrollPosition(convert(maxScrollPosition)); |
} |
+WebSize WebLayerImpl::maxScrollPosition() const |
+{ |
+ return convert(m_layer->maxScrollPosition()); |
+} |
+ |
void WebLayerImpl::setScrollable(bool scrollable) |
{ |
m_layer->setScrollable(scrollable); |
} |
+bool WebLayerImpl::scrollable() const |
+{ |
+ return m_layer->scrollable(); |
+} |
+ |
void WebLayerImpl::setHaveWheelEventHandlers(bool haveWheelEventHandlers) |
{ |
m_layer->setHaveWheelEventHandlers(haveWheelEventHandlers); |
} |
+bool WebLayerImpl::haveWheelEventHandlers() const |
+{ |
+ return m_layer->haveWheelEventHandlers(); |
+} |
+ |
void WebLayerImpl::setShouldScrollOnMainThread(bool shouldScrollOnMainThread) |
{ |
m_layer->setShouldScrollOnMainThread(shouldScrollOnMainThread); |
} |
+bool WebLayerImpl::shouldScrollOnMainThread() const |
+{ |
+ return m_layer->shouldScrollOnMainThread(); |
+} |
+ |
void WebLayerImpl::setNonFastScrollableRegion(const WebVector<WebRect>& rects) |
{ |
WebCore::Region region; |
@@ -374,16 +394,35 @@ void WebLayerImpl::setNonFastScrollableRegion(const WebVector<WebRect>& rects) |
} |
+WebVector<WebRect> WebLayerImpl::nonFastScrollableRegion() const |
+{ |
+ Vector<WebCore::IntRect> regionRects = m_layer->nonFastScrollableRegion().rects(); |
+ WebVector<WebRect> result(regionRects.size()); |
+ for (size_t i = 0; i < regionRects.size(); ++i) |
+ result[i] = convert(regionRects[i]); |
+ return result; |
+} |
+ |
void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) |
{ |
m_layer->setIsContainerForFixedPositionLayers(enable); |
} |
+bool WebLayerImpl::isContainerForFixedPositionLayers() const |
+{ |
+ return m_layer->isContainerForFixedPositionLayers(); |
+} |
+ |
void WebLayerImpl::setFixedToContainerLayer(bool enable) |
{ |
m_layer->setFixedToContainerLayer(enable); |
} |
+bool WebLayerImpl::fixedToContainerLayer() const |
+{ |
+ return m_layer->fixedToContainerLayer(); |
+} |
+ |
void WebLayerImpl::setScrollClient(WebLayerScrollClient* scrollClient) |
{ |
m_layer->setLayerScrollClient(scrollClient); |