From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebCore/page/FrameView.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebCore/page/FrameView.h')

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index efceebe..6bd1c21 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -105,6 +105,8 @@ public:
     void setNeedsOneShotDrawingSynchronization();
 #endif
 
+    bool hasCompositedContent() const;
+    void enterCompositingMode();
     bool isEnclosedInCompositingLayer() const;
 
     // Only used with accelerated compositing, but outside the #ifdef to make linkage easier.
@@ -149,6 +151,7 @@ public:
 
     void setUseSlowRepaints();
     void setIsOverlapped(bool);
+    bool isOverlapped() const { return m_isOverlapped; }
     void setContentIsOpaque(bool);
 
     void addSlowRepaintObject();
-- 
cgit v1.1