Commit 7efbfb3c authored by bdakin@apple.com's avatar bdakin@apple.com

Speculative Win Cairo build fix.

These need to be inside an ifdef.
* page/FrameView.cpp:
(WebCore::FrameView::hasExtendedBackground):
(WebCore::FrameView::extendedBackgroundRect):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f3a3a5f1
2014-01-16 Beth Dakin <bdakin@apple.com>
Speculative Win Cairo build fix.
These need to be inside an ifdef.
* page/FrameView.cpp:
(WebCore::FrameView::hasExtendedBackground):
(WebCore::FrameView::extendedBackgroundRect):
2014-01-07 Myles C. Maxfield <mmaxfield@apple.com>
text-emphasis-position CSS property doesn't recognize 'left' and 'right'
......@@ -2647,6 +2647,7 @@ void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t
bool FrameView::hasExtendedBackground() const
{
#if USE(ACCELERATED_COMPOSITING)
if (!frame().settings().backgroundShouldExtendBeyondPage())
return false;
......@@ -2655,15 +2656,26 @@ bool FrameView::hasExtendedBackground() const
return false;
return tiledBacking->hasMargins();
#else
return false;
#endif
}
IntRect FrameView::extendedBackgroundRect() const
{
#if USE(ACCELERATED_COMPOSITING)
TiledBacking* tiledBacking = this->tiledBacking();
if (!tiledBacking)
return IntRect();
return tiledBacking->bounds();
#else
RenderView* renderView = this->renderView();
if (!renderView)
return IntRect();
return renderView->backgroundRect();
#endif
}
bool FrameView::shouldUpdateWhileOffscreen() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment