<!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>[182207] 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/182207">182207</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-03-31 14:34:33 -0700 (Tue, 31 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ExpansionBehaviorFlags and TextDirection to their own file
https://bugs.webkit.org/show_bug.cgi?id=143273
Reviewed by Simon Fraser.
This is a mechanical change. It just moves code around.
This is getting ready for https://bugs.webkit.org/show_bug.cgi?id=142608
Source/WebCore:
No new tests because there is no behavior change.
* Modules/notifications/Notification.h:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSPrimitiveValueMappings.h:
* css/CSSProperty.h:
* dom/Position.h:
* editing/VisiblePosition.h:
* editing/VisibleUnits.h:
* editing/htmlediting.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawTextInternal):
* html/canvas/CanvasRenderingContext2D.h:
* platform/LengthBox.h:
* platform/PopupMenuStyle.h:
* platform/graphics/FontCascade.h:
* platform/graphics/LayoutBoxExtent.h:
* platform/graphics/TextRun.h:
* platform/ios/SelectionRect.h:
* platform/text/BidiResolver.h:
* platform/text/StringWithDirection.h:
* platform/text/TextHelpers.h: Renamed from Source/WebCore/platform/text/TextDirection.h.
(WebCore::isLeftToRightDirection):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::paint):
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::selectionRect):
(WebCore::EllipsisBox::paintSelection):
* rendering/HitTestLocation.h:
* rendering/HitTestResult.h:
* rendering/InlineBox.h:
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::expansionBehavior):
* rendering/RenderBlock.cpp:
(WebCore::constructTextRunInternal):
(WebCore::RenderBlock::constructTextRun):
* rendering/RenderBlock.h:
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):
(WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidths):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::updateFromElement):
(WebCore::RenderListBox::paintItemForeground):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::computePreferredLogicalWidths):
(WebCore::RenderListMarker::getRelativeMarkerRect):
* rendering/RenderMenuList.cpp:
(RenderMenuList::updateOptionsWidth):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::getAverageCharWidth):
* rendering/RenderThemeIOS.mm:
* rendering/style/RenderStyle.h:
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::constructTextRun):
* rendering/svg/SVGTextMetrics.cpp:
(WebCore::SVGTextMetrics::constructTextRun):
Source/WebKit/ios:
* WebCoreSupport/WebFrameIOS.mm:
* WebCoreSupport/WebVisiblePosition.mm:
Source/WebKit2:
* Shared/WebPopupItem.h:
* UIProcess/API/C/efl/WKAPICastEfl.h:
* UIProcess/API/efl/EwkView.h:
* UIProcess/WebPopupMenuProxy.h:
* UIProcess/efl/WebUIPopupMenuClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationh">trunk/Source/WebCore/Modules/notifications/Notification.h</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="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyh">trunk/Source/WebCore/css/CSSProperty.h</a></li>
<li><a href="#trunkSourceWebCoredomPositionh">trunk/Source/WebCore/dom/Position.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositionh">trunk/Source/WebCore/editing/VisiblePosition.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitsh">trunk/Source/WebCore/editing/VisibleUnits.h</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthBoxh">trunk/Source/WebCore/platform/LengthBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPopupMenuStyleh">trunk/Source/WebCore/platform/PopupMenuStyle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutBoxExtenth">trunk/Source/WebCore/platform/graphics/LayoutBoxExtent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTextRunh">trunk/Source/WebCore/platform/graphics/TextRun.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosSelectionRecth">trunk/Source/WebCore/platform/ios/SelectionRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextBidiResolverh">trunk/Source/WebCore/platform/text/BidiResolver.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextStringWithDirectionh">trunk/Source/WebCore/platform/text/StringWithDirection.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingEllipsisBoxcpp">trunk/Source/WebCore/rendering/EllipsisBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestLocationh">trunk/Source/WebCore/rendering/HitTestLocation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResulth">trunk/Source/WebCore/rendering/HitTestResult.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxh">trunk/Source/WebCore/rendering/InlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricscpp">trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebVisiblePositionmm">trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPopupItemh">trunk/Source/WebKit2/Shared/WebPopupItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICeflWKAPICastEflh">trunk/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewh">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPopupMenuProxyh">trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebUIPopupMenuClienth">trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformtextTextFlagsh">trunk/Source/WebCore/platform/text/TextFlags.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformtextTextDirectionh">trunk/Source/WebCore/platform/text/TextDirection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/ChangeLog 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2015-03-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Move ExpansionBehaviorFlags and TextDirection to their own file
+ https://bugs.webkit.org/show_bug.cgi?id=143273
+
+ Reviewed by Simon Fraser.
+
+ This is a mechanical change. It just moves code around.
+
+ This is getting ready for https://bugs.webkit.org/show_bug.cgi?id=142608
+
+ No new tests because there is no behavior change.
+
+ * Modules/notifications/Notification.h:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSPrimitiveValueMappings.h:
+ * css/CSSProperty.h:
+ * dom/Position.h:
+ * editing/VisiblePosition.h:
+ * editing/VisibleUnits.h:
+ * editing/htmlediting.h:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * platform/LengthBox.h:
+ * platform/PopupMenuStyle.h:
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/LayoutBoxExtent.h:
+ * platform/graphics/TextRun.h:
+ * platform/ios/SelectionRect.h:
+ * platform/text/BidiResolver.h:
+ * platform/text/StringWithDirection.h:
+ * platform/text/TextHelpers.h: Renamed from Source/WebCore/platform/text/TextDirection.h.
+ (WebCore::isLeftToRightDirection):
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::paint):
+ * rendering/EllipsisBox.cpp:
+ (WebCore::EllipsisBox::paint):
+ (WebCore::EllipsisBox::selectionRect):
+ (WebCore::EllipsisBox::paintSelection):
+ * rendering/HitTestLocation.h:
+ * rendering/HitTestResult.h:
+ * rendering/InlineBox.h:
+ * rendering/InlineTextBox.h:
+ (WebCore::InlineTextBox::expansionBehavior):
+ * rendering/RenderBlock.cpp:
+ (WebCore::constructTextRunInternal):
+ (WebCore::RenderBlock::constructTextRun):
+ * rendering/RenderBlock.h:
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::paintObject):
+ (WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidths):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::updateFromElement):
+ (WebCore::RenderListBox::paintItemForeground):
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::computePreferredLogicalWidths):
+ (WebCore::RenderListMarker::getRelativeMarkerRect):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::updateOptionsWidth):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::getAverageCharWidth):
+ * rendering/RenderThemeIOS.mm:
+ * rendering/style/RenderStyle.h:
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::constructTextRun):
+ * rendering/svg/SVGTextMetrics.cpp:
+ (WebCore::SVGTextMetrics::constructTextRun):
+
</ins><span class="cx"> 2015-03-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Clean up Identifier factories to clarify the meaning of StringImpl*
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "NotificationClient.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "ThreadableLoaderClient.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -20358,7 +20358,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\text\TextCodecUserDefined.h" />
</span><span class="cx"> <ClInclude Include="..\platform\text\TextCodecUTF16.h" />
</span><span class="cx"> <ClInclude Include="..\platform\text\TextCodecUTF8.h" />
</span><del>- <ClInclude Include="..\platform\text\TextDirection.h" />
</del><ins>+ <ClInclude Include="..\platform\text\TextFlags.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\text\TextEncoding.h" />
</span><span class="cx"> <ClInclude Include="..\platform\text\TextEncodingDetector.h" />
</span><span class="cx"> <ClInclude Include="..\platform\text\TextEncodingRegistry.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -8973,7 +8973,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\text\TextCodecUTF8.h">
</span><span class="cx"> <Filter>platform\text</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\text\TextDirection.h">
</del><ins>+ <ClInclude Include="..\platform\text\TextFlags.h">
</ins><span class="cx"> <Filter>platform\text</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\platform\text\TextEncoding.h">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -4776,7 +4776,7 @@
</span><span class="cx"> B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA100D006C1D00EF6F26 /* TextCodecUserDefined.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B2C3DA410D006C1D00EF6F26 /* TextCodecUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA110D006C1D00EF6F26 /* TextCodecUTF16.cpp */; };
</span><span class="cx"> B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA150D006C1D00EF6F26 /* TextDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ B2C3DA450D006C1D00EF6F26 /* TextFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA150D006C1D00EF6F26 /* TextFlags.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> B2C3DA460D006C1D00EF6F26 /* TextEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */; };
</span><span class="cx"> B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B2C3DA480D006C1D00EF6F26 /* TextEncodingRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */; };
</span><span class="lines">@@ -12249,7 +12249,7 @@
</span><span class="cx"> B2C3DA100D006C1D00EF6F26 /* TextCodecUserDefined.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecUserDefined.h; sourceTree = "<group>"; };
</span><span class="cx"> B2C3DA110D006C1D00EF6F26 /* TextCodecUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUTF16.cpp; sourceTree = "<group>"; };
</span><span class="cx"> B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecUTF16.h; sourceTree = "<group>"; };
</span><del>- B2C3DA150D006C1D00EF6F26 /* TextDirection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDirection.h; sourceTree = "<group>"; };
</del><ins>+ B2C3DA150D006C1D00EF6F26 /* TextFlags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextFlags.h; sourceTree = "<group>"; };
</ins><span class="cx"> B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncoding.cpp; sourceTree = "<group>"; };
</span><span class="cx"> B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncoding.h; sourceTree = "<group>"; };
</span><span class="cx"> B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingRegistry.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -20906,7 +20906,7 @@
</span><span class="cx"> B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */,
</span><span class="cx"> 9343CB7F12F25E510033C5EE /* TextCodecUTF8.cpp */,
</span><span class="cx"> 9343CB8012F25E510033C5EE /* TextCodecUTF8.h */,
</span><del>- B2C3DA150D006C1D00EF6F26 /* TextDirection.h */,
</del><ins>+ B2C3DA150D006C1D00EF6F26 /* TextFlags.h */,
</ins><span class="cx"> B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */,
</span><span class="cx"> B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */,
</span><span class="cx"> C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */,
</span><span class="lines">@@ -26770,7 +26770,7 @@
</span><span class="cx"> B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
</span><span class="cx"> 9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */,
</span><span class="cx"> 142B97CA13138943008BEF4B /* TextControlInnerElements.h in Headers */,
</span><del>- B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */,
</del><ins>+ B2C3DA450D006C1D00EF6F26 /* TextFlags.h in Headers */,
</ins><span class="cx"> 97BC84B412371180000C6161 /* TextDocument.h in Headers */,
</span><span class="cx"> 97BC84841236FD93000C6161 /* TextDocumentParser.h in Headers */,
</span><span class="cx"> B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="cx"> #include "SVGRenderStyleDefs.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "TextRenderingMode.h"
</span><span class="cx"> #include "ThemeTypes.h"
</span><span class="cx"> #include "UnicodeBidi.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperty.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperty.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/css/CSSProperty.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSValue.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "WritingMode.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/dom/Position.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "ContainerNode.h"
</span><span class="cx"> #include "EditingBoundary.h"
</span><span class="cx"> #include "TextAffinity.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "EditingBoundary.h"
</span><span class="cx"> #include "Position.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/editing/VisibleUnits.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define VisibleUnits_h
</span><span class="cx">
</span><span class="cx"> #include "EditingBoundary.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "VisibleSelection.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/editing/htmlediting.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "EditingBoundary.h"
</span><span class="cx"> #include "Position.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -2305,7 +2305,7 @@
</span><span class="cx"> bool isRTL = direction == RTL;
</span><span class="cx"> bool override = computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
</span><span class="cx">
</span><del>- TextRun textRun(normalizedText, 0, 0, TextRun::AllowTrailingExpansion, direction, override, true, TextRun::NoRounding);
</del><ins>+ TextRun textRun(normalizedText, 0, 0, AllowTrailingExpansion, direction, override, true, TextRun::NoRounding);
</ins><span class="cx"> // Draw the item text at the correct point.
</span><span class="cx"> FloatPoint location(x, y);
</span><span class="cx"> switch (state().m_textBaseline) {
</span><span class="lines">@@ -2326,7 +2326,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- float fontWidth = font.width(TextRun(normalizedText, 0, 0, TextRun::AllowTrailingExpansion, direction, override));
</del><ins>+ float fontWidth = font.width(TextRun(normalizedText, 0, 0, AllowTrailingExpansion, direction, override));
</ins><span class="cx">
</span><span class="cx"> useMaxWidth = (useMaxWidth && maxWidth < fontWidth);
</span><span class="cx"> float width = useMaxWidth ? maxWidth : fontWidth;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "ImageBuffer.h"
</span><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LengthBox.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LengthBox.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/LengthBox.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #define LengthBox_h
</span><span class="cx">
</span><span class="cx"> #include "Length.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "WritingMode.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPopupMenuStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PopupMenuStyle.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PopupMenuStyle.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/PopupMenuStyle.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "Length.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "FontCascadeFonts.h"
</span><span class="cx"> #include "FontDescription.h"
</span><span class="cx"> #include "Path.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "TypesettingFeatures.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutBoxExtenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutBoxExtent.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutBoxExtent.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/graphics/LayoutBoxExtent.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #define LayoutBoxExtent_h
</span><span class="cx">
</span><span class="cx"> #include "LayoutUnit.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "WritingMode.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextRun.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #ifndef TextRun_h
</span><span class="cx"> #define TextRun_h
</span><span class="cx">
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="lines">@@ -44,15 +44,6 @@
</span><span class="cx"> class TextRun {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- enum ExpansionBehaviorFlags {
- ForbidTrailingExpansion = 0 << 0,
- AllowTrailingExpansion = 1 << 0,
- ForbidLeadingExpansion = 0 << 1,
- AllowLeadingExpansion = 1 << 1,
- };
-
- typedef unsigned ExpansionBehavior;
-
</del><span class="cx"> enum RoundingHackFlags {
</span><span class="cx"> NoRounding = 0,
</span><span class="cx"> RunRounding = 1 << 0,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosSelectionRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/SelectionRect.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/SelectionRect.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/ios/SelectionRect.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define SelectionRect_h
</span><span class="cx">
</span><span class="cx"> #include "IntRect.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextBidiResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/BidiResolver.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/BidiResolver.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/text/BidiResolver.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BidiContext.h"
</span><span class="cx"> #include "BidiRunList.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextStringWithDirectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/StringWithDirection.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/StringWithDirection.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/text/StringWithDirection.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef StringWithDirection_h
</span><span class="cx"> #define StringWithDirection_h
</span><span class="cx">
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextDirectionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/text/TextDirection.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextDirection.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/text/TextDirection.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2003, 2006 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 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 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 TextDirection_h
-#define TextDirection_h
-
-namespace WebCore {
-
-enum TextDirection { RTL, LTR };
-
-inline bool isLeftToRightDirection(TextDirection direction) { return direction == LTR; }
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextFlagshfromrev182205trunkSourceWebCoreplatformtextTextDirectionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/text/TextFlags.h (from rev 182205, trunk/Source/WebCore/platform/text/TextDirection.h) (0 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextFlags.h (rev 0)
+++ trunk/Source/WebCore/platform/text/TextFlags.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2003, 2006 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 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 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 TextFlags_h
+#define TextFlags_h
+
+namespace WebCore {
+
+enum TextDirection { RTL, LTR };
+
+inline bool isLeftToRightDirection(TextDirection direction) { return direction == LTR; }
+
+enum ExpansionBehaviorFlags {
+ ForbidTrailingExpansion = 0 << 0,
+ AllowTrailingExpansion = 1 << 0,
+ ForbidLeadingExpansion = 0 << 1,
+ AllowLeadingExpansion = 1 << 1,
+};
+
+typedef unsigned ExpansionBehavior;
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx">
</span><span class="cx"> String itemText = client()->itemText(index);
</span><span class="cx">
</span><del>- TextRun textRun(itemText, 0, 0, TextRun::AllowTrailingExpansion, itemStyle.textDirection(), itemStyle.hasTextDirectionOverride());
</del><ins>+ TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle.textDirection(), itemStyle.hasTextDirectionOverride());
</ins><span class="cx"> context.setFillColor(optionTextColor, ColorSpaceDeviceRGB);
</span><span class="cx">
</span><span class="cx"> FontCascade itemFont = client()->menuStyle().font();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingEllipsisBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/EllipsisBox.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/EllipsisBox.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/EllipsisBox.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
</span><del>- context->drawText(font, RenderBlock::constructTextRun(&blockFlow(), font, m_str, lineStyle, TextRun::AllowTrailingExpansion), LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + lineStyle.fontMetrics().ascent()));
</del><ins>+ context->drawText(font, RenderBlock::constructTextRun(&blockFlow(), font, m_str, lineStyle, AllowTrailingExpansion), LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + lineStyle.fontMetrics().ascent()));
</ins><span class="cx">
</span><span class="cx"> // Restore the regular fill color.
</span><span class="cx"> if (textColor != context->fillColor())
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> const RootInlineBox& rootBox = root();
</span><span class="cx"> // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(x(), y() + rootBox.selectionTopAdjustedForPrecedingBlock(), 0, rootBox.selectionHeightAdjustedForPrecedingBlock());
</span><del>- font.adjustSelectionRectForText(RenderBlock::constructTextRun(&blockFlow(), font, m_str, lineStyle, TextRun::AllowTrailingExpansion), selectionRect);
</del><ins>+ font.adjustSelectionRectForText(RenderBlock::constructTextRun(&blockFlow(), font, m_str, lineStyle, AllowTrailingExpansion), selectionRect);
</ins><span class="cx"> // FIXME: use directional pixel snapping instead.
</span><span class="cx"> return enclosingIntRect(selectionRect);
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><span class="cx"> // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(x() + paintOffset.x(), y() + paintOffset.y() + rootBox.selectionTop(), 0, rootBox.selectionHeight());
</span><del>- TextRun run = RenderBlock::constructTextRun(&blockFlow(), font, m_str, style, TextRun::AllowTrailingExpansion);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(&blockFlow(), font, m_str, style, AllowTrailingExpansion);
</ins><span class="cx"> font.adjustSelectionRectForText(run, selectionRect, 0, -1);
</span><span class="cx"> context->fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()), c, style.colorSpace());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestLocation.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestLocation.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/HitTestLocation.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "RoundedRect.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/HitTestResult.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "HitTestLocation.h"
</span><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "RenderBoxModelObject.h"
</span><span class="cx"> #include "RenderText.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include <wtf/TypeCasts.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -160,10 +160,10 @@
</span><span class="cx">
</span><span class="cx"> void computeRectForReplacementMarker(RenderedDocumentMarker&, const RenderStyle&, const FontCascade&);
</span><span class="cx">
</span><del>- TextRun::ExpansionBehavior expansionBehavior() const
</del><ins>+ ExpansionBehavior expansionBehavior() const
</ins><span class="cx"> {
</span><del>- return (canHaveLeadingExpansion() ? TextRun::AllowLeadingExpansion : TextRun::ForbidLeadingExpansion)
- | (renderer().contentIsKnownToFollow() || (expansion() && nextLeafChild() && !nextLeafChild()->isLineBreak()) ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion);
</del><ins>+ return (canHaveLeadingExpansion() ? AllowLeadingExpansion : ForbidLeadingExpansion)
+ | (renderer().contentIsKnownToFollow() || (expansion() && nextLeafChild() && !nextLeafChild()->isLineBreak()) ? AllowTrailingExpansion : ForbidTrailingExpansion);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void behavesLikeText() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -3671,7 +3671,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static inline TextRun constructTextRunInternal(RenderObject* context, const FontCascade& font, const CharacterType* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</del><ins>+static inline TextRun constructTextRunInternal(RenderObject* context, const FontCascade& font, const CharacterType* characters, int length, const RenderStyle& style, ExpansionBehavior expansion)
</ins><span class="cx"> {
</span><span class="cx"> TextDirection textDirection = LTR;
</span><span class="cx"> bool directionalOverride = style.rtlOrdering() == VisualOrder;
</span><span class="lines">@@ -3686,7 +3686,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static inline TextRun constructTextRunInternal(RenderObject* context, const FontCascade& font, const CharacterType* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion, TextRunFlags flags)
</del><ins>+static inline TextRun constructTextRunInternal(RenderObject* context, const FontCascade& font, const CharacterType* characters, int length, const RenderStyle& style, ExpansionBehavior expansion, TextRunFlags flags)
</ins><span class="cx"> {
</span><span class="cx"> TextDirection textDirection = LTR;
</span><span class="cx"> bool directionalOverride = style.rtlOrdering() == VisualOrder;
</span><span class="lines">@@ -3705,24 +3705,24 @@
</span><span class="cx"> return run;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const LChar* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</del><ins>+TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const LChar* characters, int length, const RenderStyle& style, ExpansionBehavior expansion)
</ins><span class="cx"> {
</span><span class="cx"> return constructTextRunInternal(context, font, characters, length, style, expansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const UChar* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</del><ins>+TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const UChar* characters, int length, const RenderStyle& style, ExpansionBehavior expansion)
</ins><span class="cx"> {
</span><span class="cx"> return constructTextRunInternal(context, font, characters, length, style, expansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const RenderText* text, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</del><ins>+TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const RenderText* text, const RenderStyle& style, ExpansionBehavior expansion)
</ins><span class="cx"> {
</span><span class="cx"> if (text->is8Bit())
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters8(), text->textLength(), style, expansion);
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters16(), text->textLength(), style, expansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const RenderText* text, unsigned offset, unsigned length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</del><ins>+TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const RenderText* text, unsigned offset, unsigned length, const RenderStyle& style, ExpansionBehavior expansion)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(offset + length <= text->textLength());
</span><span class="cx"> if (text->is8Bit())
</span><span class="lines">@@ -3730,7 +3730,7 @@
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters16() + offset, length, style, expansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const String& string, const RenderStyle& style, TextRun::ExpansionBehavior expansion, TextRunFlags flags)
</del><ins>+TextRun RenderBlock::constructTextRun(RenderObject* context, const FontCascade& font, const String& string, const RenderStyle& style, ExpansionBehavior expansion, TextRunFlags flags)
</ins><span class="cx"> {
</span><span class="cx"> unsigned length = string.length();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -205,22 +205,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const String&, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, TextRunFlags = DefaultTextRunFlags);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextRunFlags = DefaultTextRunFlags);
</ins><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const RenderText*, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion);
</ins><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const RenderText*, unsigned offset, unsigned length, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion);
</ins><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const RenderText*, unsigned offset, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion);
</ins><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const LChar* characters, int length, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion);
</ins><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const FontCascade&, const UChar* characters, int length, const RenderStyle&,
</span><del>- TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</del><ins>+ ExpansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit paginationStrut() const;
</span><span class="cx"> void setPaginationStrut(LayoutUnit);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (paintInfo.phase == PaintPhaseForeground) {
</span><span class="cx"> const String& displayedFilename = fileTextValue();
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun textRun = constructTextRun(this, font, displayedFilename, style(), TextRun::AllowTrailingExpansion, RespectDirection | RespectDirectionOverride);
</del><ins>+ TextRun textRun = constructTextRun(this, font, displayedFilename, style(), AllowTrailingExpansion, RespectDirection | RespectDirectionOverride);
</ins><span class="cx"> textRun.disableRoundingHacks();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -204,10 +204,10 @@
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><span class="cx"> // FIXME: Remove the need for this const_cast by making constructTextRun take a const RenderObject*.
</span><span class="cx"> RenderFileUploadControl* renderer = const_cast<RenderFileUploadControl*>(this);
</span><del>- float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), TextRun::AllowTrailingExpansion));
</del><ins>+ float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), AllowTrailingExpansion));
</ins><span class="cx">
</span><span class="cx"> const String label = theme().fileListDefaultLabel(inputElement().multiple());
</span><del>- float defaultLabelWidth = font.width(constructTextRun(renderer, font, label, style(), TextRun::AllowTrailingExpansion));
</del><ins>+ float defaultLabelWidth = font.width(constructTextRun(renderer, font, label, style(), AllowTrailingExpansion));
</ins><span class="cx"> if (HTMLInputElement* button = uploadButton())
</span><span class="cx"> if (RenderObject* buttonRenderer = button->renderer())
</span><span class="cx"> defaultLabelWidth += buttonRenderer->maxPreferredLogicalWidth() + afterButtonSpacing;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!text.isEmpty()) {
</span><span class="cx"> applyTextTransform(style(), text, ' ');
</span><span class="cx"> // FIXME: Why is this always LTR? Can't text direction affect the width?
</span><del>- TextRun textRun = constructTextRun(this, itemFont, text, style(), TextRun::AllowTrailingExpansion);
</del><ins>+ TextRun textRun = constructTextRun(this, itemFont, text, style(), AllowTrailingExpansion);
</ins><span class="cx"> textRun.disableRoundingHacks();
</span><span class="cx"> float textWidth = itemFont.width(textRun);
</span><span class="cx"> width = std::max(width, textWidth);
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> ColorSpace colorSpace = itemStyle->colorSpace();
</span><span class="cx"> paintInfo.context->setFillColor(textColor, colorSpace);
</span><span class="cx">
</span><del>- TextRun textRun(itemText, 0, 0, TextRun::AllowTrailingExpansion, itemStyle->direction(), isOverride(itemStyle->unicodeBidi()), true, TextRun::NoRounding);
</del><ins>+ TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle->direction(), isOverride(itemStyle->unicodeBidi()), true, TextRun::NoRounding);
</ins><span class="cx"> FontCascade itemFont = style().fontCascade();
</span><span class="cx"> LayoutRect r = itemBoundingBoxRect(paintOffset, listIndex);
</span><span class="cx"> r.move(itemOffsetForAlignment(textRun, itemStyle, itemFont, r));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -1542,7 +1542,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case Asterisks:
</span><span class="cx"> case Footnotes: {
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> logicalWidth = font.width(run); // no suffix for these types
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -1629,7 +1629,7 @@
</span><span class="cx"> if (m_text.isEmpty())
</span><span class="cx"> logicalWidth = 0;
</span><span class="cx"> else {
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> LayoutUnit itemWidth = font.width(run);
</span><span class="cx"> UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</span><span class="cx"> LayoutUnit suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
</span><span class="lines">@@ -1762,7 +1762,7 @@
</span><span class="cx"> case Asterisks:
</span><span class="cx"> case Footnotes: {
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> relativeRect = FloatRect(0, 0, font.width(run), font.fontMetrics().height());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1856,7 +1856,7 @@
</span><span class="cx"> if (m_text.isEmpty())
</span><span class="cx"> return FloatRect();
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> float itemWidth = font.width(run);
</span><span class="cx"> UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</span><span class="cx"> float suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -223,13 +223,13 @@
</span><span class="cx"> optionWidth += minimumValueForLength(optionStyle->textIndent(), 0);
</span><span class="cx"> if (!text.isEmpty()) {
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> optionWidth += font.width(run);
</span><span class="cx"> }
</span><span class="cx"> maxOptionWidth = std::max(maxOptionWidth, optionWidth);
</span><span class="cx"> } else if (!text.isEmpty()) {
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(this, font, text, style(), AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> maxOptionWidth = std::max(maxOptionWidth, font.width(run));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> const UChar ch = '0';
</span><span class="cx"> const String str = String(&ch, 1);
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><del>- TextRun textRun = constructTextRun(this, font, str, style(), TextRun::AllowTrailingExpansion);
</del><ins>+ TextRun textRun = constructTextRun(this, font, str, style(), AllowTrailingExpansion);
</ins><span class="cx"> textRun.disableRoundingHacks();
</span><span class="cx"> return font.width(textRun);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> }
</span><span class="cx"> virtual float measureText(const String& string) const override
</span><span class="cx"> {
</span><del>- TextRun run = RenderBlock::constructTextRun(&m_renderObject, m_font, string, m_style, TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
</del><ins>+ TextRun run = RenderBlock::constructTextRun(&m_renderObject, m_font, string, m_style, AllowTrailingExpansion | ForbidLeadingExpansion, DefaultTextRunFlags);
</ins><span class="cx"> return m_font.width(run);
</span><span class="cx"> }
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> #include "StyleSurroundData.h"
</span><span class="cx"> #include "StyleTransformData.h"
</span><span class="cx"> #include "StyleVisualData.h"
</span><del>-#include "TextDirection.h"
</del><ins>+#include "TextFlags.h"
</ins><span class="cx"> #include "ThemeTypes.h"
</span><span class="cx"> #include "TransformOperations.h"
</span><span class="cx"> #include "UnicodeBidi.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> TextRun run(StringView(renderer().text()).substring(fragment.characterOffset, fragment.length)
</span><span class="cx"> , 0 /* xPos, only relevant with allowTabs=true */
</span><span class="cx"> , 0 /* padding, only relevant for justified text, not relevant for SVG */
</span><del>- , TextRun::AllowTrailingExpansion
</del><ins>+ , AllowTrailingExpansion
</ins><span class="cx"> , direction()
</span><span class="cx"> , dirOverride() || style->rtlOrdering() == VisualOrder /* directionalOverride */);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> TextRun run(StringView(text.text()).substring(position, length)
</span><span class="cx"> , 0 /* xPos, only relevant with allowTabs=true */
</span><span class="cx"> , 0 /* padding, only relevant for justified text, not relevant for SVG */
</span><del>- , TextRun::AllowTrailingExpansion
</del><ins>+ , AllowTrailingExpansion
</ins><span class="cx"> , style.direction()
</span><span class="cx"> , isOverride(style.unicodeBidi()) /* directionalOverride */);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit/ios/ChangeLog 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Move ExpansionBehaviorFlags and TextDirection to their own file
+ https://bugs.webkit.org/show_bug.cgi?id=143273
+
+ Reviewed by Simon Fraser.
+
+ This is a mechanical change. It just moves code around.
+
+ This is getting ready for https://bugs.webkit.org/show_bug.cgi?id=142608
+
+ * WebCoreSupport/WebFrameIOS.mm:
+ * WebCoreSupport/WebVisiblePosition.mm:
+
</ins><span class="cx"> 2015-03-09 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix build when compiling with dead code stripping disabled
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #import <WebCore/RenderedDocumentMarker.h>
</span><span class="cx"> #import <WebCore/SelectionRect.h>
</span><span class="cx"> #import <WebCore/TextBoundaries.h>
</span><del>-#import <WebCore/TextDirection.h>
</del><ins>+#import <WebCore/TextFlags.h>
</ins><span class="cx"> #import <WebCore/VisiblePosition.h>
</span><span class="cx"> #import <WebCore/VisibleUnits.h>
</span><span class="cx"> #import <WebKitLegacy/DOM.h>
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebVisiblePositionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> #import <WebCore/RenderTextControl.h>
</span><span class="cx"> #import <WebCore/RenderedDocumentMarker.h>
</span><span class="cx"> #import <WebCore/TextBoundaries.h>
</span><del>-#import <WebCore/TextDirection.h>
</del><span class="cx"> #import <WebCore/TextGranularity.h>
</span><ins>+#import <WebCore/TextFlags.h>
</ins><span class="cx"> #import <WebCore/TextIterator.h>
</span><span class="cx"> #import <WebCore/VisiblePosition.h>
</span><span class="cx"> #import <WebCore/VisibleUnits.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Move ExpansionBehaviorFlags and TextDirection to their own file
+ https://bugs.webkit.org/show_bug.cgi?id=143273
+
+ Reviewed by Simon Fraser.
+
+ This is a mechanical change. It just moves code around.
+
+ This is getting ready for https://bugs.webkit.org/show_bug.cgi?id=142608
+
+ * Shared/WebPopupItem.h:
+ * UIProcess/API/C/efl/WKAPICastEfl.h:
+ * UIProcess/API/efl/EwkView.h:
+ * UIProcess/WebPopupMenuProxy.h:
+ * UIProcess/efl/WebUIPopupMenuClient.h:
+
</ins><span class="cx"> 2015-03-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Clean up Identifier factories to clarify the meaning of StringImpl*
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPopupItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPopupItem.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPopupItem.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/Shared/WebPopupItem.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WebPopupItem_h
</span><span class="cx"> #define WebPopupItem_h
</span><span class="cx">
</span><del>-#include <WebCore/TextDirection.h>
</del><ins>+#include <WebCore/TextFlags.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICeflWKAPICastEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #error "Please #include \"WKAPICast.h\" instead of this file directly."
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#include <WebCore/TextDirection.h>
</del><ins>+#include <WebCore/TextFlags.h>
</ins><span class="cx"> #include <WebKit/WKPopupItem.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "WKRetainPtr.h"
</span><span class="cx"> #include "WebViewEfl.h"
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><del>-#include <WebCore/TextDirection.h>
</del><ins>+#include <WebCore/TextFlags.h>
</ins><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPopupMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WebPopupMenuProxy_h
</span><span class="cx"> #define WebPopupMenuProxy_h
</span><span class="cx">
</span><del>-#include <WebCore/TextDirection.h>
</del><ins>+#include <WebCore/TextFlags.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebUIPopupMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.h (182206 => 182207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.h 2015-03-31 21:34:07 UTC (rev 182206)
+++ trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.h 2015-03-31 21:34:33 UTC (rev 182207)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "WKPageEfl.h"
</span><span class="cx"> #include "WebPopupItem.h"
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><del>-#include <WebCore/TextDirection.h>
</del><ins>+#include <WebCore/TextFlags.h>
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> template<> struct ClientTraits<WKPageUIPopupMenuClientBase> {
</span></span></pre>
</div>
</div>
</body>
</html>