diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderIFrame.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderIFrame.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderIFrame.cpp b/Source/WebCore/rendering/RenderIFrame.cpp index 01b8a17..1468acd 100644 --- a/Source/WebCore/rendering/RenderIFrame.cpp +++ b/Source/WebCore/rendering/RenderIFrame.cpp @@ -124,6 +124,7 @@ void RenderIFrame::layout() setNeedsLayout(false); } +<<<<<<< HEAD #if USE(ACCELERATED_COMPOSITING) bool RenderIFrame::requiresLayer() const { @@ -156,4 +157,6 @@ bool RenderIFrame::requiresAcceleratedCompositing() const } #endif +======= +>>>>>>> WebKit.org at r84325 } |