summaryrefslogtreecommitdiff
path: root/Source/WebKit/blackberry/Api/InRegionScroller_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/blackberry/Api/InRegionScroller_p.h')
-rw-r--r--Source/WebKit/blackberry/Api/InRegionScroller_p.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit/blackberry/Api/InRegionScroller_p.h b/Source/WebKit/blackberry/Api/InRegionScroller_p.h
index d9e0ebab1..03140c7bf 100644
--- a/Source/WebKit/blackberry/Api/InRegionScroller_p.h
+++ b/Source/WebKit/blackberry/Api/InRegionScroller_p.h
@@ -42,12 +42,8 @@ class InRegionScrollerPrivate {
public:
InRegionScrollerPrivate(WebPagePrivate*);
- void setNode(WebCore::Node*);
- WebCore::Node* node() const;
void reset();
-
- bool canScroll() const;
- bool hasNode() const;
+ bool isActive() const;
bool setScrollPositionCompositingThread(unsigned camouflagedLayer, const WebCore::IntPoint& scrollPosition);
bool setScrollPositionWebKitThread(unsigned camouflagedLayer, const WebCore::IntPoint& scrollPosition, bool supportsAcceleratedScrolling);
@@ -55,16 +51,20 @@ public:
void calculateInRegionScrollableAreasForPoint(const WebCore::IntPoint&);
const std::vector<Platform::ScrollViewBase*>& activeInRegionScrollableAreas() const;
+ void clearDocumentData(const WebCore::Document*);
+
WebPagePrivate* m_webPage;
+ bool m_needsActiveScrollableAreaCalculation;
private:
bool setLayerScrollPosition(WebCore::RenderLayer*, const WebCore::IntPoint& scrollPosition);
+ void calculateActiveAndShrinkCachedScrollableAreas(WebCore::RenderLayer*);
+
void pushBackInRegionScrollable(InRegionScrollableArea*);
void adjustScrollDelta(const WebCore::IntPoint& maxOffset, const WebCore::IntPoint& currentOffset, WebCore::IntSize& delta) const;
- RefPtr<WebCore::Node> m_inRegionScrollStartingNode;
std::vector<Platform::ScrollViewBase*> m_activeInRegionScrollableAreas;
};