diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-29 17:46:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 17:46:54 +0000 |
| commit | 3d66f12460cad35b19708356fe4d3a8d4d83cb08 (patch) | |
| tree | b1da003b7a4988ae4d4e161b3758bf50f710ee2e | |
| parent | 5c047f08716d0f7fdd0315a30a032cbde7f18ddc (diff) | |
| parent | 6db11f2d9323637975dcdefa1fcfe10c0cbbe38b (diff) | |
| download | chromium-libpac-3d66f12460cad35b19708356fe4d3a8d4d83cb08.tar.gz | |
am 6db11f2d: am 10ad12a1: Merge "Match renaming of ExternalAsciiStringResource."
* commit '6db11f2d9323637975dcdefa1fcfe10c0cbbe38b':
Match renaming of ExternalAsciiStringResource.
| -rw-r--r-- | src/proxy_resolver_v8.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index dcd27a1..4d43253 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -116,7 +116,8 @@ class V8ExternalStringFromScriptData }; // External string wrapper so V8 can access a string literal. -class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource { +class V8ExternalASCIILiteral + : public v8::String::ExternalOneByteStringResource { public: // |ascii| must be a NULL-terminated C string, and must remain valid // throughout this object's lifetime. |