summaryrefslogtreecommitdiffstats
path: root/WebCore/page/FrameView.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-05-21 16:53:46 +0100
committerKristian Monsen <kristianm@google.com>2010-05-25 10:24:15 +0100
commit6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch)
treef7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/page/FrameView.h
parenta149172322a9067c14e8b474a53e63649aa17cad (diff)
downloadexternal_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip
external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz
external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/page/FrameView.h')
-rw-r--r--WebCore/page/FrameView.h3
1 files changed, 3 insertions, 0 deletions
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();