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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 1330233003: Revert of Avoid style clobbering in setCompositionFromExistingText. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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 | « Source/web/WebViewImpl.h ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index f6afffcb4c0b85839401cf100ad3278375c2bf6a..c1d869d5578d8902a442cab24cdaafa24c1b1728 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -2584,6 +2584,20 @@
return toLocalFrame(frame)->selection().selection().isBaseFirst();
}
+WebVector<WebCompositionUnderline> WebViewImpl::compositionUnderlines() const
+{
+ const LocalFrame* focused = toLocalFrame(focusedCoreFrame());
+ if (!focused)
+ return WebVector<WebCompositionUnderline>();
+ const Vector<CompositionUnderline>& underlines = focused->inputMethodController().customCompositionUnderlines();
+ WebVector<WebCompositionUnderline> results(underlines.size());
+ for (size_t index = 0; index < underlines.size(); ++index) {
+ CompositionUnderline underline = underlines[index];
+ results[index] = WebCompositionUnderline(underline.startOffset, underline.endOffset, static_cast<WebColor>(underline.color.rgb()), underline.thick, static_cast<WebColor>(underline.backgroundColor.rgb()));
+ }
+ return results;
+}
+
WebColor WebViewImpl::backgroundColor() const
{
if (isTransparent())
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698