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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTheme.cpp

Issue 1468913002: Find In Page hides the text when text color matches text search hightlight color. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 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 unified diff | Download patch
OLDNEW
1 /** 1 /**
2 * This file is part of the theme implementation for form controls in WebCore. 2 * This file is part of the theme implementation for form controls in WebCore.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 case CSSValueInternalInactiveListBoxSelectionText: 808 case CSSValueInternalInactiveListBoxSelectionText:
809 return inactiveListBoxSelectionForegroundColor(); 809 return inactiveListBoxSelectionForegroundColor();
810 break; 810 break;
811 default: 811 default:
812 break; 812 break;
813 } 813 }
814 ASSERT_NOT_REACHED(); 814 ASSERT_NOT_REACHED();
815 return Color(); 815 return Color();
816 } 816 }
817 817
818 Color LayoutTheme::platformActiveTextSearchHighlightColor() const 818 Color LayoutTheme::platformTextSearchHighlightColor(bool activeMatch) const
819 { 819 {
820 return Color(255, 150, 50); // Orange. 820 if (activeMatch)
821 } 821 return Color(255, 150, 50); // Orange.
822
823 Color LayoutTheme::platformInactiveTextSearchHighlightColor() const
824 {
825 return Color(255, 255, 0); // Yellow. 822 return Color(255, 255, 0); // Yellow.
826 } 823 }
827 824
825 Color LayoutTheme::platformTextSearchColor(bool activeMatch) const
826 {
827 return Color::black;
828 }
829
828 Color LayoutTheme::tapHighlightColor() 830 Color LayoutTheme::tapHighlightColor()
829 { 831 {
830 return theme().platformTapHighlightColor(); 832 return theme().platformTapHighlightColor();
831 } 833 }
832 834
833 void LayoutTheme::setCustomFocusRingColor(const Color& c) 835 void LayoutTheme::setCustomFocusRingColor(const Color& c)
834 { 836 {
835 m_customFocusRingColor = c; 837 m_customFocusRingColor = c;
836 m_hasCustomFocusRingColor = true; 838 m_hasCustomFocusRingColor = true;
837 } 839 }
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 938
937 // padding - not honored by WinIE, needs to be removed. 939 // padding - not honored by WinIE, needs to be removed.
938 style.resetPadding(); 940 style.resetPadding();
939 941
940 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme) 942 // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
941 // for now, we will not honor it. 943 // for now, we will not honor it.
942 style.resetBorder(); 944 style.resetBorder();
943 } 945 }
944 946
945 } // namespace blink 947 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTheme.h ('k') | third_party/WebKit/Source/core/layout/line/InlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698