Title: [268329] trunk/Source/WebCore
- Revision
- 268329
- Author
- commit-qu...@webkit.org
- Date
- 2020-10-11 17:39:22 -0700 (Sun, 11 Oct 2020)
Log Message
Build failures and warning under Source/WebCore/layout/integration/
https://bugs.webkit.org/show_bug.cgi?id=217593
Unreviewed, fix two build failures caused by missing #includes. (Forward declarations are
not enough here, we need to #include the necessary header.)
Also, fix an unused function warning when LFC is not enabled.
Patch by Michael Catanzaro <mcatanz...@gnome.org> on 2020-10-11
* layout/integration/LayoutIntegrationLineIterator.cpp:
* layout/integration/LayoutIntegrationLineIteratorLegacyPath.h:
* layout/integration/LayoutIntegrationRunIterator.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268328 => 268329)
--- trunk/Source/WebCore/ChangeLog 2020-10-12 00:16:53 UTC (rev 268328)
+++ trunk/Source/WebCore/ChangeLog 2020-10-12 00:39:22 UTC (rev 268329)
@@ -1,3 +1,17 @@
+2020-10-11 Michael Catanzaro <mcatanz...@gnome.org>
+
+ Build failures and warning under Source/WebCore/layout/integration/
+ https://bugs.webkit.org/show_bug.cgi?id=217593
+
+ Unreviewed, fix two build failures caused by missing #includes. (Forward declarations are
+ not enough here, we need to #include the necessary header.)
+
+ Also, fix an unused function warning when LFC is not enabled.
+
+ * layout/integration/LayoutIntegrationLineIterator.cpp:
+ * layout/integration/LayoutIntegrationLineIteratorLegacyPath.h:
+ * layout/integration/LayoutIntegrationRunIterator.cpp:
+
2020-10-11 Luming Yin <luming_...@apple.com>
Ignore deployment suffix and identifier when computing major OS version for macOS
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIterator.cpp (268328 => 268329)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIterator.cpp 2020-10-12 00:16:53 UTC (rev 268328)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIterator.cpp 2020-10-12 00:39:22 UTC (rev 268329)
@@ -27,6 +27,7 @@
#include "LayoutIntegrationLineIterator.h"
#include "LayoutIntegrationLineLayout.h"
+#include "LayoutIntegrationRunIterator.h"
namespace WebCore {
namespace LayoutIntegration {
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorLegacyPath.h (268328 => 268329)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorLegacyPath.h 2020-10-12 00:16:53 UTC (rev 268328)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorLegacyPath.h 2020-10-12 00:39:22 UTC (rev 268329)
@@ -26,6 +26,7 @@
#pragma once
#include "LayoutIntegrationInlineContent.h"
+#include "LayoutIntegrationRunIteratorLegacyPath.h"
#include "RootInlineBox.h"
namespace WebCore {
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.cpp (268328 => 268329)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.cpp 2020-10-12 00:16:53 UTC (rev 268328)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.cpp 2020-10-12 00:39:22 UTC (rev 268329)
@@ -160,6 +160,7 @@
return *this;
}
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
static const RenderBlockFlow* lineLayoutSystemFlowForRenderer(const RenderObject& renderer)
{
// In currently supported cases the renderer is always direct child of the flow.
@@ -167,6 +168,7 @@
return nullptr;
return downcast<RenderBlockFlow>(renderer.parent());
}
+#endif
TextRunIterator firstTextRunFor(const RenderText& text)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
