<!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>[164945] 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/164945">164945</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-02 11:36:12 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change public text iterator API implementations to not depend on 16-bit character pointers
https://bugs.webkit.org/show_bug.cgi?id=129566
Reviewed by Anders Carlsson.
Source/WebKit/mac:
* WebView/WebTextIterator.mm:
(-[WebTextIterator initWithRange:]): Use make_unique instead of adoptPtr.
(-[WebTextIterator advance]): Clear out the upconverted text since we are moving on to the
next text.
(-[WebTextIterator currentTextPointer]): Upconvert if we have 8-bit text.
(-[WebTextIterator currentTextLength]): Call TextIterator::text().length() since we will
probably be removing TextIterator::length eventually.
Source/WebKit2:
* WebView/WebTextIterator.mm:
(-[WKDOMTextIterator initWithRange:]): Use make_unique instead of adoptPtr.
(-[WKDOMTextIterator advance]): Clear out the upconverted text since we are moving on to the
next text.
(-[WKDOMTextIterator currentTextPointer]): Upconvert if we have 8-bit text.
(-[WKDOMTextIterator currentTextLength]): Call TextIterator::text().length() since we will
probably be removing TextIterator::length eventually.
* WebProcess/WebCoreSupport/WebEditorClient.cpp: Removed unneded include of TextIterator.h.
* WebProcess/WebPage/WebPage.cpp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebTextIteratormm">trunk/Source/WebKit/mac/WebView/WebTextIterator.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratormm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-02 Darin Adler <darin@apple.com>
+
+ Change public text iterator API implementations to not depend on 16-bit character pointers
+ https://bugs.webkit.org/show_bug.cgi?id=129566
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebTextIterator.mm:
+ (-[WebTextIterator initWithRange:]): Use make_unique instead of adoptPtr.
+ (-[WebTextIterator advance]): Clear out the upconverted text since we are moving on to the
+ next text.
+ (-[WebTextIterator currentTextPointer]): Upconvert if we have 8-bit text.
+ (-[WebTextIterator currentTextLength]): Call TextIterator::text().length() since we will
+ probably be removing TextIterator::length eventually.
+
</ins><span class="cx"> 2014-03-01 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] selectionImageForcingBlackText should return autoreleased object
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebTextIteratormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebTextIterator.mm (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit/mac/WebView/WebTextIterator.mm 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2014 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -35,12 +35,10 @@
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><del>-using namespace JSC;
-using namespace WebCore;
-
</del><span class="cx"> @interface WebTextIteratorPrivate : NSObject {
</span><span class="cx"> @public
</span><del>- OwnPtr<TextIterator> _textIterator;
</del><ins>+ std::unique_ptr<WebCore::TextIterator> _textIterator;
+ Vector<unichar> _upconvertedText;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -73,13 +71,14 @@
</span><span class="cx"> return self;
</span><span class="cx">
</span><span class="cx"> _private = [[WebTextIteratorPrivate alloc] init];
</span><del>- _private->_textIterator = adoptPtr(new TextIterator(core(range)));
</del><ins>+ _private->_textIterator = std::make_unique<WebCore::TextIterator>(core(range));
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)advance
</span><span class="cx"> {
</span><span class="cx"> _private->_textIterator->advance();
</span><ins>+ _private->_upconvertedText.shrink(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)atEnd
</span><span class="lines">@@ -92,14 +91,24 @@
</span><span class="cx"> return kit(_private->_textIterator->range().get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (const unichar *)currentTextPointer
</del><ins>+// FIXME: Consider deprecating this method and creating one that does not require copying 8-bit characters.
+- (const unichar*)currentTextPointer
</ins><span class="cx"> {
</span><del>- return _private->_textIterator->deprecatedTextIteratorCharacters();
</del><ins>+ StringView text = _private->_textIterator->text();
+ unsigned length = text.length();
+ if (!length)
+ return nullptr;
+ if (!text.is8Bit())
+ return text.characters16();
+ if (_private->_upconvertedText.isEmpty())
+ _private->_upconvertedText.appendRange(text.characters8(), text.characters8() + length);
+ ASSERT(_private->_upconvertedText.size() == text.length());
+ return _private->_upconvertedText.data();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSUInteger)currentTextLength
</span><span class="cx"> {
</span><del>- return _private->_textIterator->length();
</del><ins>+ return _private->_textIterator->text().length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-02 Darin Adler <darin@apple.com>
+
+ Change public text iterator API implementations to not depend on 16-bit character pointers
+ https://bugs.webkit.org/show_bug.cgi?id=129566
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebTextIterator.mm:
+ (-[WKDOMTextIterator initWithRange:]): Use make_unique instead of adoptPtr.
+ (-[WKDOMTextIterator advance]): Clear out the upconverted text since we are moving on to the
+ next text.
+ (-[WKDOMTextIterator currentTextPointer]): Upconvert if we have 8-bit text.
+ (-[WKDOMTextIterator currentTextLength]): Call TextIterator::text().length() since we will
+ probably be removing TextIterator::length eventually.
+
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp: Removed unneded include of TextIterator.h.
+ * WebProcess/WebPage/WebPage.cpp: Ditto.
+
</ins><span class="cx"> 2014-03-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Make impossible to build with <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> included together
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> #import "WKDOMInternals.h"
</span><span class="cx"> #import "WKDOMRange.h"
</span><span class="cx"> #import <WebCore/TextIterator.h>
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> @interface WKDOMTextIterator () {
</span><span class="cx"> @public
</span><del>- OwnPtr<WebCore::TextIterator> _textIterator;
</del><ins>+ std::unique_ptr<WebCore::TextIterator> _textIterator;
+ Vector<unichar> _upconvertedText;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -47,14 +47,14 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _textIterator = adoptPtr(new WebCore::TextIterator(WebKit::toWebCoreRange(range)));
-
</del><ins>+ _textIterator = std::make_unique<WebCore::TextIterator>(WebKit::toWebCoreRange(range));
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)advance
</span><span class="cx"> {
</span><span class="cx"> _textIterator->advance();
</span><ins>+ _upconvertedText.shrink(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)atEnd
</span><span class="lines">@@ -67,14 +67,24 @@
</span><span class="cx"> return WebKit::toWKDOMRange(_textIterator->range().get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (const unichar *)currentTextPointer
</del><ins>+// FIXME: Consider deprecating this method and creating one that does not require copying 8-bit characters.
+- (const unichar*)currentTextPointer
</ins><span class="cx"> {
</span><del>- return _textIterator->deprecatedTextIteratorCharacters();
</del><ins>+ StringView text = _textIterator->text();
+ unsigned length = text.length();
+ if (!length)
+ return nullptr;
+ if (!text.is8Bit())
+ return text.characters16();
+ if (_upconvertedText.isEmpty())
+ _upconvertedText.appendRange(text.characters8(), text.characters8() + length);
+ ASSERT(_upconvertedText.size() == text.length());
+ return _upconvertedText.data();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSUInteger)currentTextLength
</span><span class="cx"> {
</span><del>- return _textIterator->length();
</del><ins>+ return _textIterator->text().length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/SpellChecker.h>
</span><span class="cx"> #include <WebCore/StyleProperties.h>
</span><del>-#include <WebCore/TextIterator.h>
</del><span class="cx"> #include <WebCore/UndoStep.h>
</span><span class="cx"> #include <WebCore/UserTypingGestureIndicator.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164944 => 164945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-02 18:25:32 UTC (rev 164944)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-02 19:36:12 UTC (rev 164945)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <WebCore/SubframeLoader.h>
</span><span class="cx"> #include <WebCore/SubstituteData.h>
</span><del>-#include <WebCore/TextIterator.h>
</del><span class="cx"> #include <WebCore/UserInputBridge.h>
</span><span class="cx"> #include <WebCore/VisiblePosition.h>
</span><span class="cx"> #include <WebCore/VisibleUnits.h>
</span></span></pre>
</div>
</div>
</body>
</html>