<!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>[160067] 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/160067">160067</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 21:20:48 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove nodeIsDetachedFromDocument and visualWordMovementEnabled in FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=125210
Reviewed by Antti Koivisto.
Inspired by https://chromium.googlesource.com/chromium/blink/+/92409870f0ff8fafe31217830db0838a9e1ffb98
Removed some unused code.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::textWasReplaced):
* editing/FrameSelection.h:
* page/Settings.in:</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="#trunkSourceWebCorehtmlHTMLElementidl">trunk/Source/WebCore/html/HTMLElement.idl</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160066 => 160067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-04 05:05:29 UTC (rev 160066)
+++ trunk/Source/WebCore/ChangeLog 2013-12-04 05:20:48 UTC (rev 160067)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Remove nodeIsDetachedFromDocument and visualWordMovementEnabled in FrameSelection
+ https://bugs.webkit.org/show_bug.cgi?id=125210
+
+ Reviewed by Antti Koivisto.
+
+ Inspired by https://chromium.googlesource.com/chromium/blink/+/92409870f0ff8fafe31217830db0838a9e1ffb98
+
+ Removed some unused code.
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::textWasReplaced):
+ * editing/FrameSelection.h:
+ * page/Settings.in:
+
+2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Potential crash in RenderView::selectionBounds and RenderView::repaintSelection
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125207
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (160066 => 160067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-04 05:05:29 UTC (rev 160066)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-04 05:20:48 UTC (rev 160067)
</span><span class="lines">@@ -434,17 +434,10 @@
</span><span class="cx"> ASSERT(static_cast<unsigned>(position.offsetInContainerNode()) <= node->length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool nodeIsDetachedFromDocument(Node* node)
-{
- ASSERT(node);
- Node* highest = highestAncestor(node);
- return highest->nodeType() == Node::DOCUMENT_FRAGMENT_NODE && !highest->isShadowRoot();
-}
-
</del><span class="cx"> void FrameSelection::textWasReplaced(CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength)
</span><span class="cx"> {
</span><span class="cx"> // The fragment check is a performance optimization. See http://trac.webkit.org/changeset/30062.
</span><del>- if (isNone() || !node || nodeIsDetachedFromDocument(node))
</del><ins>+ if (isNone() || !node || !node->inDocument())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Position base = m_selection.base();
</span><span class="lines">@@ -2055,13 +2048,6 @@
</span><span class="cx"> return selectStartTarget->dispatchEvent(Event::create(eventNames().selectstartEvent, true, true));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool FrameSelection::visualWordMovementEnabled() const
-{
- if (!m_frame)
- return false;
- return m_frame->settings().visualWordMovementEnabled();
-}
-
</del><span class="cx"> void FrameSelection::setShouldShowBlockCursor(bool shouldShowBlockCursor)
</span><span class="cx"> {
</span><span class="cx"> m_shouldShowBlockCursor = shouldShowBlockCursor;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (160066 => 160067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2013-12-04 05:05:29 UTC (rev 160066)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2013-12-04 05:20:48 UTC (rev 160067)
</span><span class="lines">@@ -288,8 +288,6 @@
</span><span class="cx"> void setCaretVisibility(CaretVisibility);
</span><span class="cx">
</span><span class="cx"> bool dispatchSelectStart();
</span><del>-
- bool visualWordMovementEnabled() const;
</del><span class="cx">
</span><span class="cx"> Frame* m_frame;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.idl (160066 => 160067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.idl 2013-12-04 05:05:29 UTC (rev 160066)
+++ trunk/Source/WebCore/html/HTMLElement.idl 2013-12-04 05:20:48 UTC (rev 160067)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> [RaisesException] Element insertAdjacentElement([Default=Undefined] optional DOMString where,
</span><span class="cx"> [Default=Undefined] optional Element element);
</span><span class="cx"> [RaisesException] void insertAdjacentHTML([Default=Undefined] optional DOMString where,
</span><del>- [Default=Undefined] optional DOMString html);
</del><ins>+ x [Default=Undefined] optional DOMString html);
</ins><span class="cx"> [RaisesException] void insertAdjacentText([Default=Undefined] optional DOMString where,
</span><span class="cx"> [Default=Undefined] optional DOMString text);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (160066 => 160067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2013-12-04 05:05:29 UTC (rev 160066)
+++ trunk/Source/WebCore/page/Settings.in 2013-12-04 05:20:48 UTC (rev 160067)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> suppressesIncrementalRendering initial=false
</span><span class="cx"> incrementalRenderingSuppressionTimeoutInSeconds type=double, initial=defaultIncrementalRenderingSuppressionTimeoutInSeconds
</span><span class="cx"> backspaceKeyNavigationEnabled initial=true
</span><del>-visualWordMovementEnabled initial=false
</del><span class="cx"> shouldDisplaySubtitles initial=false, conditional=VIDEO_TRACK
</span><span class="cx"> shouldDisplayCaptions initial=false, conditional=VIDEO_TRACK
</span><span class="cx"> shouldDisplayTextDescriptions initial=false, conditional=VIDEO_TRACK
</span></span></pre>
</div>
</div>
</body>
</html>