[LFC][Integration] Build and enable on Windows
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jan 2020 21:20:26 +0000 (21:20 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jan 2020 21:20:26 +0000 (21:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=206165

Reviewed by Darin Adler.

.:

Enable LFC for Windows.

* Source/cmake/OptionsWin.cmake:

Source/WebCore:

Fix minor compilation issues in LFC when using MSVC.

* layout/inlineformatting/LineLayoutContext.cpp:
(WebCore::Layout::LineLayoutContext::close):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@255273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp
Source/cmake/OptionsWin.cmake

index 297ed4e..fcbff5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-28  Don Olmstead  <don.olmstead@sony.com>
+
+        [LFC][Integration] Build and enable on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=206165
+
+        Reviewed by Darin Adler.
+
+        Enable LFC for Windows.
+
+        * Source/cmake/OptionsWin.cmake:
+
 2020-01-24  Sergio Villar Senin  <svillar@igalia.com>
 
         Remove WebVR from the tree
index caada5e..967c0aa 100644 (file)
@@ -1,3 +1,15 @@
+2020-01-28  Don Olmstead  <don.olmstead@sony.com>
+
+        [LFC][Integration] Build and enable on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=206165
+
+        Reviewed by Darin Adler.
+
+        Fix minor compilation issues in LFC when using MSVC.
+
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        (WebCore::Layout::LineLayoutContext::close):
+
 2020-01-28  Brent Fulgham  <bfulgham@apple.com>
 
         Reset the application bundle identifier between test runs
index bcd137c..4deb979 100644 (file)
@@ -316,7 +316,7 @@ LineLayoutContext::LineContent LineLayoutContext::close(LineBuilder& line, const
     else
         m_successiveHyphenatedLineCount = 0;
 
-    auto trailingInlineItemIndex = layoutRange.start + committedInlineItemCount - 1;
+    unsigned trailingInlineItemIndex = layoutRange.start + committedInlineItemCount - 1;
     ASSERT(trailingInlineItemIndex < layoutRange.end);
     auto isLastLineWithInlineContent = [&] {
         if (trailingInlineItemIndex == layoutRange.end - 1)
index 935a7fd..bca9670 100644 (file)
@@ -84,6 +84,7 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})