<!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>[186684] 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/186684">186684</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-07-10 13:19:52 -0700 (Fri, 10 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash at WebCore::WebPage::innerFrameQuad.
https://bugs.webkit.org/show_bug.cgi?id=146843
rdar://problem/21501819
Reviewed by Andreas Kling.
We may end up with a null rootEditableElement() after calling Document::updateLayout().
Speculative fix. Not reproducible.
Source/WebCore:
* page/Frame.cpp: Some const cleanup.
(WebCore::Frame::visiblePositionForPoint):
* page/Frame.h:
Source/WebKit2:
* WebProcess/WebPage/WebPage.h: Some const cleanup.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::innerFrameQuad): null check assistedNode.rootEditableElement()
(WebKit::constrainPoint):
(WebKit::WebPage::selectWithGesture):
(WebKit::WebPage::visiblePositionInFocusedNodeForPoint):
(WebKit::WebPage::selectPositionAtPoint):
(WebKit::WebPage::selectPositionAtBoundaryWithDirection):
(WebKit::WebPage::selectTextWithGranularityAtPoint):
(WebKit::WebPage::updateSelectionWithExtentPoint):
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebCore/ChangeLog 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-10 Zalan Bujtas <zalan@apple.com>
+
+ Crash at WebCore::WebPage::innerFrameQuad.
+ https://bugs.webkit.org/show_bug.cgi?id=146843
+ rdar://problem/21501819
+
+ Reviewed by Andreas Kling.
+
+ We may end up with a null rootEditableElement() after calling Document::updateLayout().
+
+ Speculative fix. Not reproducible.
+
+ * page/Frame.cpp: Some const cleanup.
+ (WebCore::Frame::visiblePositionForPoint):
+ * page/Frame.h:
+
</ins><span class="cx"> 2015-07-10 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in HistoryController::updateForCommit dereferencing a null HistoryItem.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> return document() ? document()->displayStringModifiedByEncoding(str) : str;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-VisiblePosition Frame::visiblePositionForPoint(const IntPoint& framePoint)
</del><ins>+VisiblePosition Frame::visiblePositionForPoint(const IntPoint& framePoint) const
</ins><span class="cx"> {
</span><span class="cx"> HitTestResult result = eventHandler().hitTestResultAtPoint(framePoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
</span><span class="cx"> Node* node = result.innerNonSharedNode();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebCore/page/Frame.h 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String displayStringModifiedByEncoding(const String&) const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT VisiblePosition visiblePositionForPoint(const IntPoint& framePoint);
</del><ins>+ WEBCORE_EXPORT VisiblePosition visiblePositionForPoint(const IntPoint& framePoint) const;
</ins><span class="cx"> Document* documentAtPoint(const IntPoint& windowPoint);
</span><span class="cx"> WEBCORE_EXPORT RefPtr<Range> rangeForPoint(const IntPoint& framePoint);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-07-10 Zalan Bujtas <zalan@apple.com>
+
+ Crash at WebCore::WebPage::innerFrameQuad.
+ https://bugs.webkit.org/show_bug.cgi?id=146843
+ rdar://problem/21501819
+
+ Reviewed by Andreas Kling.
+
+ We may end up with a null rootEditableElement() after calling Document::updateLayout().
+
+ Speculative fix. Not reproducible.
+
+ * WebProcess/WebPage/WebPage.h: Some const cleanup.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::innerFrameQuad): null check assistedNode.rootEditableElement()
+ (WebKit::constrainPoint):
+ (WebKit::WebPage::selectWithGesture):
+ (WebKit::WebPage::visiblePositionInFocusedNodeForPoint):
+ (WebKit::WebPage::selectPositionAtPoint):
+ (WebKit::WebPage::selectPositionAtBoundaryWithDirection):
+ (WebKit::WebPage::selectTextWithGranularityAtPoint):
+ (WebKit::WebPage::updateSelectionWithExtentPoint):
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2015-07-09 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Document picker has overlapping icons on iPad
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> void completeSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
</span><span class="cx"> void sendTapHighlightForNodeIfNecessary(uint64_t requestID, WebCore::Node*);
</span><span class="cx"> void resetTextAutosizingBeforeLayoutIfNeeded(const WebCore::FloatSize& oldSize, const WebCore::FloatSize& newSize);
</span><del>- WebCore::VisiblePosition visiblePositionInFocusedNodeForPoint(WebCore::Frame&, const WebCore::IntPoint&);
</del><ins>+ WebCore::VisiblePosition visiblePositionInFocusedNodeForPoint(const WebCore::Frame&, const WebCore::IntPoint&);
</ins><span class="cx"> void volatilityTimerFired();
</span><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (186683 => 186684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-10 19:01:51 UTC (rev 186683)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-10 20:19:52 UTC (rev 186684)
</span><span class="lines">@@ -793,14 +793,14 @@
</span><span class="cx"> send(Messages::WebPageProxy::DisableInspectorNodeSearch());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static FloatQuad innerFrameQuad(Frame* frame, Node* assistedNode)
</del><ins>+static FloatQuad innerFrameQuad(const Frame& frame, const Node& assistedNode)
</ins><span class="cx"> {
</span><del>- frame->document()->updateLayoutIgnorePendingStylesheets();
- RenderObject* renderer;
- if (assistedNode->hasTagName(HTMLNames::textareaTag) || assistedNode->hasTagName(HTMLNames::inputTag) || assistedNode->hasTagName(HTMLNames::selectTag))
- renderer = assistedNode->renderer();
- else
- renderer = assistedNode->rootEditableElement()->renderer();
</del><ins>+ frame.document()->updateLayoutIgnorePendingStylesheets();
+ RenderElement* renderer = nullptr;
+ if (assistedNode.hasTagName(HTMLNames::textareaTag) || assistedNode.hasTagName(HTMLNames::inputTag) || assistedNode.hasTagName(HTMLNames::selectTag))
+ renderer = downcast<RenderElement>(assistedNode.renderer());
+ else if (Element* rootEditableElement = assistedNode.rootEditableElement())
+ renderer = rootEditableElement->renderer();
</ins><span class="cx">
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return FloatQuad();
</span><span class="lines">@@ -815,9 +815,9 @@
</span><span class="cx"> return FloatQuad(boundingBox);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IntPoint constrainPoint(const IntPoint& point, Frame* frame, Node* assistedNode)
</del><ins>+static IntPoint constrainPoint(const IntPoint& point, const Frame& frame, const Node& assistedNode)
</ins><span class="cx"> {
</span><del>- ASSERT(!assistedNode || &assistedNode->document() == frame->document());
</del><ins>+ ASSERT(&assistedNode.document() == frame.document());
</ins><span class="cx"> const int DEFAULT_CONSTRAIN_INSET = 2;
</span><span class="cx"> IntRect innerFrame = innerFrameQuad(frame, assistedNode).enclosingBoundingBox();
</span><span class="cx"> IntPoint constrainedPoint = point;
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::selectWithGesture(const IntPoint& point, uint32_t granularity, uint32_t gestureType, uint32_t gestureState, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> if (position.isNull()) {
</span><span class="lines">@@ -1690,16 +1690,16 @@
</span><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-VisiblePosition WebPage::visiblePositionInFocusedNodeForPoint(Frame& frame, const IntPoint& point)
</del><ins>+VisiblePosition WebPage::visiblePositionInFocusedNodeForPoint(const Frame& frame, const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> IntPoint adjustedPoint(frame.view()->rootViewToContents(point));
</span><del>- IntPoint constrainedPoint = m_assistedNode ? constrainPoint(adjustedPoint, &frame, m_assistedNode.get()) : adjustedPoint;
</del><ins>+ IntPoint constrainedPoint = m_assistedNode ? constrainPoint(adjustedPoint, frame, *m_assistedNode) : adjustedPoint;
</ins><span class="cx"> return frame.visiblePositionForPoint(constrainedPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::selectPositionAtPoint(const WebCore::IntPoint& point, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> if (position.isNotNull())
</span><span class="lines">@@ -1709,7 +1709,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::selectPositionAtBoundaryWithDirection(const WebCore::IntPoint& point, uint32_t granularity, uint32_t direction, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> if (position.isNotNull()) {
</span><span class="lines">@@ -1736,7 +1736,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::selectTextWithGranularityAtPoint(const WebCore::IntPoint& point, uint32_t granularity, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> range;
</span><span class="lines">@@ -1769,7 +1769,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::updateSelectionWithExtentPoint(const WebCore::IntPoint& point, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> if (position.isNull()) {
</span><span class="lines">@@ -2113,13 +2113,13 @@
</span><span class="cx"> info.point = point;
</span><span class="cx"> info.nodeAtPositionIsAssistedNode = (hitNode == m_assistedNode);
</span><span class="cx"> if (m_assistedNode) {
</span><del>- Frame& frame = m_page->focusController().focusedOrMainFrame();
</del><ins>+ const Frame& frame = m_page->focusController().focusedOrMainFrame();
</ins><span class="cx"> if (frame.editor().hasComposition()) {
</span><span class="cx"> const uint32_t kHitAreaWidth = 66;
</span><span class="cx"> const uint32_t kHitAreaHeight = 66;
</span><span class="cx"> FrameView& view = *frame.view();
</span><span class="cx"> IntPoint adjustedPoint(view.rootViewToContents(point));
</span><del>- IntPoint constrainedPoint = m_assistedNode ? constrainPoint(adjustedPoint, &frame, m_assistedNode.get()) : adjustedPoint;
</del><ins>+ IntPoint constrainedPoint = m_assistedNode ? constrainPoint(adjustedPoint, frame, *m_assistedNode) : adjustedPoint;
</ins><span class="cx"> VisiblePosition position = frame.visiblePositionForPoint(constrainedPoint);
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> compositionRange = frame.editor().compositionRange();
</span></span></pre>
</div>
</div>
</body>
</html>