commit 7cf60fb0ef69889afdae5f423bd3cdd9123130e2
author wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jul 17 23:43:12 2020 +0000
committer wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jul 17 23:43:12 2020 +0000
tree 41ef3a77259c1d0ba260905d8c262a7d83a95215
parent 12e46b08adcba7e869b07d9a2dd4a5a148a0d6f3

Followup to r264531
https://bugs.webkit.org/show_bug.cgi?id=214488
<rdar://problem/64531754>

Reviewed by Darin Adler.

Source/WebCore:

Elide a null check by grabbing `RenderStyle` from the renderer instead of the element, and also limit
overflow hidden to the X axis.

* editing/TextManipulationController.cpp:
(WebCore::TextManipulationController::completeManipulation):

Tools:

See WebCore ChangeLog for more details.

* TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:

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

Source/WebCore/editing/TextManipulationController.cpp

diff --git a/Source/WebCore/editing/TextManipulationController.cpp b/Source/WebCore/editing/TextManipulationController.cpp
index 243b527..03a9d82 100644
--- a/Source/WebCore/editing/TextManipulationController.cpp
+++ b/Source/WebCore/editing/TextManipulationController.cpp
@@ -641,9 +641,11 @@
             if (!box || !box->hasVisualOverflow())
                 continue;
 
-            auto* style = element.renderStyle();
-            if (style && style->width().isFixed() && style->height().isFixed() && !style->hasOutOfFlowPosition() && !style->hasClip())
-                element.setInlineStyleProperty(CSSPropertyOverflow, CSSValueHidden);
+            auto& style = box->style();
+            if (style.width().isFixed() && style.height().isFixed() && !style.hasOutOfFlowPosition() && !style.hasClip()) {
+                element.setInlineStyleProperty(CSSPropertyOverflowX, CSSValueHidden);
+                element.setInlineStyleProperty(CSSPropertyOverflowY, CSSValueAuto);
+            }
         }
     }