projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
renderer
/
web_ui_mojo_context_state.cc
diff --git
a/src/content/renderer/web_ui_mojo_context_state.cc
b/src/content/renderer/web_ui_mojo_context_state.cc
index
71ffe79
..
f1ff5f4
100644
(file)
--- a/
src/content/renderer/web_ui_mojo_context_state.cc
+++ b/
src/content/renderer/web_ui_mojo_context_state.cc
@@
-14,6
+14,7
@@
#include "gin/public/context_holder.h"
#include "gin/try_catch.h"
#include "mojo/bindings/js/core.h"
#include "gin/public/context_holder.h"
#include "gin/try_catch.h"
#include "mojo/bindings/js/core.h"
+#include "mojo/bindings/js/handle.h"
#include "mojo/bindings/js/support.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "mojo/bindings/js/support.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
#include "third_party/WebKit/public/web/WebFrame.h"
@@
-41,7
+42,7
@@
void RunMain(base::WeakPtr<gin::Runner> runner,
v8::Handle<v8::Function> start;
CHECK(gin::ConvertFromV8(isolate, module, &start));
v8::Handle<v8::Value> args[] = {
v8::Handle<v8::Function> start;
CHECK(gin::ConvertFromV8(isolate, module, &start));
v8::Handle<v8::Value> args[] = {
- gin::ConvertToV8(isolate,
handle->release().value(
)) };
+ gin::ConvertToV8(isolate,
mojo::Handle(handle->release().value()
)) };
runner->Call(start, runner->global(), 1, args);
}
runner->Call(start, runner->global(), 1, args);
}
@@
-113,7
+114,7
@@
void WebUIMojoContextState::OnFetchModuleComplete(
DCHECK_EQ(kModulePrefix,
response.url().string().utf8().substr(0, arraysize(kModulePrefix) - 1));
const std::string module =
DCHECK_EQ(kModulePrefix,
response.url().string().utf8().substr(0, arraysize(kModulePrefix) - 1));
const std::string module =
- response.url().string().utf8().substr(arraysize(kModulePrefix));
+ response.url().string().utf8().substr(arraysize(kModulePrefix)
- 1
);
// We can't delete fetch right now as the arguments to this function come from
// it and are used below. Instead use a scope_ptr to cleanup.
scoped_ptr<ResourceFetcher> deleter(fetcher);
// We can't delete fetch right now as the arguments to this function come from
// it and are used below. Instead use a scope_ptr to cleanup.
scoped_ptr<ResourceFetcher> deleter(fetcher);