Changeset 147713 in webkit

Timestamp:

Apr 4, 2013 11:46:48 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

WinCairo build fails to link.
​https://bugs.webkit.org/show_bug.cgi?id=113873

Patch by ​peavo@outlook.com <​peavo@outlook.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-04  peavo@outlook.com  <peavo@outlook.com>
+
+        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  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -868 +868 @@
         return 0;
 
-#if USE(ACCELERATED_COMPOSITING)
     return renderView->compositor()->updateLayerForTopOverhangArea(wantsLayer);
-#else
-    return 0;
-#endif
 }
 
@@ -881 +877 @@
         return 0;
 
-#if USE(ACCELERATED_COMPOSITING)
     return renderView->compositor()->updateLayerForBottomOverhangArea(wantsLayer);
-#else
-    return 0;
-#endif
 }
 
@@ -896 +888 @@
     ASSERT(m_frame == m_frame->page()->mainFrame());
 
-#if USE(ACCELERATED_COMPOSITING)
     return renderView->compositor()->updateLayerForHeader(wantsLayer);
-#else
-    return 0;
-#endif
 }
 
@@ -911 +899 @@
     ASSERT(m_frame == m_frame->page()->mainFrame());
 
-#if USE(ACCELERATED_COMPOSITING)
     return renderView->compositor()->updateLayerForFooter(wantsLayer);
-#else
-    return 0;
-#endif
-}
-
-#endif
-
-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;
-}
+}
+
+#endif // ENABLE(RUBBER_BANDING)
 
 bool FrameView::flushCompositingStateForThisFrame(Frame* rootFrameForFlush)
@@ -964 +934 @@
 
 #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