| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "core/page/PagePopupClient.h" | 31 #include "core/page/PagePopupClient.h" |
| 32 | 32 |
| 33 #include "core/dom/NodeComputedStyle.h" | 33 #include "core/dom/NodeComputedStyle.h" |
| 34 #include "core/frame/LocalFrame.h" |
| 34 #include "wtf/text/CharacterNames.h" | 35 #include "wtf/text/CharacterNames.h" |
| 35 #include "wtf/text/StringBuilder.h" | 36 #include "wtf/text/StringBuilder.h" |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 float PagePopupClient::zoomFactor() | 40 float PagePopupClient::zoomFactor() |
| 40 { | 41 { |
| 41 if (const ComputedStyle* style = ownerElement().computedStyle()) | 42 if (const ComputedStyle* style = ownerElement().computedStyle()) |
| 42 return style->effectiveZoom(); | 43 return style->effectiveZoom(); |
| 43 if (LocalFrame* frame = ownerElement().document().frame()) | 44 if (LocalFrame* frame = ownerElement().document().frame()) |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 addLiteral(": {", data); | 136 addLiteral(": {", data); |
| 136 addProperty("x", rect.x(), data); | 137 addProperty("x", rect.x(), data); |
| 137 addProperty("y", rect.y(), data); | 138 addProperty("y", rect.y(), data); |
| 138 addProperty("width", rect.width(), data); | 139 addProperty("width", rect.width(), data); |
| 139 addProperty("height", rect.height(), data); | 140 addProperty("height", rect.height(), data); |
| 140 addLiteral("},\n", data); | 141 addLiteral("},\n", data); |
| 141 } | 142 } |
| 142 | 143 |
| 143 } // namespace blink | 144 } // namespace blink |
| 144 | 145 |
| OLD | NEW |