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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 70609c60009aa60932eeca40ead0822b83c31f77..8a307bde53680f17e22148ff0bb1b88510610820 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -1260,7 +1260,7 @@ void WebViewImpl::enableTapHighlight(const PlatformGestureEvent& tapEvent)
if (!touchNode || !touchNode->renderer() || !touchNode->renderer()->enclosingLayer())
return;
- Color highlightColor = touchNode->renderer()->style()->tapHighlightColor();
+ Color highlightColor = touchNode->renderer()->resolveColor(CSSPropertyWebkitTapHighlightColor);
// Safari documentation for -webkit-tap-highlight-color says if the specified color has 0 alpha,
// then tap highlighting is disabled.
// http://developer.apple.com/library/safari/#documentation/appleapplications/reference/safaricssref/articles/standardcssproperties.html
@@ -2464,7 +2464,7 @@ WebColor WebViewImpl::backgroundColor() const
if (!m_page)
return Color::white;
FrameView* view = m_page->mainFrame()->view();
- Color backgroundColor = view->documentBackgroundColor();
+ StyleColor backgroundColor = view->documentBackgroundColor();
if (!backgroundColor.isValid())
return Color::white;
return backgroundColor.rgb();

Powered by Google App Engine
This is Rietveld 408576698