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: Source/WebCore/rendering/RenderThemeMac.mm

Issue 12703032: Revert 146744 "Refactoring: Pull Node::disabled() and Node::isIn..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « Source/WebCore/dom/Node.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 enum WKMediaControllerThemeState { 131 enum WKMediaControllerThemeState {
132 MediaUIPartDisabledFlag = 1 << 0, 132 MediaUIPartDisabledFlag = 1 << 0,
133 MediaUIPartPressedFlag = 1 << 1, 133 MediaUIPartPressedFlag = 1 << 1,
134 MediaUIPartDrawEndCapsFlag = 1 << 3, 134 MediaUIPartDrawEndCapsFlag = 1 << 3,
135 }; 135 };
136 136
137 static unsigned getMediaUIPartStateFlags(Node* node) 137 static unsigned getMediaUIPartStateFlags(Node* node)
138 { 138 {
139 unsigned flags = 0; 139 unsigned flags = 0;
140 140
141 if (node->isElementNode() && toElement(node)->disabled()) 141 if (node->disabled())
142 flags |= MediaUIPartDisabledFlag; 142 flags |= MediaUIPartDisabledFlag;
143 else if (node->active()) 143 else if (node->active())
144 flags |= MediaUIPartPressedFlag; 144 flags |= MediaUIPartPressedFlag;
145 return flags; 145 return flags;
146 } 146 }
147 147
148 // Utility to scale when the UI part are not scaled by wkDrawMediaUIPart 148 // Utility to scale when the UI part are not scaled by wkDrawMediaUIPart
149 static FloatRect getUnzoomedRectAndAdjustCurrentContext(RenderObject* o, const P aintInfo& paintInfo, const IntRect &originalRect) 149 static FloatRect getUnzoomedRectAndAdjustCurrentContext(RenderObject* o, const P aintInfo& paintInfo, const IntRect &originalRect)
150 { 150 {
151 float zoomLevel = o->style()->effectiveZoom(); 151 float zoomLevel = o->style()->effectiveZoom();
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 } 412 }
413 413
414 IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonB ox, const IntSize& size) const 414 IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonB ox, const IntSize& size) const
415 { 415 {
416 return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size); 416 return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
417 } 417 }
418 418
419 #endif // ENABLE(VIDEO) 419 #endif // ENABLE(VIDEO)
420 420
421 } // namespace WebCore 421 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Node.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698