Title: [179045] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179045
- Author
- lforsch...@apple.com
- Date
- 2015-01-23 17:03:13 -0800 (Fri, 23 Jan 2015)
Log Message
Build fix after r179028, r179030, r179031, r179032.
Reviewed by Dana Burkart.
* platform/graphics/WidthIterator.cpp:
(WebCore::WidthIterator::WidthIterator):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::ComplexTextController):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 01:03:13 UTC (rev 179045)
@@ -1,5 +1,18 @@
2015-01-23 Lucas Forschler <lforsch...@apple.com>
+ Build fix after r179028, r179030, r179031, r179032.
+
+ Reviewed by Dana Burkart.
+
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::WidthIterator::WidthIterator):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::ComplexTextController):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
+
+2015-01-23 Lucas Forschler <lforsch...@apple.com>
+
Merge r174489
2014-10-08 Myles C. Maxfield <lithe...@gmail.com>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -57,7 +57,14 @@
m_expansionPerOpportunity = 0;
else {
bool isAfterExpansion = m_isAfterExpansion;
- unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
+
+ StringView sv;
+ if (m_run.is8Bit())
+ sv = StringView(m_run.characters8(), m_run.length());
+ else
+ sv = StringView(m_run.characters16(), m_run.length());
+
+ unsigned expansionOpportunityCount = Font::expansionOpportunityCount(sv, m_run.ltr() ? LTR : RTL, isAfterExpansion);
if (isAfterExpansion && !m_run.allowsTrailingExpansion())
expansionOpportunityCount--;
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -144,7 +144,13 @@
m_expansionPerOpportunity = 0;
else {
bool isAfterExpansion = m_afterExpansion;
- unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
+
+ StringView sv;
+ if (m_run.is8Bit())
+ sv = StringView(m_run.characters8(), m_run.length());
+ else
+ sv = StringView(m_run.characters16(), m_run.length());
+ unsigned expansionOpportunityCount = Font::expansionOpportunityCount(sv, m_run.ltr() ? LTR : RTL, isAfterExpansion);
if (isAfterExpansion && !m_run.allowsTrailingExpansion())
expansionOpportunityCount--;
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (179044 => 179045)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-24 00:52:42 UTC (rev 179044)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-24 01:03:13 UTC (rev 179045)
@@ -737,7 +737,7 @@
if (!isAfterExpansion)
toInlineTextBox(leafChild)->setCanHaveLeadingExpansion(true);
encounteredJustifiedRuby = true;
- auto& renderText = downcast<RenderText>(leafChild->renderer());
+ auto& renderText = toRenderText(leafChild->renderer());
unsigned opportunitiesInRun = Font::expansionOpportunityCount(renderText.stringView(), leafChild->direction(), isAfterExpansion);
expansionOpportunities.append(opportunitiesInRun);
expansionOpportunityCount += opportunitiesInRun;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
