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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 313053007: Passing BackgroundColorSpan and UnderlineSpan from Clank to Blink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Putting back import java.lang.CharSequence for android_aosp. Created 6 years, 6 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
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 38fb4785fb3934000bd67efdf558b4e3c93e30d1..dce9a5eb1710d8043513812c5f27338d1d4be664 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -278,8 +278,12 @@ void ExtractUnderlines(
color = WebColorFromNSColor(
[colorAttr colorUsingColorSpaceName:NSDeviceRGBColorSpace]);
}
- underlines->push_back(blink::WebCompositionUnderline(
- range.location, NSMaxRange(range), color, [style intValue] > 1));
+ underlines->push_back(
+ blink::WebCompositionUnderline(range.location,
+ NSMaxRange(range),
+ color,
+ [style intValue] > 1,
+ SK_ColorTRANSPARENT));
}
i = range.location + range.length;
}
@@ -3594,8 +3598,8 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
ExtractUnderlines(string, &underlines_);
} else {
// Use a thin black underline by default.
- underlines_.push_back(
- blink::WebCompositionUnderline(0, length, SK_ColorBLACK, false));
+ underlines_.push_back(blink::WebCompositionUnderline(
+ 0, length, SK_ColorBLACK, false, SK_ColorTRANSPARENT));
}
// If we are handling a key down event, then SetComposition() will be
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/common/content_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698