<!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>[179095] branches/safari-600.1.4.15-branch/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/179095">179095</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-25 16:14:21 -0800 (Sun, 25 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177301">r177301</a>. rdar://problem/19419933</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreaccessibilityAccessibilitySlidercpp">branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilitySlider.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoredomContainerNodecpp">branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoredomContainerNodeh">branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoredomNodecpp">branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoredomNodeh">branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlColorInputTypecpp">branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlHTMLInputElementcpp">branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlValidationMessagecpp">branches/safari-600.1.4.15-branch/Source/WebCore/html/ValidationMessage.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehtmlshadowTextControlInnerElementscpp">branches/safari-600.1.4.15-branch/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageSpatialNavigationcpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/SpatialNavigation.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderElementh">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitmacChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2SharedWebHitTestResultcpp">branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebHitTestResult.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-01-25 David Kilzer <ddkilzer@apple.com>
+
+ Merge r177301.
+
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::InputFieldSpeechButtonElement::startSpeechInput):
+
+ 2014-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments in r177035
+ https://bugs.webkit.org/show_bug.cgi?id=139557
+
+ Reviewed by Darin Adler.
+
+ This patch deletes the helper functions rendererBoundingBox() and rendererAnchorRect() and
+ migrates callers to using renderers directly.
+
+ It also improves the comment in RenderElement.h regarding RenderElement::anchorRect().
+
+ No new tests because this is simply refactoring.
+
+ * WebCore.exp.in: Delete exported symbol for rendererBoundingBox()
+ * accessibility/AccessibilitySlider.cpp:
+ (WebCore::AccessibilitySliderThumb::elementRect): Migrate off rendererBoundingBox()
+ * dom/ContainerNode.cpp:
+ (WebCore::rendererAnchorRect): Deleted.
+ * dom/ContainerNode.h:
+ * dom/Node.cpp:
+ (WebCore::rendererBoundingBox): Deleted.
+ * dom/Node.h:
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::elementRectRelativeToRootView): Migrate off rendererBoundingBox().
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setupDateTimeChooserParameters): Ditto.
+ * html/ValidationMessage.cpp:
+ (WebCore::ValidationMessage::buildBubbleTree): Ditto.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollElementToRect): Migrate off rendererAnchorRect().
+ (WebCore::FrameView::scrollToAnchor): Ditto.
+ * page/SpatialNavigation.cpp:
+ (WebCore::nodeRectInAbsoluteCoordinates): Migrate off rendererBoundingBox().
+ * rendering/RenderElement.h:
+
</ins><span class="cx"> 2015-01-24 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177050.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -847,7 +847,6 @@
</span><span class="cx"> __ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore19floatValueForLengthERKNS_6LengthEf
</span><span class="cx"> __ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl
</span><del>-__ZN7WebCore19rendererBoundingBoxERKNS_4NodeE
</del><span class="cx"> __ZN7WebCore19toInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
</span><span class="cx"> __ZN7WebCore20ApplicationCacheHost17maybeLoadResourceEPNS_14ResourceLoaderERKNS_15ResourceRequestERKNS_3URLE
</span><span class="cx"> __ZN7WebCore20ApplicationCacheHost25maybeLoadFallbackForErrorEPNS_14ResourceLoaderERKNS_13ResourceErrorE
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreaccessibilityAccessibilitySlidercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilitySlider.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilitySlider.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilitySlider.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -159,7 +159,9 @@
</span><span class="cx"> RenderObject* sliderRenderer = m_parent->renderer();
</span><span class="cx"> if (!sliderRenderer || !sliderRenderer->isSlider())
</span><span class="cx"> return LayoutRect();
</span><del>- return rendererBoundingBox(*toHTMLInputElement(sliderRenderer->node())->sliderThumbElement());
</del><ins>+ if (RenderElement* thumbRenderer = toHTMLInputElement(sliderRenderer->node())->sliderThumbElement()->renderer())
+ return thumbRenderer->absoluteBoundingBoxRect();
+ return LayoutRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilitySliderThumb::computeAccessibilityIsIgnored() const
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -938,11 +938,4 @@
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect rendererAnchorRect(const ContainerNode& node)
-{
- if (RenderElement* renderer = node.renderer())
- return renderer->anchorRect();
- return LayoutRect();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.h (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.h 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/dom/ContainerNode.h 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -306,8 +306,6 @@
</span><span class="cx"> ChildNodesLazySnapshot* m_nextSnapshot;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-LayoutRect rendererAnchorRect(const ContainerNode&);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ContainerNode_h
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -2231,13 +2231,6 @@
</span><span class="cx"> return inDocument() && document().hasLivingRenderTree();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect rendererBoundingBox(const Node& node)
-{
- if (RenderObject* renderer = node.renderer())
- return renderer->absoluteBoundingBoxRect();
- return IntRect();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.h (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.h 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/dom/Node.h 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -737,8 +737,6 @@
</span><span class="cx"> return parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect rendererBoundingBox(const Node&);
-
</del><span class="cx"> #define NODE_TYPE_CASTS(ToClassName) \
</span><span class="cx"> TYPE_CASTS_BASE(ToClassName, Node, node, WebCore::is##ToClassName(*node), WebCore::is##ToClassName(node))
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlColorInputTypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/ColorInputType.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -204,7 +204,9 @@
</span><span class="cx">
</span><span class="cx"> IntRect ColorInputType::elementRectRelativeToRootView() const
</span><span class="cx"> {
</span><del>- return element().document().view()->contentsToRootView(rendererBoundingBox(element()));
</del><ins>+ if (!element().renderer())
+ return IntRect();
+ element().document().view()->contentsToRootView(element().renderer()->absoluteBoundingBoxRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color ColorInputType::currentColor()
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLInputElement.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLInputElement.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/HTMLInputElement.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -1909,7 +1909,10 @@
</span><span class="cx"> parameters.stepBase = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- parameters.anchorRectInRootView = document().view()->contentsToRootView(rendererBoundingBox(*this));
</del><ins>+ if (RenderObject* renderer = this->renderer())
+ parameters.anchorRectInRootView = document().view()->contentsToRootView(renderer->absoluteBoundingBoxRect());
+ else
+ parameters.anchorRectInRootView = IntRect();
</ins><span class="cx"> parameters.currentValue = value();
</span><span class="cx"> parameters.isAnchorElementRTL = computedStyle()->direction() == RTL;
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlValidationMessagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/ValidationMessage.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/ValidationMessage.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/ValidationMessage.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -168,6 +168,10 @@
</span><span class="cx"> void ValidationMessage::buildBubbleTree(Timer<ValidationMessage>*)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!validationMessageClient());
</span><ins>+
+ if (!m_element->renderer())
+ return;
+
</ins><span class="cx"> ShadowRoot& shadowRoot = m_element->ensureUserAgentShadowRoot();
</span><span class="cx">
</span><span class="cx"> Document& document = m_element->document();
</span><span class="lines">@@ -178,7 +182,7 @@
</span><span class="cx"> m_bubble->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
</span><span class="cx"> shadowRoot.appendChild(m_bubble.get(), ASSERT_NO_EXCEPTION);
</span><span class="cx"> document.updateLayout();
</span><del>- adjustBubblePosition(rendererBoundingBox(*m_element), m_bubble.get());
</del><ins>+ adjustBubblePosition(m_element->renderer()->absoluteBoundingBoxRect(), m_bubble.get());
</ins><span class="cx">
</span><span class="cx"> RefPtr<HTMLDivElement> clipper = HTMLDivElement::create(document);
</span><span class="cx"> clipper->setPseudo(AtomicString("-webkit-validation-bubble-arrow-clipper", AtomicString::ConstructFromLiteral));
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/html/shadow/TextControlInnerElements.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> RefPtr<HTMLInputElement> input = toHTMLInputElement(shadowHost());
</span><span class="cx"> AtomicString language = input->computeInheritedLanguage();
</span><span class="cx"> String grammar = input->getAttribute(webkitgrammarAttr);
</span><del>- IntRect rect = document().view()->contentsToRootView(rendererBoundingBox(*this));
</del><ins>+ IntRect rect = document().view()->contentsToRootView(renderer() ? renderer()->absoluteBoundingBoxRect() : IntRect());
</ins><span class="cx"> if (speechInput()->startRecognition(m_listenerId, rect, language, grammar, document().securityOrigin()))
</span><span class="cx"> setState(Recording);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -1981,7 +1981,9 @@
</span><span class="cx"> {
</span><span class="cx"> frame().document()->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><del>- LayoutRect bounds = rendererAnchorRect(*element);
</del><ins>+ LayoutRect bounds;
+ if (RenderElement* renderer = element->renderer())
+ bounds = renderer->anchorRect();
</ins><span class="cx"> int centeringOffsetX = (rect.width() - bounds.width()) / 2;
</span><span class="cx"> int centeringOffsetY = (rect.height() - bounds.height()) / 2;
</span><span class="cx"> setScrollPosition(IntPoint(bounds.x() - centeringOffsetX - rect.x(), bounds.y() - centeringOffsetY - rect.y()));
</span><span class="lines">@@ -2732,8 +2734,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutRect rect;
</span><del>- if (anchorNode != frame().document())
- rect = rendererAnchorRect(*anchorNode.get());
</del><ins>+ if (anchorNode != frame().document() && anchorNode->renderer())
+ rect = anchorNode->renderer()->anchorRect();
</ins><span class="cx">
</span><span class="cx"> // Scroll nested layers and frames to reveal the anchor.
</span><span class="cx"> // Align to the top and to the closest side (this matches other browsers).
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageSpatialNavigationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/SpatialNavigation.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/SpatialNavigation.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/SpatialNavigation.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -524,7 +524,9 @@
</span><span class="cx"> if (node->isDocumentNode())
</span><span class="cx"> return frameRectInAbsoluteCoordinates(toDocument(node)->frame());
</span><span class="cx">
</span><del>- LayoutRect rect = rectToAbsoluteCoordinates(node->document().frame(), rendererBoundingBox(*node));
</del><ins>+ LayoutRect rect;
+ if (RenderObject* renderer = node->renderer())
+ rect = rectToAbsoluteCoordinates(node->document().frame(), renderer->absoluteBoundingBoxRect());
</ins><span class="cx">
</span><span class="cx"> // For authors that use border instead of outline in their CSS, we compensate by ignoring the border when calculating
</span><span class="cx"> // the rect of the focused element.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.h (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.h 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.h 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -133,7 +133,8 @@
</span><span class="cx"> bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
</span><span class="cx">
</span><span class="cx"> // anchorRect() is conceptually similar to absoluteBoundingBoxRect(), but is intended for scrolling to an anchor.
</span><del>- // It works differently than absoluteBoundingBoxRect() for inline renderers.
</del><ins>+ // For inline renderers, this gets the logical top left of the first leaf child and the logical bottom right of the
+ // last leaf child, converts them to absolute coordinates, and makes a box out of them.
</ins><span class="cx"> LayoutRect anchorRect() const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-25 David Kilzer <ddkilzer@apple.com>
+
+ Merge r177301.
+
+ 2014-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments in r177035
+ https://bugs.webkit.org/show_bug.cgi?id=139557
+
+ Reviewed by Darin Adler.
+
+ * WebView/WebActionMenuController.mm:
+ (elementBoundingBoxInWindowCoordinatesFromNode): Migrate off rendererBoundingBox().
+
</ins><span class="cx"> 2015-01-24 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177035.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-25 David Kilzer <ddkilzer@apple.com>
+
+ Merge r177301.
+
+ 2014-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Addressing post-review comments in r177035
+ https://bugs.webkit.org/show_bug.cgi?id=139557
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebHitTestResult.cpp:
+ (WebKit::WebHitTestResult::Data::elementBoundingBoxInWindowCoordinates): Migrate off rendererBoundingBox().
+ * WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp:
+ (WebKit::WebPage::findZoomableAreaForPoint): Ditto.
+
</ins><span class="cx"> 2015-01-24 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177035.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2SharedWebHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebHitTestResult.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebHitTestResult.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebHitTestResult.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -103,7 +103,11 @@
</span><span class="cx"> if (!view)
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><del>- return view->contentsToWindow(rendererBoundingBox(*node));
</del><ins>+ RenderObject* renderer = node->renderer();
+ if (!renderer)
+ return IntRect();
+
+ return view->contentsToWindow(renderer->absoluteBoundingBoxRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // WebKit
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp (179094 => 179095)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2015-01-26 00:14:16 UTC (rev 179094)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2015-01-26 00:14:21 UTC (rev 179095)
</span><span class="lines">@@ -55,7 +55,9 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- IntRect zoomableArea = rendererBoundingBox(*node);
</del><ins>+ IntRect zoomableArea;
+ if (RenderObject* renderer = node->renderer())
+ zoomableArea = renderer->absoluteBoundingBoxRect();
</ins><span class="cx">
</span><span class="cx"> while (true) {
</span><span class="cx"> bool found = !node->isTextNode() && !node->isShadowRoot();
</span><span class="lines">@@ -71,7 +73,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> node = node->parentNode();
</span><del>- zoomableArea.unite(rendererBoundingBox(*node));
</del><ins>+ if (RenderObject* renderer = node.renderer())
+ zoomableArea.unite(renderer->absoluteBoundingBoxRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (node->document().frame() && node->document().frame()->view()) {
</span></span></pre>
</div>
</div>
</body>
</html>