<!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>[164957] 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/164957">164957</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-02 17:02:36 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split TextIteratorBehavior into a separate header
https://bugs.webkit.org/show_bug.cgi?id=129578
Reviewed by Sam Weinig.
Source/WebCore:
This is in preparation to greatly cut down on includes of TextIterator.h.
* GNUmakefile.list.am: Added new header.
* WebCore.vcxproj/WebCore.vcxproj: Ditto.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* editing/FindOptions.h: Changed typedef to unsigned char;
there is no reason to store these in a 32-bit integer.
* editing/TextIterator.h: Added include of TextIteratorBehavior.h
and moved comments about the meanings of flag bits to their definition.
* editing/TextIteratorBehavior.h: Added.
* WebCore.exp.in: Updated for type changes.
Tools:
* Scripts/sort-export-file: Added special cases to the script so you can just paste link errors
from WebKit in and the script will add them in as unconditional exports. This makes the "add"
task easy, but the remove is still a bit of a pain.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreeditingFindOptionsh">trunk/Source/WebCore/editing/FindOptions.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorh">trunk/Source/WebCore/editing/TextIterator.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptssortexportfile">trunk/Tools/Scripts/sort-export-file</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreeditingTextIteratorBehaviorh">trunk/Source/WebCore/editing/TextIteratorBehavior.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-02 Darin Adler <darin@apple.com>
+
+ Split TextIteratorBehavior into a separate header
+ https://bugs.webkit.org/show_bug.cgi?id=129578
+
+ Reviewed by Sam Weinig.
+
+ This is in preparation to greatly cut down on includes of TextIterator.h.
+
+ * GNUmakefile.list.am: Added new header.
+ * WebCore.vcxproj/WebCore.vcxproj: Ditto.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+ * editing/FindOptions.h: Changed typedef to unsigned char;
+ there is no reason to store these in a 32-bit integer.
+
+ * editing/TextIterator.h: Added include of TextIteratorBehavior.h
+ and moved comments about the meanings of flag bits to their definition.
+
+ * editing/TextIteratorBehavior.h: Added.
+
+ * WebCore.exp.in: Updated for type changes.
+
</ins><span class="cx"> 2014-03-02 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Form controls handling
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -3158,6 +3158,7 @@
</span><span class="cx"> Source/WebCore/editing/TextInsertionBaseCommand.h \
</span><span class="cx"> Source/WebCore/editing/TextIterator.cpp \
</span><span class="cx"> Source/WebCore/editing/TextIterator.h \
</span><ins>+ Source/WebCore/editing/TextIteratorBehavior.h \
</ins><span class="cx"> Source/WebCore/editing/TypingCommand.cpp \
</span><span class="cx"> Source/WebCore/editing/TypingCommand.h \
</span><span class="cx"> Source/WebCore/editing/UndoStep.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> __ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERmS6_
</span><span class="cx"> __ZN7WebCore12TextIterator7advanceEv
</span><span class="cx"> __ZN7WebCore12TextIterator8subrangeEPNS_5RangeEii
</span><del>-__ZN7WebCore12TextIteratorC1EPKNS_5RangeENS_20TextIteratorBehaviorE
</del><ins>+__ZN7WebCore12TextIteratorC1EPKNS_5RangeEt
</ins><span class="cx"> __ZN7WebCore12TextIteratorD1Ev
</span><span class="cx"> __ZN7WebCore12UTF8EncodingEv
</span><span class="cx"> __ZN7WebCore12UserActivity7startedEv
</span><span class="lines">@@ -1007,20 +1007,20 @@
</span><span class="cx"> __ZN7WebCore4Node17stopIgnoringLeaksEv
</span><span class="cx"> __ZN7WebCore4Node18startIgnoringLeaksEv
</span><span class="cx"> __ZN7WebCore4Node19setNeedsStyleRecalcENS_15StyleChangeTypeE
</span><del>-__ZN7WebCore4Page10findStringERKN3WTF6StringEj
</del><ins>+__ZN7WebCore4Page10findStringERKN3WTF6StringEh
</ins><span class="cx"> __ZN7WebCore4Page11PageClientsC1Ev
</span><span class="cx"> __ZN7WebCore4Page11PageClientsD1Ev
</span><span class="cx"> __ZN7WebCore4Page12setGroupNameERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore4Page12setIsVisibleEb
</span><span class="cx"> __ZN7WebCore4Page12setSessionIDENS_9SessionIDE
</span><span class="cx"> __ZN7WebCore4Page12setViewStateEj
</span><del>-__ZN7WebCore4Page13rangeOfStringERKN3WTF6StringEPNS_5RangeEj
</del><ins>+__ZN7WebCore4Page13rangeOfStringERKN3WTF6StringEPNS_5RangeEh
</ins><span class="cx"> __ZN7WebCore4Page13setIsInWindowEb
</span><span class="cx"> __ZN7WebCore4Page13setPaginationERKNS_10PaginationE
</span><span class="cx"> __ZN7WebCore4Page14setIsPrerenderEv
</span><span class="cx"> __ZN7WebCore4Page14setMediaVolumeEf
</span><span class="cx"> __ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
</span><del>-__ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEjj
</del><ins>+__ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEhj
</ins><span class="cx"> __ZN7WebCore4Page16setCanStartMediaEb
</span><span class="cx"> __ZN7WebCore4Page16setDefersLoadingEb
</span><span class="cx"> __ZN7WebCore4Page18removeSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
</span><span class="lines">@@ -1029,13 +1029,13 @@
</span><span class="cx"> __ZN7WebCore4Page20scrollingCoordinatorEv
</span><span class="cx"> __ZN7WebCore4Page20setDeviceScaleFactorEf
</span><span class="cx"> __ZN7WebCore4Page20unmarkAllTextMatchesEv
</span><del>-__ZN7WebCore4Page21markAllMatchesForTextERKN3WTF6StringEjbj
</del><ins>+__ZN7WebCore4Page21markAllMatchesForTextERKN3WTF6StringEhbj
</ins><span class="cx"> __ZN7WebCore4Page21resumeAnimatingImagesEv
</span><span class="cx"> __ZN7WebCore4Page22nonFastScrollableRectsEPKNS_5FrameE
</span><span class="cx"> __ZN7WebCore4Page22removeLayoutMilestonesEj
</span><span class="cx"> __ZN7WebCore4Page23clearUndoRedoOperationsEv
</span><span class="cx"> __ZN7WebCore4Page23invalidateStylesForLinkEy
</span><del>-__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEjiPNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
</del><ins>+__ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEhiPNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
</ins><span class="cx"> __ZN7WebCore4Page24resumeScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page24scrollingStateTreeAsTextEv
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span><span class="lines">@@ -1098,7 +1098,7 @@
</span><span class="cx"> __ZN7WebCore6Chrome16setStatusbarTextEPNS_5FrameERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore6Chrome5printEPNS_5FrameE
</span><span class="cx"> __ZN7WebCore6Editor10applyStyleEPNS_15StylePropertiesENS_10EditActionE
</span><del>-__ZN7WebCore6Editor10findStringERKN3WTF6StringEj
</del><ins>+__ZN7WebCore6Editor10findStringERKN3WTF6StringEh
</ins><span class="cx"> __ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
</span><span class="cx"> __ZN7WebCore6Editor13performDeleteEv
</span><span class="cx"> __ZN7WebCore6Editor13rangeForPointERKNS_8IntPointE
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx"> __ZN7WebCore6Editor18confirmCompositionERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore6Editor18confirmCompositionEv
</span><span class="cx"> __ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20DictationAlternativeELm0ENS1_15CrashOnOverflowEEEPNS_5EventE
</span><del>-__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEjjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
</del><ins>+__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEhjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
</ins><span class="cx"> __ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
</span><span class="cx"> __ZN7WebCore6Editor19insertUnorderedListEv
</span><span class="cx"> __ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
</span><span class="lines">@@ -1431,7 +1431,7 @@
</span><span class="cx"> __ZN7WebCore9fontCacheEv
</span><span class="cx"> __ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
</span><span class="cx"> __ZN7WebCore9pageCacheEv
</span><del>-__ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorEb
</del><ins>+__ZN7WebCore9plainTextEPKNS_5RangeEtb
</ins><span class="cx"> __ZN7WebCore9toElementEN3JSC7JSValueE
</span><span class="cx"> __ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZNK3JSC8Bindings10RootObject12globalObjectEv
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -20172,6 +20172,7 @@
</span><span class="cx"> <ClInclude Include="..\editing\TextGranularity.h" />
</span><span class="cx"> <ClInclude Include="..\editing\TextInsertionBaseCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\TextIterator.h" />
</span><ins>+ <ClInclude Include="..\editing\TextIteratorBehavior.h" />
</ins><span class="cx"> <ClInclude Include="..\editing\TypingCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\UndoStep.h" />
</span><span class="cx"> <ClInclude Include="..\editing\UnlinkCommand.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -10565,6 +10565,9 @@
</span><span class="cx"> <ClInclude Include="..\editing\TextIterator.h">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\editing\TextIteratorBehavior.h">
+ <Filter>editing</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\editing\TypingCommand.h">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -3152,6 +3152,7 @@
</span><span class="cx"> 9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391A990162746CB00297330 /* ScrollingCoordinatorMac.h */; };
</span><span class="cx"> 9391A99C1629D70000297330 /* ScrollingTreeScrollingNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9391A99A1629D6FF00297330 /* ScrollingTreeScrollingNode.cpp */; };
</span><span class="cx"> 9391A99D1629D70000297330 /* ScrollingTreeScrollingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391A99B1629D70000297330 /* ScrollingTreeScrollingNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 9392146918A6D791000EE688 /* TextIteratorBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392146818A6D791000EE688 /* TextIteratorBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9392262D1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9392262C1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp */; };
</span><span class="cx"> 9392262F10321084006E7D5D /* JSCSSRuleListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */; };
</span><span class="cx"> 9392F1420AD185F400691BD4 /* RenderCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9392F1410AD185F400691BD4 /* RenderCounter.h */; };
</span><span class="lines">@@ -10088,6 +10089,7 @@
</span><span class="cx"> 9391A990162746CB00297330 /* ScrollingCoordinatorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingCoordinatorMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 9391A99A1629D6FF00297330 /* ScrollingTreeScrollingNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeScrollingNode.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9391A99B1629D70000297330 /* ScrollingTreeScrollingNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeScrollingNode.h; sourceTree = "<group>"; };
</span><ins>+ 9392146818A6D791000EE688 /* TextIteratorBehavior.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIteratorBehavior.h; sourceTree = "<group>"; };
</ins><span class="cx"> 9392262C1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCanvasElementCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSRuleListCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9392F1410AD185F400691BD4 /* RenderCounter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderCounter.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16980,6 +16982,7 @@
</span><span class="cx"> CECADFCC1537791D00E37068 /* TextInsertionBaseCommand.h */,
</span><span class="cx"> 93309DCC099E64910056E581 /* TextIterator.cpp */,
</span><span class="cx"> 93309DCD099E64910056E581 /* TextIterator.h */,
</span><ins>+ 9392146818A6D791000EE688 /* TextIteratorBehavior.h */,
</ins><span class="cx"> 93309DCA099E64910056E581 /* TypingCommand.cpp */,
</span><span class="cx"> 93309DCB099E64910056E581 /* TypingCommand.h */,
</span><span class="cx"> 9B2D8A7814997CCF00ECEF3E /* UndoStep.h */,
</span><span class="lines">@@ -23553,6 +23556,7 @@
</span><span class="cx"> FD31609512B026F700C1A359 /* FFTConvolver.h in Headers */,
</span><span class="cx"> FD31609712B026F700C1A359 /* FFTFrame.h in Headers */,
</span><span class="cx"> 976D6C81122B8A3D001FD1F7 /* File.h in Headers */,
</span><ins>+ 9392146918A6D791000EE688 /* TextIteratorBehavior.h in Headers */,
</ins><span class="cx"> 066C772B0AB603B700238CC4 /* FileChooser.h in Headers */,
</span><span class="cx"> 976D6C83122B8A3D001FD1F7 /* FileError.h in Headers */,
</span><span class="cx"> 2EDF369F122C94C8002F7D4E /* FileException.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFindOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FindOptions.h (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FindOptions.h 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/editing/FindOptions.h 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> StartInSelection = 1 << 5
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef unsigned FindOptions;
</del><ins>+typedef unsigned char FindOptions;
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.h (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.h 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Source/WebCore/editing/TextIterator.h 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FindOptions.h"
</span><span class="cx"> #include "Range.h"
</span><ins>+#include "TextIteratorBehavior.h"
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="lines">@@ -37,19 +38,6 @@
</span><span class="cx"> class RenderText;
</span><span class="cx"> class RenderTextFragment;
</span><span class="cx">
</span><del>-enum TextIteratorBehavior {
- TextIteratorDefaultBehavior = 0,
- TextIteratorEmitsCharactersBetweenAllVisiblePositions = 1 << 0,
- TextIteratorEntersTextControls = 1 << 1,
- TextIteratorEmitsTextsWithoutTranscoding = 1 << 2,
- TextIteratorIgnoresStyleVisibility = 1 << 3,
- TextIteratorEmitsObjectReplacementCharacters = 1 << 4,
- TextIteratorEmitsOriginalText = 1 << 5,
- TextIteratorStopsOnFormControls = 1 << 6,
- TextIteratorEmitsImageAltText = 1 << 7,
- TextIteratorBehavesAsIfNodesFollowing = 1 << 8,
-};
-
</del><span class="cx"> // FIXME: Can't really answer this question correctly without knowing the white-space mode.
</span><span class="cx"> // FIXME: Move this somewhere else in the editing directory. It doesn't belong here.
</span><span class="cx"> inline bool isCollapsibleWhitespace(UChar c)
</span><span class="lines">@@ -63,8 +51,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String plainText(const Range*, TextIteratorBehavior defaultBehavior = TextIteratorDefaultBehavior, bool isDisplayString = false);
</del><ins>+String plainText(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior, bool isDisplayString = false);
</ins><span class="cx"> PassRefPtr<Range> findPlainText(const Range*, const String&, FindOptions);
</span><ins>+
+// FIXME: Move this somewhere else in the editing directory. It doesn't belong here.
</ins><span class="cx"> bool isRendererReplacedElement(RenderObject*);
</span><span class="cx">
</span><span class="cx"> class BitStack {
</span><span class="lines">@@ -176,25 +166,18 @@
</span><span class="cx"> // Used when deciding whether to emit a "positioning" (e.g. newline) before any other content
</span><span class="cx"> bool m_hasEmitted;
</span><span class="cx">
</span><del>- // Used by selection preservation code. There should be one character emitted between every VisiblePosition
- // in the Range used to create the TextIterator.
- // FIXME <rdar://problem/6028818>: This functionality should eventually be phased out when we rewrite
- // moveParagraphs to not clone/destroy moved content.
</del><span class="cx"> bool m_emitsCharactersBetweenAllVisiblePositions;
</span><span class="cx"> bool m_entersTextControls;
</span><del>-
- // Used when we want texts for copying, pasting, and transposing.
</del><span class="cx"> bool m_emitsTextWithoutTranscoding;
</span><del>- // Used in pasting inside password field.
</del><span class="cx"> bool m_emitsOriginalText;
</span><ins>+
</ins><span class="cx"> // Used when deciding text fragment created by :first-letter should be looked into.
</span><span class="cx"> bool m_handledFirstLetter;
</span><del>- // Used when the visibility of the style should not affect text gathering.
</del><ins>+
</ins><span class="cx"> bool m_ignoresStyleVisibility;
</span><del>- // Used when emitting the special 0xFFFC character is required. Children for replaced objects will be ignored.
</del><span class="cx"> bool m_emitsObjectReplacementCharacters;
</span><del>- // Used when the iteration should stop if form controls are reached.
</del><span class="cx"> bool m_stopsOnFormControls;
</span><ins>+
</ins><span class="cx"> // Used when m_stopsOnFormControls is set to determine if the iterator should keep advancing.
</span><span class="cx"> bool m_shouldStop;
</span><span class="cx">
</span><span class="lines">@@ -318,8 +301,8 @@
</span><span class="cx"> SimplifiedBackwardsTextIterator m_textIterator;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// Very similar to the TextIterator, except that the chunks of text returned are "well behaved",
-// meaning they never end split up a word. This is useful for spellcheck or (perhaps one day) searching.
</del><ins>+// Very similar to the TextIterator, except that the chunks of text returned are "well behaved", meaning
+// they never split up a word. This is useful for spell checking and perhaps one day for searching as well.
</ins><span class="cx"> class WordAwareIterator {
</span><span class="cx"> public:
</span><span class="cx"> explicit WordAwareIterator(const Range*);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorBehaviorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/editing/TextIteratorBehavior.h (0 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIteratorBehavior.h (rev 0)
+++ trunk/Source/WebCore/editing/TextIteratorBehavior.h 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2004, 2006, 2009, 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TextIteratorBehavior_h
+#define TextIteratorBehavior_h
+
+namespace WebCore {
+
+enum TextIteratorBehaviorFlag {
+ TextIteratorDefaultBehavior = 0,
+
+ // Used by selection preservation code. There should be one character emitted between every VisiblePosition
+ // in the Range used to create the TextIterator.
+ // FIXME <rdar://problem/6028818>: This functionality should eventually be phased out when we rewrite
+ // moveParagraphs to not clone/destroy moved content.
+ TextIteratorEmitsCharactersBetweenAllVisiblePositions = 1 << 0,
+
+ TextIteratorEntersTextControls = 1 << 1,
+
+ // Used when we want text for copying, pasting, and transposing.
+ TextIteratorEmitsTextsWithoutTranscoding = 1 << 2,
+
+ // Used when the visibility of the style should not affect text gathering.
+ TextIteratorIgnoresStyleVisibility = 1 << 3,
+
+ // Used when emitting the special 0xFFFC character is required. Children for replaced objects will be ignored.
+ TextIteratorEmitsObjectReplacementCharacters = 1 << 4,
+
+ // Used when pasting inside password field.
+ TextIteratorEmitsOriginalText = 1 << 5,
+
+ TextIteratorStopsOnFormControls = 1 << 6,
+
+ TextIteratorEmitsImageAltText = 1 << 7,
+
+ TextIteratorBehavesAsIfNodesFollowing = 1 << 8,
+};
+
+typedef unsigned short TextIteratorBehavior;
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Tools/ChangeLog 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-03-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Split TextIteratorBehavior into a separate header
+ https://bugs.webkit.org/show_bug.cgi?id=129578
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/sort-export-file: Added special cases to the script so you can just paste link errors
+ from WebKit in and the script will add them in as unconditional exports. This makes the "add"
+ task easy, but the remove is still a bit of a pain.
+
+2014-03-02 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Sort Mac platform export files so they merge better
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129581
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptssortexportfile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/sort-export-file (164956 => 164957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/sort-export-file 2014-03-03 00:30:26 UTC (rev 164956)
+++ trunk/Tools/Scripts/sort-export-file 2014-03-03 01:02:36 UTC (rev 164957)
</span><span class="lines">@@ -118,6 +118,13 @@
</span><span class="cx"> addSymbol($1);
</span><span class="cx"> next;
</span><span class="cx"> }
</span><ins>+ if ($line =~ /^ \"(\.?[A-Za-z0-9_\?]+)\", referenced from:$/) { # For easy paste from build errors
+ addSymbol($1);
+ next;
+ }
+ if ($line =~ /^ .+ in .+\.o$/) { # For easy paste from build errors
+ next;
+ }
</ins><span class="cx"> chomp $line;
</span><span class="cx"> sawError("Could not parse: \"$line\"");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>