Changeset 259578 in webkit

Timestamp:

Apr 6, 2020, 10:47:38 AM (6 years ago)

Author:

cathiechen

Message:

The change of zoom shouldn't affect ResizeObserverSize
​https://bugs.webkit.org/show_bug.cgi?id=209947

Reviewed by Simon Fraser.

Source/WebCore:

Zoom in/out shouldn't affect ResizeObserverSize. Use adjustLayoutUnitForAbsoluteZoom instead.

Test: imported/w3c/web-platform-tests/resize-observer/resize-observer-with-zoom.html

• page/ResizeObservation.cpp:

(WebCore::ResizeObservation::computeObservedSize const):

LayoutTests:

Add test for resizeObserver with zoom. The ResizeObserverSize shouldn't be effected by zooms.

• resize-observer/resize-observer-with-zoom-expected.txt: Added.
• resize-observer/resize-observer-with-zoom.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/resize-observer/resize-observer-with-zoom-expected.txt (added)
• LayoutTests/resize-observer/resize-observer-with-zoom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/ResizeObservation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-06  Cathie Chen  <cathiechen@igalia.com>
+
+        The change of zoom shouldn't affect ResizeObserverSize
+        https://bugs.webkit.org/show_bug.cgi?id=209947
+
+        Reviewed by Simon Fraser.
+
+        Add test for resizeObserver with zoom. The ResizeObserverSize shouldn't be effected by zooms.
+
+        * resize-observer/resize-observer-with-zoom-expected.txt: Added.
+        * resize-observer/resize-observer-with-zoom.html: Added.
+
 2020-04-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-06  Cathie Chen  <cathiechen@igalia.com>
+
+        The change of zoom shouldn't affect ResizeObserverSize
+        https://bugs.webkit.org/show_bug.cgi?id=209947
+
+        Reviewed by Simon Fraser.
+
+        Zoom in/out shouldn't affect ResizeObserverSize. Use adjustLayoutUnitForAbsoluteZoom instead.
+
+        Test: imported/w3c/web-platform-tests/resize-observer/resize-observer-with-zoom.html
+
+        * page/ResizeObservation.cpp:
+        (WebCore::ResizeObservation::computeObservedSize const):
+
 2020-04-06  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/page/ResizeObservation.cpp

@@ -61 +61 @@
             return LayoutSize(svgRect.width(), svgRect.height());
     }
-    if (m_target->renderBox())
-        return m_target->renderBox()->contentSize();
+    auto* box = m_target->renderBox();
+    if (box) {
+        auto contentSize = box->contentSize();
+        return LayoutSize(adjustLayoutUnitForAbsoluteZoom(contentSize.width(), *box), adjustLayoutUnitForAbsoluteZoom(contentSize.height(), *box));
+    }
+
     return LayoutSize();
 }