diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/rendering/RenderIFrame.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/rendering/RenderIFrame.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderIFrame.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/RenderIFrame.h b/Source/WebCore/rendering/RenderIFrame.h index 0bb3182..b6b30c9 100644 --- a/Source/WebCore/rendering/RenderIFrame.h +++ b/Source/WebCore/rendering/RenderIFrame.h @@ -34,19 +34,12 @@ class RenderIFrame : public RenderFrameBase { public: explicit RenderIFrame(Element*); -#if USE(ACCELERATED_COMPOSITING) - bool requiresAcceleratedCompositing() const; -#endif - private: virtual void computeLogicalHeight(); virtual void computeLogicalWidth(); virtual void layout(); -#if USE(ACCELERATED_COMPOSITING) - virtual bool requiresLayer() const; -#endif virtual bool isRenderIFrame() const { return true; } virtual const char* renderName() const { return "RenderPartObject"; } // Lying for now to avoid breaking tests |