Title: [147713] trunk/Source/WebCore
- Revision
- 147713
- Author
- [email protected]
- Date
- 2013-04-04 23:46:48 -0700 (Thu, 04 Apr 2013)
Log Message
WinCairo build fails to link.
https://bugs.webkit.org/show_bug.cgi?id=113873
Patch by [email protected] <[email protected]> on 2013-04-04
Reviewed by Brent Fulgham.
Removed double guards for USE(ACCELERATED_COMPOSITING),
and moved methods out of USE(ACCELERATED_COMPOSITING) guard to fix linker errors.
* page/FrameView.cpp:
(WebCore::FrameView::setWantsLayerForTopOverHangArea):
(WebCore::FrameView::setWantsLayerForBottomOverHangArea):
(WebCore::FrameView::setWantsLayerForHeader):
(WebCore::FrameView::setWantsLayerForFooter):
(WebCore::FrameView::setHeaderHeight):
(WebCore::FrameView::setFooterHeight):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147712 => 147713)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 06:39:48 UTC (rev 147712)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 06:46:48 UTC (rev 147713)
@@ -1,3 +1,21 @@
+2013-04-04 [email protected] <[email protected]>
+
+ WinCairo build fails to link.
+ https://bugs.webkit.org/show_bug.cgi?id=113873
+
+ Reviewed by Brent Fulgham.
+
+ Removed double guards for USE(ACCELERATED_COMPOSITING),
+ and moved methods out of USE(ACCELERATED_COMPOSITING) guard to fix linker errors.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setWantsLayerForTopOverHangArea):
+ (WebCore::FrameView::setWantsLayerForBottomOverHangArea):
+ (WebCore::FrameView::setWantsLayerForHeader):
+ (WebCore::FrameView::setWantsLayerForFooter):
+ (WebCore::FrameView::setHeaderHeight):
+ (WebCore::FrameView::setFooterHeight):
+
2013-04-04 Ryosuke Niwa <[email protected]>
Remove code for 10.5 and earlier from Source/WebCore
Modified: trunk/Source/WebCore/page/FrameView.cpp (147712 => 147713)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-04-05 06:39:48 UTC (rev 147712)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-04-05 06:46:48 UTC (rev 147713)
@@ -867,11 +867,7 @@
if (!renderView)
return 0;
-#if USE(ACCELERATED_COMPOSITING)
return renderView->compositor()->updateLayerForTopOverhangArea(wantsLayer);
-#else
- return 0;
-#endif
}
GraphicsLayer* FrameView::setWantsLayerForBottomOverHangArea(bool wantsLayer) const
@@ -880,11 +876,7 @@
if (!renderView)
return 0;
-#if USE(ACCELERATED_COMPOSITING)
return renderView->compositor()->updateLayerForBottomOverhangArea(wantsLayer);
-#else
- return 0;
-#endif
}
GraphicsLayer* FrameView::setWantsLayerForHeader(bool wantsLayer) const
@@ -895,11 +887,7 @@
ASSERT(m_frame == m_frame->page()->mainFrame());
-#if USE(ACCELERATED_COMPOSITING)
return renderView->compositor()->updateLayerForHeader(wantsLayer);
-#else
- return 0;
-#endif
}
GraphicsLayer* FrameView::setWantsLayerForFooter(bool wantsLayer) const
@@ -910,29 +898,11 @@
ASSERT(m_frame == m_frame->page()->mainFrame());
-#if USE(ACCELERATED_COMPOSITING)
return renderView->compositor()->updateLayerForFooter(wantsLayer);
-#else
- return 0;
-#endif
}
-#endif
+#endif // ENABLE(RUBBER_BANDING)
-void FrameView::setHeaderHeight(int headerHeight)
-{
- if (m_frame && m_frame->page())
- ASSERT(m_frame == m_frame->page()->mainFrame());
- m_headerHeight = headerHeight;
-}
-
-void FrameView::setFooterHeight(int footerHeight)
-{
- if (m_frame && m_frame->page())
- ASSERT(m_frame == m_frame->page()->mainFrame());
- m_footerHeight = footerHeight;
-}
-
bool FrameView::flushCompositingStateForThisFrame(Frame* rootFrameForFlush)
{
RenderView* renderView = this->renderView();
@@ -964,6 +934,20 @@
#endif // USE(ACCELERATED_COMPOSITING)
+void FrameView::setHeaderHeight(int headerHeight)
+{
+ if (m_frame && m_frame->page())
+ ASSERT(m_frame == m_frame->page()->mainFrame());
+ m_headerHeight = headerHeight;
+}
+
+void FrameView::setFooterHeight(int footerHeight)
+{
+ if (m_frame && m_frame->page())
+ ASSERT(m_frame == m_frame->page()->mainFrame());
+ m_footerHeight = footerHeight;
+}
+
bool FrameView::hasCompositedContent() const
{
#if USE(ACCELERATED_COMPOSITING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
