<!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>[202814] trunk</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/202814">202814</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-04 23:43:42 -0700 (Mon, 04 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Null Node dereference in FrameSelection::notifyAccessibilityForSelectionChange of FrameSelectionAtk.cpp
https://bugs.webkit.org/show_bug.cgi?id=159411
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-07-04
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Tests:
editing/selection/selection-in-iframe-removed-crash.html
* editing/atk/FrameSelectionAtk.cpp:
(WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
Added a null check for the return value of containerNode().
LayoutTests:
* platform/gtk/TestExpectations: Removed a crash expectation of
editing/selection/selection-in-iframe-removed-crash.html.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingatkFrameSelectionAtkcpp">trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202813 => 202814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-05 06:35:42 UTC (rev 202813)
+++ trunk/LayoutTests/ChangeLog        2016-07-05 06:43:42 UTC (rev 202814)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-04 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [GTK] Null Node dereference in FrameSelection::notifyAccessibilityForSelectionChange of FrameSelectionAtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=159411
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/gtk/TestExpectations: Removed a crash expectation of
+ editing/selection/selection-in-iframe-removed-crash.html.
+
</ins><span class="cx"> 2016-07-04 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Shield WebRTC JS built-ins from user scripts
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (202813 => 202814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations        2016-07-05 06:35:42 UTC (rev 202813)
+++ trunk/LayoutTests/platform/gtk/TestExpectations        2016-07-05 06:43:42 UTC (rev 202814)
</span><span class="lines">@@ -730,8 +730,6 @@
</span><span class="cx"> webkit.org/b/110695 http/tests/security/cross-origin-local-storage.html [ Crash Pass ]
</span><span class="cx"> webkit.org/b/110695 http/tests/security/cross-origin-plugin-allowed.html [ Crash Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/111451 [ Debug ] editing/selection/selection-in-iframe-removed-crash.html [ Crash Pass ]
-
</del><span class="cx"> webkit.org/b/111902 [ Debug ] http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html [ Crash ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/118422 [ Debug ] http/tests/security/XFrameOptions/x-frame-options-cached.html [ Crash Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202813 => 202814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-05 06:35:42 UTC (rev 202813)
+++ trunk/Source/WebCore/ChangeLog        2016-07-05 06:43:42 UTC (rev 202814)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-04 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [GTK] Null Node dereference in FrameSelection::notifyAccessibilityForSelectionChange of FrameSelectionAtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=159411
+
+ Reviewed by Carlos Garcia Campos.
+
+ Tests:
+ editing/selection/selection-in-iframe-removed-crash.html
+
+ * editing/atk/FrameSelectionAtk.cpp:
+ (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
+ Added a null check for the return value of containerNode().
+
</ins><span class="cx"> 2016-07-04 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove mac configuration dependency in WebKit Version definition
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingatkFrameSelectionAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp (202813 => 202814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp        2016-07-05 06:35:42 UTC (rev 202813)
+++ trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp        2016-07-05 06:43:42 UTC (rev 202814)
</span><span class="lines">@@ -92,12 +92,15 @@
</span><span class="cx"> if (!m_selection.start().isNotNull() || !m_selection.end().isNotNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderObject* focusedNode = m_selection.end().containerNode()->renderer();
</del><ins>+ Node* focusedNode = m_selection.end().containerNode();
+ if (!focusedNode)
+ return;
+
</ins><span class="cx"> AXObjectCache* cache = m_frame->document()->existingAXObjectCache();
</span><span class="cx"> if (!cache)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AccessibilityObject* accessibilityObject = cache->getOrCreate(focusedNode);
</del><ins>+ AccessibilityObject* accessibilityObject = cache->getOrCreate(focusedNode->renderer());
</ins><span class="cx"> if (!accessibilityObject)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>