Changeset 185398 in webkit

Timestamp:

Jun 9, 2015, 5:57:30 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
​https://bugs.webkit.org/show_bug.cgi?id=145830

Reviewed by Darin Adler.

Source/WebCore:

The bug was caused by setSelection not updating RenderView when there is a style recalc scheduled
that doesn't trigger a layout. Fixed the bug by explicitly updating the selection in
Document::recalcStyle in that case.

Test: editing/selection/update-selection-by-style-change.html

• dom/Document.cpp:

(WebCore::Document::recalcStyle):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::updateAppearanceAfterLayout): Renamed from didLayout.

• editing/FrameSelection.h:
• page/FrameView.cpp:

(WebCore::FrameView::performPostLayoutTasks):

LayoutTests:

Added a regression test.

• editing/selection/update-selection-by-style-change-expected.html: Added.
• editing/selection/update-selection-by-style-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/update-selection-by-style-change-expected.html (added)
• LayoutTests/editing/selection/update-selection-by-style-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.cpp (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.h (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
+        https://bugs.webkit.org/show_bug.cgi?id=145830
+
+        Reviewed by Darin Adler.
+
+        Added a regression test.
+
+        * editing/selection/update-selection-by-style-change-expected.html: Added.
+        * editing/selection/update-selection-by-style-change.html: Added.
+
 2015-06-09  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r180867): Tabbing to login field on iCloud.com doesn't have highlight for text
+        https://bugs.webkit.org/show_bug.cgi?id=145830
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by setSelection not updating RenderView when there is a style recalc scheduled
+        that doesn't trigger a layout. Fixed the bug by explicitly updating the selection in
+        Document::recalcStyle in that case.
+
+        Test: editing/selection/update-selection-by-style-change.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::updateAppearanceAfterLayout): Renamed from didLayout.
+        * editing/FrameSelection.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks):
+
 2015-06-09  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1812 +1812 @@
         frameView.viewportContentsChanged();
 
+    if (!frameView.needsLayout())
+        frameView.frame().selection().updateAppearanceAfterLayout();
+
     // As a result of the style recalculation, the currently hovered element might have been
     // detached (for example, by setting display:none in the :hover style), schedule another mouseMove event

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -2223 +2223 @@
 }
 
-void FrameSelection::didLayout()
+void FrameSelection::updateAppearanceAfterLayout()
 {
     setCaretRectNeedsUpdate();

trunk/Source/WebCore/editing/FrameSelection.h

@@ -152 +152 @@
     void prepareForDestruction();
 
-    void didLayout();
+    void updateAppearanceAfterLayout();
     void setNeedsSelectionUpdate();
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2984 +2984 @@
     m_postLayoutTasksTimer.stop();
 
-    frame().selection().didLayout();
+    frame().selection().updateAppearanceAfterLayout();
 
     if (m_nestedLayoutCount <= 1 && frame().document()->documentElement())