Changeset 153727 in webkit

Timestamp:

Aug 5, 2013 3:11:04 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r153725. <rdar://problem/14637103>

Location:

branches/safari-537-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/editing/input/firstrectforcharacterrange-caret-in-br-expected.txt (copied) (copied from trunk/LayoutTests/platform/mac/editing/input/firstrectforcharacterrange-caret-in-br-expected.txt)
• LayoutTests/platform/mac/editing/input/firstrectforcharacterrange-caret-in-br.html (copied) (copied from trunk/LayoutTests/platform/mac/editing/input/firstrectforcharacterrange-caret-in-br.html)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)

branches/safari-537-branch/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-05  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r153725
+
+    2013-08-05  Alexey Proskuryakov  <ap@apple.com>
+
+            <rdar://problem/14637103> REGRESSION (r153060?): Microphone appears in the way
+            of text when dictating an e-mail
+            https://bugs.webkit.org/show_bug.cgi?id=119496
+
+            Reviewed by Ryosuke Niwa.
+
+            * platform/mac/editing/input/firstrectforcharacterrange-caret-in-br-expected.txt: Added.
+            * platform/mac/editing/input/firstrectforcharacterrange-caret-in-br.html: Added.
+
+            * platform/wk2/TestExpectations: textInputController.firstRectForCharacterRange is
+            not available in WTR.
+
 2013-08-05  Filip Pizlo  <fpizlo@apple.com>
 

branches/safari-537-branch/LayoutTests/platform/wk2/TestExpectations

@@ -126 +126 @@
 platform/mac/editing/input/bold-node.html
 platform/mac/editing/input/caret-primary-bidi.html
+platform/mac/editing/input/firstrectforcharacterrange-caret-in-br.html
 platform/mac/editing/input/firstrectforcharacterrange-plain.html
 platform/mac/editing/input/firstrectforcharacterrange-styled.html

branches/safari-537-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-05  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r153725
+
+    2013-08-05  Alexey Proskuryakov  <ap@apple.com>
+
+            <rdar://problem/14637103> REGRESSION (r153060?): Microphone appears in the way
+            of text when dictating an e-mail
+            https://bugs.webkit.org/show_bug.cgi?id=119496
+
+            Reviewed by Ryosuke Niwa.
+
+            Test: platform/mac/editing/input/firstrectforcharacterrange-caret-in-br.html
+
+            * rendering/RenderObject.cpp: (WebCore::RenderObject::absoluteBoundingBoxRectForRange):
+            FloatRect::unite() doesn't preserve empty rects, which we need here.
+            We alrady handle the case of collapsed range in Editor::firstRectForRange(), and
+            this is similar, but we can't currently cover both with one simple fix.
+
 2013-08-05  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537-branch/Source/WebCore/rendering/RenderObject.cpp

@@ -1240 +1240 @@
     range->textQuads(quads);
 
-    FloatRect result;
-    for (size_t i = 0; i < quads.size(); ++i)
-        result.unite(quads[i].boundingBox());
+    if (quads.isEmpty())
+        return FloatRect();
+
+    FloatRect result = quads[0].boundingBox();
+    for (size_t i = 1; i < quads.size(); ++i)
+        result.uniteEvenIfEmpty(quads[i].boundingBox());
 
     return result;