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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumWin.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the WebKit project. 2 * This file is part of the WebKit project.
3 * 3 *
4 * Copyright (C) 2006 Apple Computer, Inc. 4 * Copyright (C) 2006 Apple Computer, Inc.
5 * Copyright (C) 2008, 2009 Google, Inc. 5 * Copyright (C) 2008, 2009 Google, Inc.
6 * Copyright (C) 2009 Kenneth Rohde Christiansen 6 * Copyright (C) 2009 Kenneth Rohde Christiansen
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 } 545 }
546 546
547 bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o, 547 bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o,
548 const PaintInfo& i, 548 const PaintInfo& i,
549 const IntRect& r, 549 const IntRect& r,
550 bool drawEdges) 550 bool drawEdges)
551 { 551 {
552 // Fallback to white if the specified color object is invalid. 552 // Fallback to white if the specified color object is invalid.
553 Color backgroundColor(Color::white); 553 Color backgroundColor(Color::white);
554 if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid()) 554 if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
555 backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroun dColor); 555 backgroundColor = o->resolveColor(CSSPropertyBackgroundColor);
556 556
557 // If we have background-image, don't fill the content area to expose the 557 // If we have background-image, don't fill the content area to expose the
558 // parent's background. Also, we shouldn't fill the content area if the 558 // parent's background. Also, we shouldn't fill the content area if the
559 // alpha of the color is 0. The API of Windows GDI ignores the alpha. 559 // alpha of the color is 0. The API of Windows GDI ignores the alpha.
560 // 560 //
561 // Note that we should paint the content area white if we have neither the 561 // Note that we should paint the content area white if we have neither the
562 // background color nor background image explicitly specified to keep the 562 // background color nor background image explicitly specified to keep the
563 // appearance of select element consistent with other browsers. 563 // appearance of select element consistent with other browsers.
564 bool fillContentArea = !o->style()->hasBackgroundImage() && backgroundColor. alpha(); 564 bool fillContentArea = !o->style()->hasBackgroundImage() && backgroundColor. alpha();
565 565
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 656
657 bool RenderThemeChromiumWin::shouldUseFallbackTheme(RenderStyle* style) const 657 bool RenderThemeChromiumWin::shouldUseFallbackTheme(RenderStyle* style) const
658 { 658 {
659 ControlPart part = style->appearance(); 659 ControlPart part = style->appearance();
660 if (part == CheckboxPart || part == RadioPart) 660 if (part == CheckboxPart || part == RadioPart)
661 return style->effectiveZoom() != 1; 661 return style->effectiveZoom() != 1;
662 return false; 662 return false;
663 } 663 }
664 664
665 } // namespace WebCore 665 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698