<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163920] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163920">163920</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-11 17:53:03 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Frame::rectForSelection shouldn't instantiate FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=128587
Reviewed by Enrica Casucci.
Source/WebCore:
Made VisiblePosition::absoluteCaretBounds more interoperable with the one in FrameSelection and made
iOS's Frame::rectForScrollToVisible use that function instead.
The above change allows us to remove:
- suppressCloseTyping(), restoreCloseTyping(), and m_closeTypingSuppressions in FrameSelection
- suppressSelectionNotifications() and restoreSelectionNotifications() in EditorClient
See inline comments below for more details.
* Source/WebCore/WebCore.exp.in:
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::FrameSelection):
(WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance):
(WebCore::CaretBase::updateCaretRect):
(WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
(WebCore::DragCaretController::caretRenderer):
(WebCore::repaintCaretForLocalRect):
(WebCore::FrameSelection::recomputeCaretRect): Merged FrameSelection::localCaretRect(). Modified
the code to update caretNode when and only when caret rect is updated. Also added an assertion to
ensure absoluteCaretBounds() on FrameSelection and VisiblePosition yield the same result.
(WebCore::CaretBase::paintCaret):
* editing/FrameSelection.h:
* editing/VisiblePosition.cpp:
(WebCore::VisiblePosition::absoluteCaretBounds): Fixed the bug where the old code wasn't respecting
the convention to use containing block as the renderer to paint caret.
* editing/htmlediting.cpp:
(WebCore::caretRendersInsideNode): Moved from FrameSelection.cpp.
(WebCore::rendererForCaretPainting): Ditto and renamed from caretRenderer.
(WebCore::localCaretRectInRendererForCaretPainting): Extracted from FrameSelection::updateCaretRect.
(WebCore::absoluteBoundsForLocalCaretRect): Ditto from CaretBase::absoluteBoundsForLocalRect.
* editing/htmlediting.h:
* loader/EmptyClients.h:
* page/EditorClient.h:
* page/Frame.h:
* page/ios/FrameIOS.mm:
(WebCore::Frame::rectForScrollToVisible): Reimplemented in its simplest form using VisiblePosition's
absoluteCaretBounds().
Source/WebKit/mac:
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::WebEditorClient):
(WebEditorClient::respondToChangedSelection):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositioncpp">trunk/Source/WebCore/editing/VisiblePosition.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageEditorClienth">trunk/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebEditorClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2014-02-11 Ryosuke Niwa <rniwa@webkit.org>
+
+ Frame::rectForSelection shouldn't instantiate FrameSelection
+ https://bugs.webkit.org/show_bug.cgi?id=128587
+
+ Reviewed by Enrica Casucci.
+
+ Made VisiblePosition::absoluteCaretBounds more interoperable with the one in FrameSelection and made
+ iOS's Frame::rectForScrollToVisible use that function instead.
+
+ The above change allows us to remove:
+ - suppressCloseTyping(), restoreCloseTyping(), and m_closeTypingSuppressions in FrameSelection
+ - suppressSelectionNotifications() and restoreSelectionNotifications() in EditorClient
+
+ See inline comments below for more details.
+
+ * Source/WebCore/WebCore.exp.in:
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::FrameSelection):
+ (WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance):
+ (WebCore::CaretBase::updateCaretRect):
+ (WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
+ (WebCore::DragCaretController::caretRenderer):
+ (WebCore::repaintCaretForLocalRect):
+ (WebCore::FrameSelection::recomputeCaretRect): Merged FrameSelection::localCaretRect(). Modified
+ the code to update caretNode when and only when caret rect is updated. Also added an assertion to
+ ensure absoluteCaretBounds() on FrameSelection and VisiblePosition yield the same result.
+
+ (WebCore::CaretBase::paintCaret):
+ * editing/FrameSelection.h:
+
+ * editing/VisiblePosition.cpp:
+ (WebCore::VisiblePosition::absoluteCaretBounds): Fixed the bug where the old code wasn't respecting
+ the convention to use containing block as the renderer to paint caret.
+
+ * editing/htmlediting.cpp:
+ (WebCore::caretRendersInsideNode): Moved from FrameSelection.cpp.
+ (WebCore::rendererForCaretPainting): Ditto and renamed from caretRenderer.
+ (WebCore::localCaretRectInRendererForCaretPainting): Extracted from FrameSelection::updateCaretRect.
+ (WebCore::absoluteBoundsForLocalCaretRect): Ditto from CaretBase::absoluteBoundsForLocalRect.
+ * editing/htmlediting.h:
+
+ * loader/EmptyClients.h:
+ * page/EditorClient.h:
+ * page/Frame.h:
+
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::rectForScrollToVisible): Reimplemented in its simplest form using VisiblePosition's
+ absoluteCaretBounds().
+
</ins><span class="cx"> 2014-02-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Support WebSelections in WK2 on iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -2537,7 +2537,6 @@
</span><span class="cx"> __ZNK7WebCore5Frame12updateLayoutEv
</span><span class="cx"> __ZNK7WebCore5Frame15innerLineHeightEP7DOMNode
</span><span class="cx"> __ZNK7WebCore5Frame15preferredHeightEv
</span><del>-__ZNK7WebCore5Frame16rectForSelectionERNS_16VisibleSelectionE
</del><span class="cx"> __ZNK7WebCore5Frame18renderRectForPointE7CGPointPbPf
</span><span class="cx"> __ZNK7WebCore5Frame19rangedSelectionBaseEv
</span><span class="cx"> __ZNK7WebCore5Frame21styleAtSelectionStartEv
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_updateAppearanceEnabled(false)
</span><span class="cx"> , m_caretBlinks(true)
</span><del>- , m_closeTypingSuppressions(0)
</del><span class="cx"> , m_scrollingSuppressCount(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -278,11 +277,7 @@
</span><span class="cx">
</span><span class="cx"> m_granularity = granularity;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (closeTyping && m_closeTypingSuppressions == 0)
-#else
</del><span class="cx"> if (closeTyping)
</span><del>-#endif
</del><span class="cx"> TypingCommand::closeTyping(m_frame);
</span><span class="cx">
</span><span class="cx"> if (shouldClearTypingStyle)
</span><span class="lines">@@ -1287,71 +1282,23 @@
</span><span class="cx"> m_caretLocalRect = LayoutRect();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool caretRendersInsideNode(Node* node)
-{
- return node && !isRenderedTable(node) && !editingIgnoresContent(node);
-}
-
-static RenderObject* caretRenderer(Node* node)
-{
- if (!node)
- return 0;
-
- RenderObject* renderer = node->renderer();
- if (!renderer)
- return 0;
-
- // if caretNode is a block and caret is inside it then caret should be painted by that block
- bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node);
- return paintedByBlock ? renderer : renderer->containingBlock();
-}
-
</del><span class="cx"> bool CaretBase::updateCaretRect(Document* document, const VisiblePosition& caretPosition)
</span><span class="cx"> {
</span><span class="cx"> document->updateLayoutIgnorePendingStylesheets();
</span><del>- m_caretLocalRect = LayoutRect();
-
</del><span class="cx"> m_caretRectNeedsUpdate = false;
</span><del>-
- if (caretPosition.isNull())
- return false;
-
- ASSERT(caretPosition.deepEquivalent().deprecatedNode()->renderer());
-
- // First compute a rect local to the renderer at the selection start.
</del><span class="cx"> RenderObject* renderer;
</span><del>- LayoutRect localRect = caretPosition.localCaretRect(renderer);
-
- // Get the renderer that will be responsible for painting the caret
- // (which is either the renderer we just found, or one of its containers).
- RenderObject* caretPainter = caretRenderer(caretPosition.deepEquivalent().deprecatedNode());
-
- // Compute an offset between the renderer and the caretPainter.
- bool unrooted = false;
- while (renderer != caretPainter) {
- RenderObject* containerObject = renderer->container();
- if (!containerObject) {
- unrooted = true;
- break;
- }
- localRect.move(renderer->offsetFromContainer(containerObject, localRect.location()));
- renderer = containerObject;
- }
-
- if (!unrooted)
- m_caretLocalRect = localRect;
-
- return true;
</del><ins>+ m_caretLocalRect = localCaretRectInRendererForCaretPainting(caretPosition, renderer);
+ return !m_caretLocalRect.isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* FrameSelection::caretRendererWithoutUpdatingLayout() const
</span><span class="cx"> {
</span><del>- return WebCore::caretRenderer(m_selection.start().deprecatedNode());
</del><ins>+ return rendererForCaretPainting(m_selection.start().deprecatedNode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* DragCaretController::caretRenderer() const
</span><span class="cx"> {
</span><del>- return WebCore::caretRenderer(m_position.deepEquivalent().deprecatedNode());
</del><ins>+ return rendererForCaretPainting(m_position.deepEquivalent().deprecatedNode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isNonOrphanedCaret(const VisibleSelection& selection)
</span><span class="lines">@@ -1359,30 +1306,6 @@
</span><span class="cx"> return selection.isCaret() && !selection.start().isOrphan() && !selection.end().isOrphan();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect FrameSelection::localCaretRect()
-{
- if (shouldUpdateCaretRect()) {
- if (!isNonOrphanedCaret(m_selection))
- clearCaretRect();
- else if (updateCaretRect(m_frame->document(), VisiblePosition(m_selection.start(), m_selection.affinity())))
- m_absCaretBoundsDirty = true;
- }
-
- return localCaretRectWithoutUpdate();
-}
-
-IntRect CaretBase::absoluteBoundsForLocalRect(Node* node, const LayoutRect& rect) const
-{
- RenderObject* caretPainter = caretRenderer(node);
- if (!caretPainter)
- return IntRect();
-
- LayoutRect localRect(rect);
- if (caretPainter->isBox())
- toRenderBox(caretPainter)->flipForWritingMode(localRect);
- return caretPainter->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
-}
-
</del><span class="cx"> IntRect FrameSelection::absoluteCaretBounds()
</span><span class="cx"> {
</span><span class="cx"> recomputeCaretRect();
</span><span class="lines">@@ -1391,7 +1314,7 @@
</span><span class="cx">
</span><span class="cx"> static void repaintCaretForLocalRect(Node* node, const LayoutRect& rect)
</span><span class="cx"> {
</span><del>- RenderObject* caretPainter = caretRenderer(node);
</del><ins>+ RenderObject* caretPainter = rendererForCaretPainting(node);
</ins><span class="cx"> if (!caretPainter)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1410,16 +1333,31 @@
</span><span class="cx"> if (!v)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- Node* caretNode = m_selection.start().deprecatedNode();
-
</del><span class="cx"> LayoutRect oldRect = localCaretRectWithoutUpdate();
</span><del>- LayoutRect newRect = localCaretRect();
</del><span class="cx">
</span><ins>+ RefPtr<Node> caretNode = m_previousCaretNode;
+ if (shouldUpdateCaretRect()) {
+ if (!isNonOrphanedCaret(m_selection))
+ clearCaretRect();
+ else {
+ VisiblePosition visibleStart = m_selection.visibleStart();
+ if (updateCaretRect(m_frame->document(), visibleStart)) {
+ caretNode = visibleStart.deepEquivalent().deprecatedNode();
+ m_absCaretBoundsDirty = true;
+ }
+ }
+ }
+ LayoutRect newRect = localCaretRectWithoutUpdate();
+
</ins><span class="cx"> if (caretNode == m_previousCaretNode && oldRect == newRect && !m_absCaretBoundsDirty)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> IntRect oldAbsCaretBounds = m_absCaretBounds;
</span><del>- m_absCaretBounds = absoluteBoundsForLocalRect(caretNode, localCaretRectWithoutUpdate());
</del><ins>+ m_absCaretBounds = absoluteBoundsForLocalCaretRect(rendererForCaretPainting(caretNode.get()), newRect);
+
+ if (m_absCaretBoundsDirty) // We should be able to always assert this condition.
+ ASSERT(m_absCaretBounds == m_selection.visibleStart().absoluteCaretBounds());
+
</ins><span class="cx"> m_absCaretBoundsDirty = false;
</span><span class="cx">
</span><span class="cx"> if (caretNode == m_previousCaretNode && oldAbsCaretBounds == m_absCaretBounds)
</span><span class="lines">@@ -1432,7 +1370,7 @@
</span><span class="cx"> if (m_previousCaretNode)
</span><span class="cx"> repaintCaretForLocalRect(m_previousCaretNode.get(), oldRect);
</span><span class="cx"> m_previousCaretNode = caretNode;
</span><del>- repaintCaretForLocalRect(caretNode, newRect);
</del><ins>+ repaintCaretForLocalRect(caretNode.get(), newRect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1492,7 +1430,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutRect drawingRect = localCaretRectWithoutUpdate();
</span><del>- RenderObject* renderer = caretRenderer(node);
</del><ins>+ RenderObject* renderer = rendererForCaretPainting(node);
</ins><span class="cx"> if (renderer && renderer->isBox())
</span><span class="cx"> toRenderBox(renderer)->flipForWritingMode(drawingRect);
</span><span class="cx"> drawingRect.moveBy(roundedIntPoint(paintOffset));
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> void invalidateCaretRect(Node*, bool caretRectChanged = false);
</span><span class="cx"> void clearCaretRect();
</span><span class="cx"> bool updateCaretRect(Document*, const VisiblePosition& caretPosition);
</span><del>- IntRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
</del><span class="cx"> bool shouldRepaintCaret(const RenderView*, bool isContentEditable) const;
</span><span class="cx"> void paintCaret(Node*, GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
</span><span class="cx">
</span><span class="lines">@@ -168,9 +167,6 @@
</span><span class="cx"> // Return the renderer that is responsible for painting the caret (in the selection start node)
</span><span class="cx"> RenderObject* caretRendererWithoutUpdatingLayout() const;
</span><span class="cx">
</span><del>- // Caret rect local to the caret's renderer
- LayoutRect localCaretRect();
-
</del><span class="cx"> // Bounds of (possibly transformed) caret in absolute coords
</span><span class="cx"> IntRect absoluteCaretBounds();
</span><span class="cx"> void setCaretRectNeedsUpdate() { CaretBase::setCaretRectNeedsUpdate(); }
</span><span class="lines">@@ -229,8 +225,6 @@
</span><span class="cx"> PassRefPtr<Range> rangeByMovingCurrentSelection(int amount) const;
</span><span class="cx"> PassRefPtr<Range> rangeByExtendingCurrentSelection(int amount) const;
</span><span class="cx"> void selectRangeOnElement(unsigned location, unsigned length, Node*);
</span><del>- void suppressCloseTyping() { ++m_closeTypingSuppressions; }
- void restoreCloseTyping() { --m_closeTypingSuppressions; }
</del><span class="cx"> void clearCurrentSelection();
</span><span class="cx"> void setCaretBlinks(bool caretBlinks = true);
</span><span class="cx"> void setCaretColor(const Color&);
</span><span class="lines">@@ -342,7 +336,6 @@
</span><span class="cx"> bool m_updateAppearanceEnabled : 1;
</span><span class="cx"> bool m_caretBlinks : 1;
</span><span class="cx"> Color m_caretColor;
</span><del>- int m_closeTypingSuppressions;
</del><span class="cx"> int m_scrollingSuppressCount;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -619,12 +619,9 @@
</span><span class="cx">
</span><span class="cx"> IntRect VisiblePosition::absoluteCaretBounds() const
</span><span class="cx"> {
</span><del>- RenderObject* renderer;
- LayoutRect localRect = localCaretRect(renderer);
- if (localRect.isEmpty() || !renderer)
- return IntRect();
-
- return renderer->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
</del><ins>+ RenderObject* renderer = nullptr;
+ LayoutRect localRect = localCaretRectInRendererForCaretPainting(*this, renderer);
+ return absoluteBoundsForLocalCaretRect(renderer, localRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int VisiblePosition::lineDirectionPointForBlockDirectionNavigation() const
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "HTMLUListElement.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "PositionIterator.h"
</span><ins>+#include "RenderBlock.h"
</ins><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "Text.h"
</span><span class="lines">@@ -1260,4 +1261,61 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool caretRendersInsideNode(Node* node)
+{
+ return node && !isRenderedTable(node) && !editingIgnoresContent(node);
+}
+
+RenderObject* rendererForCaretPainting(Node* node)
+{
+ if (!node)
+ return 0;
+
+ RenderObject* renderer = node->renderer();
+ if (!renderer)
+ return 0;
+
+ // If caretNode is a block and caret is inside it, then caret should be painted by that block.
+ bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node);
+ return paintedByBlock ? renderer : renderer->containingBlock();
+}
+
+LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition& caretPosition, RenderObject*& caretPainter)
+{
+ if (caretPosition.isNull())
+ return LayoutRect();
+
+ ASSERT(caretPosition.deepEquivalent().deprecatedNode()->renderer());
+
+ // First compute a rect local to the renderer at the selection start.
+ RenderObject* renderer;
+ LayoutRect localRect = caretPosition.localCaretRect(renderer);
+
+ // Get the renderer that will be responsible for painting the caret
+ // (which is either the renderer we just found, or one of its containers).
+ caretPainter = rendererForCaretPainting(caretPosition.deepEquivalent().deprecatedNode());
+
+ // Compute an offset between the renderer and the caretPainter.
+ while (renderer != caretPainter) {
+ RenderObject* containerObject = renderer->container();
+ if (!containerObject)
+ return LayoutRect();
+ localRect.move(renderer->offsetFromContainer(containerObject, localRect.location()));
+ renderer = containerObject;
+ }
+
+ return localRect;
+}
+
+IntRect absoluteBoundsForLocalCaretRect(RenderObject* rendererForCaretPainting, const LayoutRect& rect)
+{
+ if (!rendererForCaretPainting || rect.isEmpty())
+ return IntRect();
+
+ LayoutRect localRect(rect);
+ if (rendererForCaretPainting->isBox())
+ toRenderBox(rendererForCaretPainting)->flipForWritingMode(localRect);
+ return rendererForCaretPainting->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/editing/htmlediting.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -256,6 +256,12 @@
</span><span class="cx"> String stringWithRebalancedWhitespace(const String&, bool startIsStartOfParagraph, bool endIsEndOfParagraph);
</span><span class="cx"> const String& nonBreakingSpaceString();
</span><span class="cx">
</span><ins>+// Miscellaaneous functions that for caret rendering
+
+RenderObject* rendererForCaretPainting(Node*);
+LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition&, RenderObject*&);
+IntRect absoluteBoundsForLocalCaretRect(RenderObject* rendererForCaretPainting, const LayoutRect&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -470,8 +470,6 @@
</span><span class="cx"> virtual void textDidChangeInTextArea(Element*) override { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void suppressSelectionNotifications() override { }
- virtual void restoreSelectionNotifications() override { }
</del><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() override { }
</span><span class="cx"> virtual void stopDelayingAndCoalescingContentChangeNotifications() override { }
</span><span class="cx"> virtual void writeDataToPasteboard(NSDictionary*) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EditorClient.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EditorClient.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/page/EditorClient.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -119,8 +119,6 @@
</span><span class="cx"> virtual void textDidChangeInTextArea(Element*) = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void suppressSelectionNotifications() = 0;
- virtual void restoreSelectionNotifications() = 0;
</del><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() = 0;
</span><span class="cx"> virtual void stopDelayingAndCoalescingContentChangeNotifications() = 0;
</span><span class="cx"> virtual void writeDataToPasteboard(NSDictionary*) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/page/Frame.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -256,7 +256,6 @@
</span><span class="cx"> void updateLayout() const;
</span><span class="cx"> NSRect caretRect() const;
</span><span class="cx"> NSRect rectForScrollToVisible() const;
</span><del>- NSRect rectForSelection(VisibleSelection&) const;
</del><span class="cx"> DOMCSSStyleDeclaration* styleAtSelectionStart() const;
</span><span class="cx"> unsigned formElementsCharacterCount() const;
</span><span class="cx"> void setTimersPaused(bool);
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -606,51 +606,14 @@
</span><span class="cx"> NSRect Frame::rectForScrollToVisible() const
</span><span class="cx"> {
</span><span class="cx"> VisibleSelection selection(this->selection().selection());
</span><del>- return rectForSelection(selection);
-}
</del><span class="cx">
</span><del>-NSRect Frame::rectForSelection(VisibleSelection& selection) const
-{
</del><span class="cx"> if (selection.isNone())
</span><span class="cx"> return CGRectZero;
</span><span class="cx">
</span><span class="cx"> if (selection.isCaret())
</span><span class="cx"> return caretRect();
</span><span class="cx">
</span><del>- EditorClient* client = editor().client();
- if (client)
- client->suppressSelectionNotifications();
-
- VisibleSelection originalSelection(selection);
- Position position;
-
- // The selection controllers below need to be associated with a frame in order
- // to calculate geometry. This causes them to do more work here than we would
- // like. Ideally, we would have a sort offline geometry-only mode for selection
- // controllers so we could do this kind of work as cheaply as possible.
-
- position = originalSelection.start();
- selection.setBase(position);
- selection.setExtent(position);
- FrameSelection startFrameSelection(const_cast<Frame*>(this));
- startFrameSelection.suppressCloseTyping();
- startFrameSelection.setSelection(selection);
- FloatRect startRect(startFrameSelection.absoluteCaretBounds());
- startFrameSelection.restoreCloseTyping();
-
- position = originalSelection.end();
- selection.setBase(position);
- selection.setExtent(position);
- FrameSelection endFrameSelection(const_cast<Frame*>(this));
- endFrameSelection.suppressCloseTyping();
- endFrameSelection.setSelection(selection);
- FloatRect endRect(endFrameSelection.absoluteCaretBounds());
- endFrameSelection.restoreCloseTyping();
-
- if (client)
- client->restoreSelectionNotifications();
-
- return unionRect(startRect, endRect);
</del><ins>+ return unionRect(selection.visibleStart().absoluteCaretBounds(), selection.visibleEnd().absoluteCaretBounds());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMCSSStyleDeclaration* Frame::styleAtSelectionStart() const
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-11 Ryosuke Niwa <rniwa@webkit.org>
+
+ Frame::rectForSelection shouldn't instantiate FrameSelection
+ https://bugs.webkit.org/show_bug.cgi?id=128587
+
+ Reviewed by Enrica Casucci.
+
+ * WebCoreSupport/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::WebEditorClient):
+ (WebEditorClient::respondToChangedSelection):
+
</ins><span class="cx"> 2014-02-10 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Convert position:sticky and position:fixed properties to position:static and position:absolute upon copy
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -134,8 +134,6 @@
</span><span class="cx"> virtual void textDidChangeInTextArea(WebCore::Element*) override;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void suppressSelectionNotifications() override;
- virtual void restoreSelectionNotifications() override;
</del><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() override;
</span><span class="cx"> virtual void stopDelayingAndCoalescingContentChangeNotifications() override;
</span><span class="cx"> virtual void writeDataToPasteboard(NSDictionary*) override;
</span><span class="lines">@@ -172,7 +170,6 @@
</span><span class="cx"> bool m_haveUndoRedoOperations;
</span><span class="cx"> RefPtr<WebCore::TextCheckingRequest> m_textCheckingRequest;
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- int m_selectionNotificationSuppressions;
</del><span class="cx"> bool m_delayingContentChangeNotifications;
</span><span class="cx"> bool m_hasDelayedContentChangeNotification;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -194,7 +194,6 @@
</span><span class="cx"> , m_undoTarget([[[WebEditorUndoTarget alloc] init] autorelease])
</span><span class="cx"> , m_haveUndoRedoOperations(false)
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- , m_selectionNotificationSuppressions(0)
</del><span class="cx"> , m_delayingContentChangeNotifications(0)
</span><span class="cx"> , m_hasDelayedContentChangeNotification(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -357,7 +356,7 @@
</span><span class="cx"> #else
</span><span class="cx"> // Selection can be changed while deallocating down the WebView / Frame / Editor. Do not post in that case because it's already too late
</span><span class="cx"> // for the NSInvocation to retain the WebView.
</span><del>- if (![m_webView _isClosing] && m_selectionNotificationSuppressions == 0)
</del><ins>+ if (![m_webView _isClosing])
</ins><span class="cx"> WebThreadPostNotification(WebViewDidChangeSelectionNotification, m_webView, nil);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -798,18 +797,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-void WebEditorClient::suppressSelectionNotifications()
-{
- m_selectionNotificationSuppressions++;
-}
-
-void WebEditorClient::restoreSelectionNotifications()
-{
- --m_selectionNotificationSuppressions;
- if (m_selectionNotificationSuppressions < 0)
- m_selectionNotificationSuppressions = 0;
-}
-
</del><span class="cx"> void WebEditorClient::writeDataToPasteboard(NSDictionary* representation)
</span><span class="cx"> {
</span><span class="cx"> if ([[m_webView _UIKitDelegateForwarder] respondsToSelector:@selector(writeDataToPasteboard:)])
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-11 Ryosuke Niwa <rniwa@webkit.org>
+
+ Frame::rectForSelection shouldn't instantiate FrameSelection
+ https://bugs.webkit.org/show_bug.cgi?id=128587
+
+ Reviewed by Enrica Casucci.
+
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+ * WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm:
+
</ins><span class="cx"> 2014-02-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Support WebSelections in WK2 on iOS.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -153,8 +153,6 @@
</span><span class="cx"> virtual bool shouldShowUnicodeMenu() override;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual void suppressSelectionNotifications() override;
- virtual void restoreSelectionNotifications() override;
</del><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() override;
</span><span class="cx"> virtual void stopDelayingAndCoalescingContentChangeNotifications() override;
</span><span class="cx"> virtual void writeDataToPasteboard(NSDictionary*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebEditorClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm (163919 => 163920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm 2014-02-12 01:10:21 UTC (rev 163919)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm 2014-02-12 01:53:03 UTC (rev 163920)
</span><span class="lines">@@ -75,16 +75,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::suppressSelectionNotifications()
-{
- notImplemented();
-}
-
-void WebEditorClient::restoreSelectionNotifications()
-{
- notImplemented();
-}
-
</del><span class="cx"> void WebEditorClient::startDelayingAndCoalescingContentChangeNotifications()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre>
</div>
</div>
</body>
</html>