diff options
author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:08:17 +0000 |
---|---|---|
committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:08:17 +0000 |
commit | 73f5d66b06b9a02626a8addecb24986a88430176 (patch) | |
tree | d7348008e89272c3ad907c6a01b94e7e8960a0a4 /webkit/tools/test_shell/test_shell_main.cc | |
parent | b1412de10508641134801305b47c8f7255ac2280 (diff) | |
download | chromium_src-73f5d66b06b9a02626a8addecb24986a88430176.zip chromium_src-73f5d66b06b9a02626a8addecb24986a88430176.tar.gz chromium_src-73f5d66b06b9a02626a8addecb24986a88430176.tar.bz2 |
Make the net resource interface use StringPiece instead of std::string. This means we can point directly into the resource in the binary, instead of copying. This makes sense for the TLD data, which doesn't need to be copied around.
Review URL: http://codereview.chromium.org/11506
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_main.cc')
-rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index b5a19a74..909cfa9 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -31,6 +31,7 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/stats_table.h" +#include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/trace_event.h" @@ -58,17 +59,17 @@ static int kStatsFileThreads = 20; static int kStatsFileCounters = 200; #if defined(OS_WIN) -std::string GetDataResource(HMODULE module, int resource_id) { +StringPiece GetRawDataResource(HMODULE module, int resource_id) { void* data_ptr; size_t data_size; return base::GetDataResourceFromModule(module, resource_id, &data_ptr, &data_size) ? - std::string(static_cast<char*>(data_ptr), data_size) : std::string(); + StringPiece(static_cast<char*>(data_ptr), data_size) : StringPiece(); } // This is called indirectly by the network layer to access resources. -std::string NetResourceProvider(int key) { - return GetDataResource(::GetModuleHandle(NULL), key); +StringPiece NetResourceProvider(int key) { + return GetRawDataResource(::GetModuleHandle(NULL), key); } #endif |