| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Google, Inc. | 3 * Copyright (C) 2008, 2009 Google, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 if (zoomLevel != 1.0f) { | 176 if (zoomLevel != 1.0f) { |
| 177 inflatedRect.setWidth(inflatedRect.width() / zoomLevel); | 177 inflatedRect.setWidth(inflatedRect.width() / zoomLevel); |
| 178 inflatedRect.setHeight(inflatedRect.height() / zoomLevel); | 178 inflatedRect.setHeight(inflatedRect.height() / zoomLevel); |
| 179 paintInfo.context.translate(inflatedRect.x(), inflatedRect.y()); | 179 paintInfo.context.translate(inflatedRect.x(), inflatedRect.y()); |
| 180 paintInfo.context.scale(zoomLevel, zoomLevel); | 180 paintInfo.context.scale(zoomLevel, zoomLevel); |
| 181 paintInfo.context.translate(-inflatedRect.x(), -inflatedRect.y()); | 181 paintInfo.context.translate(-inflatedRect.x(), -inflatedRect.y()); |
| 182 } | 182 } |
| 183 | 183 |
| 184 NSView *view = m_layoutTheme.documentViewFor(o); | 184 NSView *view = m_layoutTheme.documentViewFor(o); |
| 185 [popupButton drawWithFrame:inflatedRect inView:view]; | 185 [popupButton drawWithFrame:inflatedRect inView:view]; |
| 186 if (!ThemeMac::drawWithFrameDrawsFocusRing() && LayoutTheme::isFocused(o) &&
o.styleRef().outlineStyleIsAuto()) | 186 if (LayoutTheme::isFocused(o) && o.styleRef().outlineStyleIsAuto()) |
| 187 [popupButton cr_drawFocusRingWithFrame:inflatedRect inView:view]; | 187 [popupButton cr_drawFocusRingWithFrame:inflatedRect inView:view]; |
| 188 [popupButton setControlView:nil]; | 188 [popupButton setControlView:nil]; |
| 189 | 189 |
| 190 return false; | 190 return false; |
| 191 } | 191 } |
| 192 | 192 |
| 193 bool ThemePainterMac::paintProgressBar(const LayoutObject& layoutObject, const P
aintInfo& paintInfo, const IntRect& rect) | 193 bool ThemePainterMac::paintProgressBar(const LayoutObject& layoutObject, const P
aintInfo& paintInfo, const IntRect& rect) |
| 194 { | 194 { |
| 195 if (!layoutObject.isProgress()) | 195 if (!layoutObject.isProgress()) |
| 196 return true; | 196 return true; |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 paintInfo.context.rotate(deg2rad(-45.0)); | 541 paintInfo.context.rotate(deg2rad(-45.0)); |
| 542 paintInfo.context.translate(-centerX, -centerY); | 542 paintInfo.context.translate(-centerX, -centerY); |
| 543 | 543 |
| 544 paintInfo.context.setFillColor(fillColor); | 544 paintInfo.context.setFillColor(fillColor); |
| 545 paintInfo.context.fillEllipse(unzoomedRect); | 545 paintInfo.context.fillEllipse(unzoomedRect); |
| 546 | 546 |
| 547 return false; | 547 return false; |
| 548 } | 548 } |
| 549 | 549 |
| 550 } // namespace blink | 550 } // namespace blink |
| OLD | NEW |