diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp | |
parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp')
-rw-r--r-- | Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp index 725324703..82af01d73 100644 --- a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp +++ b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp @@ -102,11 +102,12 @@ void TapHighlightController::drawRect(PageOverlay* pageOverlay, GraphicsContext& if (m_path.isEmpty()) return; - float fractionFadedIn = pageOverlay->fractionFadedIn(); - { GraphicsContextStateSaver stateSaver(context); - context.setFillColor(highlightColor(m_color, fractionFadedIn), ColorSpaceSRGB); + if (m_webPage->drawingArea()->pageOverlayShouldApplyFadeWhenPainting()) + context.setFillColor(highlightColor(m_color, pageOverlay->fractionFadedIn()), ColorSpaceSRGB); + else + context.setFillColor(m_color, ColorSpaceSRGB); context.fillPath(m_path); } } |