<!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>[163478] 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/163478">163478</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 15:30:10 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Turn on ENABLE(8BIT_TEXTRUN) for everyone.
<https://webkit.org/b/128273>
Reviewed by Anders Carlsson.
* platform/graphics/TextRun.h:
(WebCore::TextRun::TextRun):
(WebCore::TextRun::subRun):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::constructTextRun):
* rendering/RenderBlock.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTextRunh">trunk/Source/WebCore/platform/graphics/TextRun.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (163477 => 163478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-02-05 22:21:40 UTC (rev 163477)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-02-05 23:30:10 UTC (rev 163478)
</span><span class="lines">@@ -60,10 +60,6 @@
</span><span class="cx"> #define ENABLE_ASYNC_SCROLLING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_8BIT_TEXTRUN)
-#define ENABLE_8BIT_TEXTRUN 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CONTEXT_MENUS)
</span><span class="cx"> #define ENABLE_CONTEXT_MENUS 0
</span><span class="cx"> #endif
</span><span class="lines">@@ -169,10 +165,6 @@
</span><span class="cx"> /* --------- Apple MAC port (not IOS) --------- */
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if !defined(ENABLE_8BIT_TEXTRUN)
-#define ENABLE_8BIT_TEXTRUN 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CSS_IMAGE_SET)
</span><span class="cx"> #define ENABLE_CSS_IMAGE_SET 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -312,10 +304,6 @@
</span><span class="cx"> #define ENABLE_SUBPIXEL_LAYOUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_8BIT_TEXTRUN)
-#define ENABLE_8BIT_TEXTRUN 1
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(EFL) */
</span><span class="cx">
</span><span class="cx"> /* --------- Gtk port (Unix, Windows, Mac) --------- */
</span><span class="lines">@@ -331,10 +319,6 @@
</span><span class="cx"> #define ENABLE_SUBPIXEL_LAYOUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_8BIT_TEXTRUN)
-#define ENABLE_8BIT_TEXTRUN 1
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(GTK) */
</span><span class="cx">
</span><span class="cx"> /* ENABLE macro defaults for WebCore */
</span><span class="lines">@@ -344,10 +328,6 @@
</span><span class="cx"> #define ENABLE_3D_RENDERING 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_8BIT_TEXTRUN)
-#define ENABLE_8BIT_TEXTRUN 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_ACCELERATED_2D_CANVAS)
</span><span class="cx"> #define ENABLE_ACCELERATED_2D_CANVAS 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163477 => 163478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-05 22:21:40 UTC (rev 163477)
+++ trunk/Source/WebCore/ChangeLog 2014-02-05 23:30:10 UTC (rev 163478)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-05 Andreas Kling <akling@apple.com>
+
+ Turn on ENABLE(8BIT_TEXTRUN) for everyone.
+ <https://webkit.org/b/128273>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/graphics/TextRun.h:
+ (WebCore::TextRun::TextRun):
+ (WebCore::TextRun::subRun):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::constructTextRun):
+ * rendering/RenderBlock.h:
+
</ins><span class="cx"> 2014-02-05 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2: Caret, selections and autocorrection bubbles are incorrectly positioned when inside an iframe.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (163477 => 163478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-02-05 22:21:40 UTC (rev 163477)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-02-05 23:30:10 UTC (rev 163478)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned RoundingHacks;
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> TextRun(const LChar* c, unsigned len, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</span><span class="cx"> : m_charactersLength(len)
</span><span class="cx"> , m_len(len)
</span><span class="lines">@@ -79,7 +78,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_data.characters8 = c;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> TextRun(const UChar* c, unsigned len, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</span><span class="cx"> : m_charactersLength(len)
</span><span class="lines">@@ -117,7 +115,6 @@
</span><span class="cx"> , m_disableSpacing(false)
</span><span class="cx"> , m_tabSize(0)
</span><span class="cx"> {
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> if (m_charactersLength && s.is8Bit()) {
</span><span class="cx"> m_data.characters8 = s.characters8();
</span><span class="cx"> m_is8Bit = true;
</span><span class="lines">@@ -125,10 +122,6 @@
</span><span class="cx"> m_data.characters16 = s.deprecatedCharacters();
</span><span class="cx"> m_is8Bit = false;
</span><span class="cx"> }
</span><del>-#else
- m_data.characters16 = s.deprecatedCharacters();
- m_is8Bit = false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextRun subRun(unsigned startOffset, unsigned length) const
</span><span class="lines">@@ -137,14 +130,10 @@
</span><span class="cx">
</span><span class="cx"> TextRun result = *this;
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> if (is8Bit()) {
</span><span class="cx"> result.setText(data8(startOffset), length);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#else
- ASSERT(!is8Bit());
-#endif
</del><span class="cx"> result.setText(data16(startOffset), length);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -166,9 +155,7 @@
</span><span class="cx"> return String(m_data.characters16, m_len);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> void setText(const LChar* c, unsigned len) { m_data.characters8 = c; m_len = len; m_is8Bit = true;}
</span><del>-#endif
</del><span class="cx"> void setText(const UChar* c, unsigned len) { m_data.characters16 = c; m_len = len; m_is8Bit = false;}
</span><span class="cx"> void setCharactersLength(unsigned charactersLength) { m_charactersLength = charactersLength; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (163477 => 163478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-05 22:21:40 UTC (rev 163477)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-05 23:30:10 UTC (rev 163478)
</span><span class="lines">@@ -5413,12 +5413,10 @@
</span><span class="cx"> return run;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const LChar* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</span><span class="cx"> {
</span><span class="cx"> return constructTextRunInternal(context, font, characters, length, style, expansion);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const UChar* characters, int length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</span><span class="cx"> {
</span><span class="lines">@@ -5427,38 +5425,26 @@
</span><span class="cx">
</span><span class="cx"> TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const RenderText* text, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</span><span class="cx"> {
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><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><del>-#else
- return constructTextRunInternal(context, font, text->deprecatedCharacters(), text->textLength(), style, expansion);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const RenderText* text, unsigned offset, unsigned length, const RenderStyle& style, TextRun::ExpansionBehavior expansion)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(offset + length <= text->textLength());
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> if (text->is8Bit())
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters8() + offset, length, style, expansion);
</span><span class="cx"> return constructTextRunInternal(context, font, text->characters16() + offset, length, style, expansion);
</span><del>-#else
- return constructTextRunInternal(context, font, text->deprecatedCharacters() + offset, length, style, expansion);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const String& string, const RenderStyle& style, TextRun::ExpansionBehavior expansion, TextRunFlags flags)
</span><span class="cx"> {
</span><span class="cx"> unsigned length = string.length();
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> if (length && string.is8Bit())
</span><span class="cx"> return constructTextRunInternal(context, font, string.characters8(), length, style, expansion, flags);
</span><span class="cx"> return constructTextRunInternal(context, font, string.deprecatedCharacters(), length, style, expansion, flags);
</span><del>-#else
- return constructTextRunInternal(context, font, string.deprecatedCharacters(), length, style, expansion, flags);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const RenderObject* parent, EDisplay display)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (163477 => 163478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-02-05 22:21:40 UTC (rev 163477)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-02-05 23:30:10 UTC (rev 163478)
</span><span class="lines">@@ -246,10 +246,8 @@
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const Font&, const RenderText*, unsigned offset, const RenderStyle&,
</span><span class="cx"> TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</span><span class="cx">
</span><del>-#if ENABLE(8BIT_TEXTRUN)
</del><span class="cx"> static TextRun constructTextRun(RenderObject* context, const Font&, const LChar* characters, int length, const RenderStyle&,
</span><span class="cx"> TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static TextRun constructTextRun(RenderObject* context, const Font&, const UChar* characters, int length, const RenderStyle&,
</span><span class="cx"> TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
</span></span></pre>
</div>
</div>
</body>
</html>