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

Unified Diff: sky/engine/core/rendering/InlineTextBox.cpp

Issue 783233002: Get rid of PaintPhaseTextClip. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/GraphicsContextAnnotator.cpp ('k') | sky/engine/core/rendering/PaintPhase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/InlineTextBox.cpp
diff --git a/sky/engine/core/rendering/InlineTextBox.cpp b/sky/engine/core/rendering/InlineTextBox.cpp
index 98144a1838a253a1cd83193f7ca47979df8734e8..01c17f2dce40ade70b9f83648f42e32b9cb4a75e 100644
--- a/sky/engine/core/rendering/InlineTextBox.cpp
+++ b/sky/engine/core/rendering/InlineTextBox.cpp
@@ -502,7 +502,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
return;
// Determine whether or not we're selected.
- bool haveSelection = paintInfo.phase != PaintPhaseTextClip && selectionState() != RenderObject::SelectionNone;
+ bool haveSelection = selectionState() != RenderObject::SelectionNone;
if (!haveSelection && paintInfo.phase == PaintPhaseSelection)
// When only painting the selection, don't bother to paint if there is none.
return;
@@ -549,7 +549,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
// 1. Paint backgrounds behind text if needed. Examples of such backgrounds include selection
// and composition highlights.
- if (paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseTextClip) {
+ if (paintInfo.phase != PaintPhaseSelection) {
if (containsComposition) {
paintCompositionBackgrounds(context, boxOrigin, styleToUse, font, useCustomUnderlines);
}
« no previous file with comments | « sky/engine/core/rendering/GraphicsContextAnnotator.cpp ('k') | sky/engine/core/rendering/PaintPhase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698