Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: third_party/WebKit/Source/core/page/PagePopupClient.cpp

Issue 1454613002: Page popups should respect zoom factor of the anchor element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add 1.25 zoom tests Created 5 years 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
OLDNEW
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
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 "config.h" 31 #include "config.h"
32 #include "core/page/PagePopupClient.h" 32 #include "core/page/PagePopupClient.h"
33 33
34 #include "core/dom/NodeComputedStyle.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
40 float PagePopupClient::zoomFactor()
41 {
42 if (const ComputedStyle* style = ownerElement().computedStyle())
43 return style->effectiveZoom();
44 if (LocalFrame* frame = ownerElement().document().frame())
45 return frame->pageZoomFactor();
46 return 1;
47 }
48
39 #define addLiteral(literal, data) data->append(literal, sizeof(literal) - 1) 49 #define addLiteral(literal, data) data->append(literal, sizeof(literal) - 1)
40 50
41 void PagePopupClient::addJavaScriptString(const String& str, SharedBuffer* data) 51 void PagePopupClient::addJavaScriptString(const String& str, SharedBuffer* data)
42 { 52 {
43 addLiteral("\"", data); 53 addLiteral("\"", data);
44 StringBuilder builder; 54 StringBuilder builder;
45 builder.reserveCapacity(str.length()); 55 builder.reserveCapacity(str.length());
46 for (unsigned i = 0; i < str.length(); ++i) { 56 for (unsigned i = 0; i < str.length(); ++i) {
47 if (str[i] == '\r') { 57 if (str[i] == '\r') {
48 builder.append("\\r"); 58 builder.append("\\r");
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 addLiteral(": {", data); 136 addLiteral(": {", data);
127 addProperty("x", rect.x(), data); 137 addProperty("x", rect.x(), data);
128 addProperty("y", rect.y(), data); 138 addProperty("y", rect.y(), data);
129 addProperty("width", rect.width(), data); 139 addProperty("width", rect.width(), data);
130 addProperty("height", rect.height(), data); 140 addProperty("height", rect.height(), data);
131 addLiteral("},\n", data); 141 addLiteral("},\n", data);
132 } 142 }
133 143
134 } // namespace blink 144 } // namespace blink
135 145
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/PagePopupClient.h ('k') | third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698