diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:00:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:00:51 -0800 |
| commit | bc0688665b65cce4fec4a58f289e8fbac55af976 (patch) | |
| tree | 36882563e661afd21008ad31d761f1e5a170f9eb /WebCore/rendering/RenderListBox.cpp | |
| parent | 9443700060dfd3b488a3bdf30cfa547135478a7f (diff) | |
| parent | b880d713c04257ca40abfef97c300afdead423b8 (diff) | |
| download | external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.zip external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.gz external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.bz2 | |
am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit 'b880d713c04257ca40abfef97c300afdead423b8'
* commit 'b880d713c04257ca40abfef97c300afdead423b8':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/rendering/RenderListBox.cpp')
| -rw-r--r-- | WebCore/rendering/RenderListBox.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderListBox.cpp b/WebCore/rendering/RenderListBox.cpp index 0edfdef..15c652c 100644 --- a/WebCore/rendering/RenderListBox.cpp +++ b/WebCore/rendering/RenderListBox.cpp @@ -321,7 +321,8 @@ void RenderListBox::paintItemForeground(PaintInfo& paintInfo, int tx, int ty, in textColor = theme()->inactiveListBoxSelectionForegroundColor(); } - paintInfo.context->setFillColor(textColor); + ColorSpace colorSpace = itemStyle->colorSpace(); + paintInfo.context->setFillColor(textColor, colorSpace); Font itemFont = style()->font(); if (isOptionGroupElement(element)) { @@ -358,9 +359,10 @@ void RenderListBox::paintItemBackground(PaintInfo& paintInfo, int tx, int ty, in // Draw the background for this list box item if (!element->renderStyle() || element->renderStyle()->visibility() != HIDDEN) { + ColorSpace colorSpace = element->renderStyle() ? element->renderStyle()->colorSpace() : style()->colorSpace(); IntRect itemRect = itemBoundingBoxRect(tx, ty, listIndex); itemRect.intersect(controlClipRect(tx, ty)); - paintInfo.context->fillRect(itemRect, backColor); + paintInfo.context->fillRect(itemRect, backColor, colorSpace); } } |