Diff
Modified: trunk/Source/WTF/ChangeLog (131525 => 131526)
--- trunk/Source/WTF/ChangeLog 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WTF/ChangeLog 2012-10-16 23:23:11 UTC (rev 131526)
@@ -1,5 +1,16 @@
2012-10-16 Michael Saboff <[email protected]>
+ Change WTF_USE_8BIT_TEXTRUN to ENABLE_8BIT_TEXTRUN
+ https://bugs.webkit.org/show_bug.cgi?id=99484
+
+ Reviewed by Eric Seidel.
+
+ Changed macro name to align with it's purpose.
+
+ * wtf/Platform.h:
+
+2012-10-16 Michael Saboff <[email protected]>
+
StringImpl::reverseFind() with a single match character isn't optimal for mixed 8/16 bit cases
https://bugs.webkit.org/show_bug.cgi?id=99363
Modified: trunk/Source/WTF/wtf/Platform.h (131525 => 131526)
--- trunk/Source/WTF/wtf/Platform.h 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WTF/wtf/Platform.h 2012-10-16 23:23:11 UTC (rev 131526)
@@ -1027,7 +1027,7 @@
/*Add other platforms as they update their platfrom specific code to handle TextRun's with 8 bit data. */
#if PLATFORM(MAC)
-#define WTF_USE_8BIT_TEXTRUN 1
+#define ENABLE_8BIT_TEXTRUN 1
#endif
/* Use the QXmlStreamReader implementation for XMLDocumentParser */
Modified: trunk/Source/WebCore/ChangeLog (131525 => 131526)
--- trunk/Source/WebCore/ChangeLog 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WebCore/ChangeLog 2012-10-16 23:23:11 UTC (rev 131526)
@@ -1,3 +1,22 @@
+2012-10-16 Michael Saboff <[email protected]>
+
+ Change WTF_USE_8BIT_TEXTRUN to ENABLE_8BIT_TEXTRUN
+ https://bugs.webkit.org/show_bug.cgi?id=99484
+
+ Reviewed by Eric Seidel.
+
+ Changed macro name to align with it's purpose, therefore changed USE(8BIT_TEXTRUN) to ENABLE(8BIT_TEXTRUN).
+
+ No new tests. Changed macro name, no functional change.
+
+ * platform/graphics/TextRun.h:
+ (WebCore::TextRun::TextRun):
+ (WebCore::TextRun::subRun):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::constructTextRun):
+ * rendering/RenderBlock.h:
+ (RenderBlock):
+
2012-10-16 Noam Rosenthal <[email protected]>
[Qt] REGRESSION(r131485): It broke the build
Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (131525 => 131526)
--- trunk/Source/WebCore/platform/graphics/TextRun.h 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2012-10-16 23:23:11 UTC (rev 131526)
@@ -59,7 +59,7 @@
typedef unsigned RoundingHacks;
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
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)
: m_charactersLength(len)
, m_len(len)
@@ -123,7 +123,7 @@
, m_disableSpacing(false)
, m_tabSize(0)
{
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
if (m_charactersLength && s.is8Bit()) {
m_data.characters8 = s.characters8();
m_is8Bit = true;
@@ -143,7 +143,7 @@
TextRun result = *this;
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
if (is8Bit()) {
result.setText(data8(startOffset), length);
return result;
@@ -166,7 +166,7 @@
int length() const { return m_len; }
int charactersLength() const { return m_charactersLength; }
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
void setText(const LChar* c, unsigned len) { m_data.characters8 = c; m_len = len; m_is8Bit = true;}
#endif
void setText(const UChar* c, unsigned len) { m_data.characters16 = c; m_len = len; m_is8Bit = false;}
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (131525 => 131526)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-10-16 23:23:11 UTC (rev 131526)
@@ -7571,7 +7571,7 @@
return run;
}
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const LChar* characters, int length, RenderStyle* style, TextRun::ExpansionBehavior expansion)
{
return constructTextRunInternal(context, font, characters, length, style, expansion);
@@ -7585,7 +7585,7 @@
TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const RenderText* text, RenderStyle* style, TextRun::ExpansionBehavior expansion)
{
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
if (text->is8Bit())
return constructTextRunInternal(context, font, text->characters8(), text->textLength(), style, expansion);
return constructTextRunInternal(context, font, text->characters16(), text->textLength(), style, expansion);
@@ -7597,7 +7597,7 @@
TextRun RenderBlock::constructTextRun(RenderObject* context, const Font& font, const RenderText* text, unsigned offset, unsigned length, RenderStyle* style, TextRun::ExpansionBehavior expansion)
{
ASSERT(offset + length <= text->textLength());
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
if (text->is8Bit())
return constructTextRunInternal(context, font, text->characters8() + offset, length, style, expansion);
return constructTextRunInternal(context, font, text->characters16() + offset, length, style, expansion);
@@ -7610,7 +7610,7 @@
{
unsigned length = string.length();
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
if (length && string.is8Bit())
return constructTextRunInternal(context, font, string.characters8(), length, style, expansion, flags);
return constructTextRunInternal(context, font, string.characters(), length, style, expansion, flags);
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (131525 => 131526)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-10-16 23:11:12 UTC (rev 131525)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-10-16 23:23:11 UTC (rev 131526)
@@ -277,7 +277,7 @@
static TextRun constructTextRun(RenderObject* context, const Font& font, const RenderText* text, unsigned offset, RenderStyle* style,
TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
-#if USE(8BIT_TEXTRUN)
+#if ENABLE(8BIT_TEXTRUN)
static TextRun constructTextRun(RenderObject* context, const Font& font, const LChar* characters, int length, RenderStyle* style,
TextRun::ExpansionBehavior = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion);
#endif
