<!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>[176387] trunk/Source/WebCore</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/176387">176387</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 00:36:11 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Caret renderer is always a RenderBlock.
<https://webkit.org/b/138912>
Reviewed by Chris Dumez.
Tighten typing in the code that finds and deals with the renderer
used to paint the caret (it's always a RenderBlock.)
* editing/FrameSelection.cpp:
(WebCore::CaretBase::updateCaretRect):
(WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
(WebCore::DragCaretController::caretRenderer):
(WebCore::repaintCaretForLocalRect):
(WebCore::CaretBase::paintCaret):
* editing/FrameSelection.h:
* editing/VisiblePosition.cpp:
(WebCore::VisiblePosition::absoluteCaretBounds):
* editing/htmlediting.cpp:
(WebCore::rendererForCaretPainting):
(WebCore::localCaretRectInRendererForCaretPainting):
(WebCore::absoluteBoundsForLocalCaretRect):
* editing/htmlediting.h:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintCaret):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/ChangeLog 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-11-20 Andreas Kling <akling@apple.com>
+
+ Caret renderer is always a RenderBlock.
+ <https://webkit.org/b/138912>
+
+ Reviewed by Chris Dumez.
+
+ Tighten typing in the code that finds and deals with the renderer
+ used to paint the caret (it's always a RenderBlock.)
+
+ * editing/FrameSelection.cpp:
+ (WebCore::CaretBase::updateCaretRect):
+ (WebCore::FrameSelection::caretRendererWithoutUpdatingLayout):
+ (WebCore::DragCaretController::caretRenderer):
+ (WebCore::repaintCaretForLocalRect):
+ (WebCore::CaretBase::paintCaret):
+ * editing/FrameSelection.h:
+ * editing/VisiblePosition.cpp:
+ (WebCore::VisiblePosition::absoluteCaretBounds):
+ * editing/htmlediting.cpp:
+ (WebCore::rendererForCaretPainting):
+ (WebCore::localCaretRectInRendererForCaretPainting):
+ (WebCore::absoluteBoundsForLocalCaretRect):
+ * editing/htmlediting.h:
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintCaret):
+
</ins><span class="cx"> 2014-11-20 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r172854): Web Viewer in FileMaker does not render a Base64 encoded animated-GIF
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -1327,17 +1327,17 @@
</span><span class="cx"> {
</span><span class="cx"> document->updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> m_caretRectNeedsUpdate = false;
</span><del>- RenderObject* renderer;
</del><ins>+ RenderBlock* renderer;
</ins><span class="cx"> m_caretLocalRect = localCaretRectInRendererForCaretPainting(caretPosition, renderer);
</span><span class="cx"> return !m_caretLocalRect.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* FrameSelection::caretRendererWithoutUpdatingLayout() const
</del><ins>+RenderBlock* FrameSelection::caretRendererWithoutUpdatingLayout() const
</ins><span class="cx"> {
</span><span class="cx"> return rendererForCaretPainting(m_selection.start().deprecatedNode());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* DragCaretController::caretRenderer() const
</del><ins>+RenderBlock* DragCaretController::caretRenderer() const
</ins><span class="cx"> {
</span><span class="cx"> return rendererForCaretPainting(m_position.deepEquivalent().deprecatedNode());
</span><span class="cx"> }
</span><span class="lines">@@ -1358,11 +1358,8 @@
</span><span class="cx">
</span><span class="cx"> static void repaintCaretForLocalRect(Node* node, const LayoutRect& rect)
</span><span class="cx"> {
</span><del>- RenderObject* caretPainter = rendererForCaretPainting(node);
- if (!caretPainter)
- return;
-
- caretPainter->repaintRectangle(rect);
</del><ins>+ if (auto* caretPainter = rendererForCaretPainting(node))
+ caretPainter->repaintRectangle(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameSelection::recomputeCaretRect()
</span><span class="lines">@@ -1481,9 +1478,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutRect drawingRect = localCaretRectWithoutUpdate();
</span><del>- RenderObject* renderer = rendererForCaretPainting(node);
- if (is<RenderBox>(renderer))
- downcast<RenderBox>(*renderer).flipForWritingMode(drawingRect);
</del><ins>+ if (auto* renderer = rendererForCaretPainting(node))
+ renderer->flipForWritingMode(drawingRect);
</ins><span class="cx"> drawingRect.moveBy(roundedIntPoint(paintOffset));
</span><span class="cx"> LayoutRect caret = intersection(drawingRect, clipRect);
</span><span class="cx"> if (caret.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class GraphicsContext;
</span><span class="cx"> class HTMLFormElement;
</span><span class="cx"> class MutableStyleProperties;
</span><ins>+class RenderBlock;
</ins><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderView;
</span><span class="cx"> class Settings;
</span><span class="lines">@@ -92,7 +93,7 @@
</span><span class="cx"> public:
</span><span class="cx"> DragCaretController();
</span><span class="cx">
</span><del>- RenderObject* caretRenderer() const;
</del><ins>+ RenderBlock* caretRenderer() const;
</ins><span class="cx"> void paintDragCaret(Frame*, GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
</span><span class="cx">
</span><span class="cx"> bool isContentEditable() const { return m_position.rootEditableElement(); }
</span><span class="lines">@@ -169,7 +170,7 @@
</span><span class="cx"> void setExtent(const Position&, EAffinity, EUserTriggered = NotUserTriggered);
</span><span class="cx">
</span><span class="cx"> // Return the renderer that is responsible for painting the caret (in the selection start node)
</span><del>- RenderObject* caretRendererWithoutUpdatingLayout() const;
</del><ins>+ RenderBlock* caretRendererWithoutUpdatingLayout() const;
</ins><span class="cx">
</span><span class="cx"> // Bounds of (possibly transformed) caret in absolute coords
</span><span class="cx"> WEBCORE_EXPORT IntRect absoluteCaretBounds();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect VisiblePosition::absoluteCaretBounds() const
</span><span class="cx"> {
</span><del>- RenderObject* renderer = nullptr;
</del><ins>+ RenderBlock* renderer = nullptr;
</ins><span class="cx"> LayoutRect localRect = localCaretRectInRendererForCaretPainting(*this, renderer);
</span><span class="cx"> return absoluteBoundsForLocalCaretRect(renderer, localRect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -1263,7 +1263,7 @@
</span><span class="cx"> return node && !isRenderedTable(node) && !editingIgnoresContent(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* rendererForCaretPainting(Node* node)
</del><ins>+RenderBlock* rendererForCaretPainting(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1273,11 +1273,11 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // If caretNode is a block and caret is inside it, then caret should be painted by that block.
</span><del>- bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node);
- return paintedByBlock ? renderer : renderer->containingBlock();
</del><ins>+ bool paintedByBlock = is<RenderBlockFlow>(*renderer) && caretRendersInsideNode(node);
+ return paintedByBlock ? downcast<RenderBlock>(renderer) : renderer->containingBlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition& caretPosition, RenderObject*& caretPainter)
</del><ins>+LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition& caretPosition, RenderBlock*& caretPainter)
</ins><span class="cx"> {
</span><span class="cx"> if (caretPosition.isNull())
</span><span class="cx"> return LayoutRect();
</span><span class="lines">@@ -1304,14 +1304,13 @@
</span><span class="cx"> return localRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect absoluteBoundsForLocalCaretRect(RenderObject* rendererForCaretPainting, const LayoutRect& rect)
</del><ins>+IntRect absoluteBoundsForLocalCaretRect(RenderBlock* rendererForCaretPainting, const LayoutRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (!rendererForCaretPainting || rect.isEmpty())
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><span class="cx"> LayoutRect localRect(rect);
</span><del>- if (is<RenderBox>(*rendererForCaretPainting))
- downcast<RenderBox>(*rendererForCaretPainting).flipForWritingMode(localRect);
</del><ins>+ rendererForCaretPainting->flipForWritingMode(localRect);
</ins><span class="cx"> return rendererForCaretPainting->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/editing/htmlediting.h 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class Position;
</span><span class="cx"> class Range;
</span><ins>+class RenderBlock;
</ins><span class="cx"> class VisiblePosition;
</span><span class="cx"> class VisibleSelection;
</span><span class="cx">
</span><span class="lines">@@ -259,9 +260,9 @@
</span><span class="cx">
</span><span class="cx"> // Miscellaaneous functions that for caret rendering
</span><span class="cx">
</span><del>-RenderObject* rendererForCaretPainting(Node*);
-LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition&, RenderObject*&);
-IntRect absoluteBoundsForLocalCaretRect(RenderObject* rendererForCaretPainting, const LayoutRect&);
</del><ins>+RenderBlock* rendererForCaretPainting(Node*);
+LayoutRect localCaretRectInRendererForCaretPainting(const VisiblePosition&, RenderBlock*&);
+IntRect absoluteBoundsForLocalCaretRect(RenderBlock* rendererForCaretPainting, const LayoutRect&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (176386 => 176387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-20 08:33:07 UTC (rev 176386)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-20 08:36:11 UTC (rev 176387)
</span><span class="lines">@@ -1524,7 +1524,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Paint the caret if the FrameSelection says so or if caret browsing is enabled
</span><span class="cx"> bool caretBrowsing = frame().settings().caretBrowsingEnabled();
</span><del>- RenderObject* caretPainter;
</del><ins>+ RenderBlock* caretPainter;
</ins><span class="cx"> bool isContentEditable;
</span><span class="cx"> if (type == CursorCaret) {
</span><span class="cx"> caretPainter = frame().selection().caretRendererWithoutUpdatingLayout();
</span></span></pre>
</div>
</div>
</body>
</html>