| Index: Source/core/rendering/RenderTheme.cpp
|
| diff --git a/Source/core/rendering/RenderTheme.cpp b/Source/core/rendering/RenderTheme.cpp
|
| index a050bc43fcc942bb38424b9dd2d4d83aa6b3878c..e30567edc1df83478230689d956e11363f26ce49 100644
|
| --- a/Source/core/rendering/RenderTheme.cpp
|
| +++ b/Source/core/rendering/RenderTheme.cpp
|
| @@ -629,11 +629,11 @@ bool RenderTheme::supportsFocusRing(const RenderStyle* style) const
|
| bool RenderTheme::stateChanged(RenderObject* o, ControlState state) const
|
| {
|
| // Default implementation assumes the controls don't respond to changes in :hover state
|
| - if (state == HoverState && !supportsHover(o->style()))
|
| + if (state == HoverControlState && !supportsHover(o->style()))
|
| return false;
|
|
|
| // Assume pressed state is only responded to if the control is enabled.
|
| - if (state == PressedState && !isEnabled(o))
|
| + if (state == PressedControlState && !isEnabled(o))
|
| return false;
|
|
|
| // Repaint the control.
|
| @@ -645,27 +645,27 @@ ControlStates RenderTheme::controlStatesForRenderer(const RenderObject* o) const
|
| {
|
| ControlStates result = 0;
|
| if (isHovered(o)) {
|
| - result |= HoverState;
|
| + result |= HoverControlState;
|
| if (isSpinUpButtonPartHovered(o))
|
| - result |= SpinUpState;
|
| + result |= SpinUpControlState;
|
| }
|
| if (isPressed(o)) {
|
| - result |= PressedState;
|
| + result |= PressedControlState;
|
| if (isSpinUpButtonPartPressed(o))
|
| - result |= SpinUpState;
|
| + result |= SpinUpControlState;
|
| }
|
| if (isFocused(o) && o->style()->outlineStyleIsAuto())
|
| - result |= FocusState;
|
| + result |= FocusControlState;
|
| if (isEnabled(o))
|
| - result |= EnabledState;
|
| + result |= EnabledControlState;
|
| if (isChecked(o))
|
| - result |= CheckedState;
|
| + result |= CheckedControlState;
|
| if (isReadOnlyControl(o))
|
| - result |= ReadOnlyState;
|
| + result |= ReadOnlyControlState;
|
| if (!isActive(o))
|
| - result |= WindowInactiveState;
|
| + result |= WindowInactiveControlState;
|
| if (isIndeterminate(o))
|
| - result |= IndeterminateState;
|
| + result |= IndeterminateControlState;
|
| return result;
|
| }
|
|
|
|
|