[webkit-changes] [285120] trunk

Mon, 01 Nov 2021 12:23:39 -0700

Title: [285120] trunk
Revision
285120
Author
drou...@apple.com
Date
2021-11-01 12:22:52 -0700 (Mon, 01 Nov 2021)

Log Message

[ iOS15 EWS ] TestWebKitAPI.CSSViewportUnits.SameUnobscuredSizeOverrides flaky fails on EWS
https://bugs.webkit.org/show_bug.cgi?id=232158
<rdar://problem/84555218>

Reviewed by Megan Gardner.

Source/WebCore:

Tests: CSSViewportUnits.AllSame
       CSSViewportUnits.EmptyUnobscuredSizeOverrides
       CSSViewportUnits.SameUnobscuredSizeOverrides
       CSSViewportUnits.DifferentUnobscuredSizeOverrides

* page/FrameView.cpp:
(WebCore::FrameView::sizeForCSSDynamicViewportUnits const):
This should use `unobscuredContentRectIncludingScrollbars` to match `DOMWindow::inner{width,height}`.
I think I accidentally left in the old code when I was testing some other configurations
while working on r284628.

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/CSSViewportUnits.mm:
(TEST.CSSViewportUnits.AllSame):
(TEST.CSSViewportUnits.EmptyUnobscuredSizeOverrides):
(TEST.CSSViewportUnits.SameUnobscuredSizeOverrides):
(TEST.CSSViewportUnits.DifferentUnobscuredSizeOverrides):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (285119 => 285120)


--- trunk/Source/WebCore/ChangeLog	2021-11-01 19:22:20 UTC (rev 285119)
+++ trunk/Source/WebCore/ChangeLog	2021-11-01 19:22:52 UTC (rev 285120)
@@ -1,3 +1,22 @@
+2021-11-01  Devin Rousso  <drou...@apple.com>
+
+        [ iOS15 EWS ] TestWebKitAPI.CSSViewportUnits.SameUnobscuredSizeOverrides flaky fails on EWS
+        https://bugs.webkit.org/show_bug.cgi?id=232158
+        <rdar://problem/84555218>
+
+        Reviewed by Megan Gardner.
+
+        Tests: CSSViewportUnits.AllSame
+               CSSViewportUnits.EmptyUnobscuredSizeOverrides
+               CSSViewportUnits.SameUnobscuredSizeOverrides
+               CSSViewportUnits.DifferentUnobscuredSizeOverrides
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::sizeForCSSDynamicViewportUnits const):
+        This should use `unobscuredContentRectIncludingScrollbars` to match `DOMWindow::inner{width,height}`.
+        I think I accidentally left in the old code when I was testing some other configurations
+        while working on r284628.
+
 2021-11-01  Alan Bujtas  <za...@apple.com>
 
         [LFC][IFC] Start using ubidi to find bidi boundaries

Modified: trunk/Source/WebCore/page/FrameView.cpp (285119 => 285120)


--- trunk/Source/WebCore/page/FrameView.cpp	2021-11-01 19:22:20 UTC (rev 285119)
+++ trunk/Source/WebCore/page/FrameView.cpp	2021-11-01 19:22:52 UTC (rev 285120)
@@ -5666,7 +5666,7 @@
 
 IntSize FrameView::sizeForCSSDynamicViewportUnits() const
 {
-    return visibleContentRectIncludingScrollbars().size();
+    return unobscuredContentRectIncludingScrollbars().size();
 }
 
 IntSize FrameView::sizeForCSSDefaultViewportUnits() const

Modified: trunk/Tools/ChangeLog (285119 => 285120)


--- trunk/Tools/ChangeLog	2021-11-01 19:22:20 UTC (rev 285119)
+++ trunk/Tools/ChangeLog	2021-11-01 19:22:52 UTC (rev 285120)
@@ -1,3 +1,17 @@
+2021-11-01  Devin Rousso  <drou...@apple.com>
+
+        [ iOS15 EWS ] TestWebKitAPI.CSSViewportUnits.SameUnobscuredSizeOverrides flaky fails on EWS
+        https://bugs.webkit.org/show_bug.cgi?id=232158
+        <rdar://problem/84555218>
+
+        Reviewed by Megan Gardner.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/CSSViewportUnits.mm:
+        (TEST.CSSViewportUnits.AllSame):
+        (TEST.CSSViewportUnits.EmptyUnobscuredSizeOverrides):
+        (TEST.CSSViewportUnits.SameUnobscuredSizeOverrides):
+        (TEST.CSSViewportUnits.DifferentUnobscuredSizeOverrides):
+
 2021-11-01  Simon Fraser  <simon.fra...@apple.com>
 
         ImageDiff no longer needs a --tolerance argument, and fix sometimes-black diff images

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CSSViewportUnits.mm (285119 => 285120)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CSSViewportUnits.mm	2021-11-01 19:22:20 UTC (rev 285119)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CSSViewportUnits.mm	2021-11-01 19:22:52 UTC (rev 285120)
@@ -60,12 +60,10 @@
     EXPECT_EQ(320, getElementHeight(webView.get(), @"lvmin"));
     EXPECT_EQ(500, getElementHeight(webView.get(), @"lvmax"));
 
-    int innerWidth = evaluateForInt(webView.get(), @"window.innerWidth");
-    int innerHeight = evaluateForInt(webView.get(), @"window.innerHeight");
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvw"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvh"));
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvmin"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvmax"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvw"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvh"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvmin"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvmax"));
 }
 
 #if PLATFORM(IOS_FAMILY)
@@ -92,12 +90,10 @@
     EXPECT_EQ(10, getElementHeight(webView.get(), @"lvmin"));
     EXPECT_EQ(20, getElementHeight(webView.get(), @"lvmax"));
 
-    int innerWidth = evaluateForInt(webView.get(), @"window.innerWidth");
-    int innerHeight = evaluateForInt(webView.get(), @"window.innerHeight");
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvw"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvh"));
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvmin"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvmax"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvw"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvh"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvmin"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvmax"));
 }
 
 TEST(CSSViewportUnits, SameUnobscuredSizeOverrides)
@@ -122,12 +118,10 @@
     EXPECT_EQ(10, getElementHeight(webView.get(), @"lvmin"));
     EXPECT_EQ(20, getElementHeight(webView.get(), @"lvmax"));
 
-    int innerWidth = evaluateForInt(webView.get(), @"window.innerWidth");
-    int innerHeight = evaluateForInt(webView.get(), @"window.innerHeight");
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvw"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvh"));
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvmin"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvmax"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvw"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvh"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvmin"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvmax"));
 }
 
 TEST(CSSViewportUnits, DifferentUnobscuredSizeOverrides)
@@ -152,12 +146,10 @@
     EXPECT_EQ(30, getElementHeight(webView.get(), @"lvmin"));
     EXPECT_EQ(40, getElementHeight(webView.get(), @"lvmax"));
 
-    int innerWidth = evaluateForInt(webView.get(), @"window.innerWidth");
-    int innerHeight = evaluateForInt(webView.get(), @"window.innerHeight");
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvw"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvh"));
-    EXPECT_EQ(innerWidth, getElementHeight(webView.get(), @"dvmin"));
-    EXPECT_EQ(innerHeight, getElementHeight(webView.get(), @"dvmax"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvw"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvh"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerWidth"), getElementHeight(webView.get(), @"dvmin"));
+    EXPECT_EQ(evaluateForInt(webView.get(), @"window.innerHeight"), getElementHeight(webView.get(), @"dvmax"));
 }
 
 #endif // PLATFORM(IOS_FAMILY)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to