diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/page/FrameView.h | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/page/FrameView.h')
| -rw-r--r-- | WebCore/page/FrameView.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h index cbd0cb9..efceebe 100644 --- a/WebCore/page/FrameView.h +++ b/WebCore/page/FrameView.h @@ -104,6 +104,9 @@ public: // content rendered via the normal painting path. void setNeedsOneShotDrawingSynchronization(); #endif + + bool isEnclosedInCompositingLayer() const; + // Only used with accelerated compositing, but outside the #ifdef to make linkage easier. // Returns true if the sync was completed. bool syncCompositingStateRecursive(); @@ -137,9 +140,8 @@ public: virtual IntRect windowResizerRect() const; - virtual void scrollRectIntoViewRecursively(const IntRect&); - virtual void setScrollPosition(const IntPoint&); - void scrollPositionChanged(); + void setScrollPosition(const IntPoint&); + virtual void scrollPositionChanged(); String mediaType() const; void setMediaType(const String&); |