Title: [218556] releases/WebKitGTK/webkit-2.16/Source/WebCore
Revision
218556
Author
[email protected]
Date
2017-06-20 00:35:33 -0700 (Tue, 20 Jun 2017)

Log Message

Merge r217589 - Fixed the build after r217588.

* page/FrameView.h: Stopped exporting a function defined inline.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (218555 => 218556)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-06-20 07:35:25 UTC (rev 218555)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-06-20 07:35:33 UTC (rev 218556)
@@ -1,3 +1,9 @@
+2017-05-30  Dan Bernstein  <[email protected]>
+
+        Fixed the build after r217588.
+
+        * page/FrameView.h: Stopped exporting a function defined inline.
+
 2017-05-30  Zalan Bujtas  <[email protected]>
 
         ASSERTION FAILED: m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.h (218555 => 218556)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.h	2017-06-20 07:35:25 UTC (rev 218555)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.h	2017-06-20 07:35:33 UTC (rev 218556)
@@ -114,7 +114,7 @@
     bool layoutPending() const;
     bool isInLayout() const { return m_layoutPhase != OutsideLayout; }
     bool isInRenderTreeLayout() const { return m_layoutPhase == InRenderTreeLayout; }
-    WEBCORE_EXPORT bool inPaintableState() { return m_layoutPhase != InRenderTreeLayout && m_layoutPhase != InViewSizeAdjust && m_layoutPhase != InPostLayout; }
+    bool inPaintableState() { return m_layoutPhase != InRenderTreeLayout && m_layoutPhase != InViewSizeAdjust && m_layoutPhase != InPostLayout; }
 
     RenderElement* layoutRoot() const { return m_layoutRoot; }
     void clearLayoutRoot() { m_layoutRoot = nullptr; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to