diff options
Diffstat (limited to 'Source/WebCore/page/FrameView.h')
| -rw-r--r-- | Source/WebCore/page/FrameView.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h index c75aab8..e61099e 100644 --- a/Source/WebCore/page/FrameView.h +++ b/Source/WebCore/page/FrameView.h @@ -100,13 +100,8 @@ public: bool needsFullRepaint() const { return m_doFullRepaint; } -<<<<<<< HEAD -#if PLATFORM(ANDROID) - void updatePositionedObjects(); -======= #if ENABLE(REQUEST_ANIMATION_FRAME) void serviceScriptedAnimations(); ->>>>>>> WebKit.org at r76408 #endif #if USE(ACCELERATED_COMPOSITING) @@ -121,6 +116,10 @@ public: bool hasOverflowScroll() const { return m_hasOverflowScroll; } #endif +#if PLATFORM(ANDROID) + void updatePositionedObjects(); +#endif + bool hasCompositedContent() const; bool hasCompositedContentIncludingDescendants() const; bool hasCompositingAncestor() const; |