Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

Issue 677843004: Remove text-combine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderText.cpp ('k') | sky/engine/core/rendering/line/LineBreaker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
diff --git a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
index d7b02d616a3b765449054f79885bc5ed1bf1f19a..f89b4200a58497c0af901108ecde94c3d3f8afbc 100644
--- a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
+++ b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h
@@ -26,7 +26,6 @@
#include "core/rendering/InlineIterator.h"
#include "core/rendering/InlineTextBox.h"
-#include "core/rendering/RenderCombineText.h"
#include "core/rendering/RenderInline.h"
#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderObjectInlines.h"
@@ -431,11 +430,6 @@ inline void BreakingContext::handleReplaced()
m_renderTextInfo.m_lineBreakIterator.updatePriorContext(replacementCharacter);
}
-inline bool iteratorIsBeyondEndOfRenderCombineText(const InlineIterator& iter, RenderCombineText* renderer)
-{
- return iter.object() == renderer && iter.offset() >= renderer->textLength();
-}
-
inline void nextCharacter(UChar& currentCharacter, UChar& lastCharacter, UChar& secondToLastCharacter)
{
secondToLastCharacter = lastCharacter;
@@ -467,7 +461,7 @@ ALWAYS_INLINE TextDirection textDirectionFromUnicode(WTF::Unicode::Direction dir
ALWAYS_INLINE float textWidth(RenderText* text, unsigned from, unsigned len, const Font& font, float xPos, bool isFixedPitch, bool collapseWhiteSpace, HashSet<const SimpleFontData*>* fallbackFonts = 0)
{
GlyphOverflow glyphOverflow;
- if (isFixedPitch || (!from && len == text->textLength()) || text->style()->hasTextCombine())
+ if (isFixedPitch || (!from && len == text->textLength()))
return text->width(from, len, font, xPos, text->style()->direction(), fallbackFonts, &glyphOverflow);
TextRun run = constructTextRun(text, font, text, from, len, text->style());
@@ -491,17 +485,6 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
m_lineBreak.moveToStartOf(m_current.object());
}
- if (renderText->style()->hasTextCombine() && m_current.object()->isCombineText() && !toRenderCombineText(m_current.object())->isCombined()) {
- RenderCombineText* combineRenderer = toRenderCombineText(m_current.object());
- combineRenderer->combineText();
- // The length of the renderer's text may have changed. Increment stale iterator positions
- if (iteratorIsBeyondEndOfRenderCombineText(m_lineBreak, combineRenderer)) {
- ASSERT(iteratorIsBeyondEndOfRenderCombineText(m_resolver.position(), combineRenderer));
- m_lineBreak.increment();
- m_resolver.position().increment(&m_resolver);
- }
- }
-
RenderStyle* style = renderText->style(m_lineInfo.isFirstLine());
const Font& font = style->font();
bool isFixedPitch = font.isFixedPitch();
« no previous file with comments | « sky/engine/core/rendering/RenderText.cpp ('k') | sky/engine/core/rendering/line/LineBreaker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698