Changeset 62751 in webkit


Ignore:
Timestamp:
Jul 7, 2010 8:41:24 PM (14 years ago)
Author:
tkent@chromium.org
Message:

[DRT/Chromium] Support for indeterminate checkbox
​https://bugs.webkit.org/show_bug.cgi?id=41747

Reviewed by Adam Barth.

Import ​http://src.chromium.org/viewvc/chrome?view=rev&revision=51499

  • DumpRenderTree/chromium/WebThemeControlDRT.cpp:

(WebThemeControlDRT::draw):

  • DumpRenderTree/chromium/WebThemeControlDRT.h:

(WebThemeControlDRT::):

  • DumpRenderTree/chromium/WebThemeEngineDRT.cpp:

(WebThemeEngineDRT::paintButton):

Location:
trunk/WebKitTools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r62750 r62751  
     12010-07-07  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        [DRT/Chromium] Support for indeterminate checkbox
     6        https://bugs.webkit.org/show_bug.cgi?id=41747
     7
     8        Import http://src.chromium.org/viewvc/chrome?view=rev&revision=51499
     9
     10        * DumpRenderTree/chromium/WebThemeControlDRT.cpp:
     11        (WebThemeControlDRT::draw):
     12        * DumpRenderTree/chromium/WebThemeControlDRT.h:
     13        (WebThemeControlDRT::):
     14        * DumpRenderTree/chromium/WebThemeEngineDRT.cpp:
     15        (WebThemeEngineDRT::paintButton):
     16
    1172010-07-07  Sam Weinig  <sam@webkit.org>
    218

  • trunk/WebKitTools/DumpRenderTree/chromium/WebThemeControlDRT.cpp

    r60883 r62751  
    333333        break;
    334334
     335    case IndeterminateCheckboxType:
     336        // Indeterminate checkbox is a box containing '-'.
     337        nestedBoxes(checkIndent, halfHeight, checkIndent, halfHeight, m_bgColor, m_fgColor);
     338        break;
     339
    335340    case UncheckedRadioType:
    336341        circle(SkIntToScalar(halfHeight), m_bgColor);

  • trunk/WebKitTools/DumpRenderTree/chromium/WebThemeControlDRT.h

    r61663 r62751  
    9999        UncheckedBoxType,
    100100        CheckedBoxType,
     101        IndeterminateCheckboxType,
    101102        UncheckedRadioType,
    102103        CheckedRadioType,

  • trunk/WebKitTools/DumpRenderTree/chromium/WebThemeEngineDRT.cpp

    r60883 r62751  
    148148            break;
    149149
     150        case CBS_MIXEDNORMAL:
     151            // Classic theme can't represent mixed state checkbox. We assume
     152            // it's equivalent to unchecked.
     153            ASSERT(classicState == DFCS_BUTTONCHECK);
     154            ctype = WebThemeControlDRT::IndeterminateCheckboxType;
     155            cstate = WebThemeControlDRT::NormalState;
     156            break;
     157
     158        case CBS_MIXEDHOT:
     159            ASSERT(classicState == (DFCS_BUTTONCHECK | DFCS_HOT));
     160            ctype = WebThemeControlDRT::IndeterminateCheckboxType;
     161            cstate = WebThemeControlDRT::HotState;
     162            break;
     163
     164        case CBS_MIXEDPRESSED:
     165            ASSERT(classicState == (DFCS_BUTTONCHECK | DFCS_PUSHED));
     166            ctype = WebThemeControlDRT::IndeterminateCheckboxType;
     167            cstate = WebThemeControlDRT::PressedState;
     168            break;
     169
     170        case CBS_MIXEDDISABLED:
     171            ASSERT(classicState == (DFCS_BUTTONCHECK | DFCS_INACTIVE));
     172            ctype = WebThemeControlDRT::IndeterminateCheckboxType;
     173            cstate = WebThemeControlDRT::DisabledState;
     174            break;
     175
    150176        default:
    151177            ASSERT_NOT_REACHED();
Note: See TracChangeset for help on using the changeset viewer.