Chromium Code Reviews| 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 "config.h" | 31 #include "config.h" |
| 32 #include "core/page/PagePopupClient.h" | 32 #include "core/page/PagePopupClient.h" |
| 33 | 33 |
| 34 #include "platform/text/PlatformLocale.h" | |
| 34 #include "wtf/text/StringBuilder.h" | 35 #include "wtf/text/StringBuilder.h" |
| 35 | 36 |
| 36 namespace blink { | 37 namespace blink { |
| 37 | 38 |
| 38 #define addLiteral(literal, data) data->append(literal, sizeof(literal) - 1) | 39 #define addLiteral(literal, data) data->append(literal, sizeof(literal) - 1) |
| 39 | 40 |
| 40 void PagePopupClient::addJavaScriptString(const String& str, SharedBuffer* data) | 41 void PagePopupClient::addJavaScriptString(const String& str, SharedBuffer* data) |
| 41 { | 42 { |
| 42 addLiteral("\"", data); | 43 addLiteral("\"", data); |
| 43 StringBuilder builder; | 44 StringBuilder builder; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 { | 103 { |
| 103 data->append(name, strlen(name)); | 104 data->append(name, strlen(name)); |
| 104 addLiteral(": {", data); | 105 addLiteral(": {", data); |
| 105 addProperty("x", rect.x(), data); | 106 addProperty("x", rect.x(), data); |
| 106 addProperty("y", rect.y(), data); | 107 addProperty("y", rect.y(), data); |
| 107 addProperty("width", rect.width(), data); | 108 addProperty("width", rect.width(), data); |
| 108 addProperty("height", rect.height(), data); | 109 addProperty("height", rect.height(), data); |
| 109 addLiteral("},\n", data); | 110 addLiteral("},\n", data); |
| 110 } | 111 } |
| 111 | 112 |
| 113 Locale& PagePopupClient::locale() | |
|
tkent
2014/12/15 09:26:04
Why do you add default implementation?
keishi
2014/12/16 03:53:24
Removed.
| |
| 114 { | |
| 115 return Locale::defaultLocale(); | |
| 116 } | |
| 117 | |
| 112 } // namespace blink | 118 } // namespace blink |
| 113 | 119 |
| OLD | NEW |