diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
| commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
| tree | badea60062e611382d8a37e3b0bfda8d69760c2b /gin | |
| parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
| download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'gin')
| -rw-r--r-- | gin/converter.cc | 4 | ||||
| -rw-r--r-- | gin/converter_unittest.cc | 2 | ||||
| -rw-r--r-- | gin/gin.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | gin/gin.target.linux-x86_64.mk | 1 |
10 files changed, 3 insertions, 11 deletions
diff --git a/gin/converter.cc b/gin/converter.cc index 29da322c1a..07437b7edc 100644 --- a/gin/converter.cc +++ b/gin/converter.cc @@ -35,7 +35,7 @@ Handle<Value> Converter<int32_t>::ToV8(Isolate* isolate, int32_t val) { bool Converter<int32_t>::FromV8(Isolate* isolate, Handle<Value> val, int32_t* out) { - if (!val->IsNumber()) + if (!val->IsInt32()) return false; *out = val->Int32Value(); return true; @@ -47,7 +47,7 @@ Handle<Value> Converter<uint32_t>::ToV8(Isolate* isolate, uint32_t val) { bool Converter<uint32_t>::FromV8(Isolate* isolate, Handle<Value> val, uint32_t* out) { - if (!val->IsNumber()) + if (!val->IsUint32()) return false; *out = val->Uint32Value(); return true; diff --git a/gin/converter_unittest.cc b/gin/converter_unittest.cc index cf1affc0e1..791d7e66ec 100644 --- a/gin/converter_unittest.cc +++ b/gin/converter_unittest.cc @@ -89,7 +89,7 @@ TEST_F(ConverterTest, Int32) { { Integer::New(instance_->isolate(), 0).As<Value>(), true, 0 }, { Integer::New(instance_->isolate(), 1).As<Value>(), true, 1 }, { Number::New(instance_->isolate(), -1).As<Value>(), true, -1 }, - { Number::New(instance_->isolate(), 1.1).As<Value>(), true, 1 }, + { Number::New(instance_->isolate(), 1.1).As<Value>(), false, 0 }, { String::NewFromUtf8(instance_->isolate(), "42").As<Value>(), false, 0 }, { String::NewFromUtf8(instance_->isolate(), "foo").As<Value>(), false, 0 }, { Object::New(instance_->isolate()).As<Value>(), false, 0 }, diff --git a/gin/gin.target.darwin-arm.mk b/gin/gin.target.darwin-arm.mk index 538b89122f..3ee5cc7262 100644 --- a/gin/gin.target.darwin-arm.mk +++ b/gin/gin.target.darwin-arm.mk @@ -249,7 +249,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.darwin-mips.mk b/gin/gin.target.darwin-mips.mk index e7202ceeae..d02b435bae 100644 --- a/gin/gin.target.darwin-mips.mk +++ b/gin/gin.target.darwin-mips.mk @@ -245,7 +245,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.darwin-x86.mk b/gin/gin.target.darwin-x86.mk index 51eb982e04..431dc2184e 100644 --- a/gin/gin.target.darwin-x86.mk +++ b/gin/gin.target.darwin-x86.mk @@ -247,7 +247,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.darwin-x86_64.mk b/gin/gin.target.darwin-x86_64.mk index 450d526b1d..043e2e5ed1 100644 --- a/gin/gin.target.darwin-x86_64.mk +++ b/gin/gin.target.darwin-x86_64.mk @@ -247,7 +247,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.linux-arm.mk b/gin/gin.target.linux-arm.mk index 538b89122f..3ee5cc7262 100644 --- a/gin/gin.target.linux-arm.mk +++ b/gin/gin.target.linux-arm.mk @@ -249,7 +249,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.linux-mips.mk b/gin/gin.target.linux-mips.mk index e7202ceeae..d02b435bae 100644 --- a/gin/gin.target.linux-mips.mk +++ b/gin/gin.target.linux-mips.mk @@ -245,7 +245,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.linux-x86.mk b/gin/gin.target.linux-x86.mk index 51eb982e04..431dc2184e 100644 --- a/gin/gin.target.linux-x86.mk +++ b/gin/gin.target.linux-x86.mk @@ -247,7 +247,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/gin/gin.target.linux-x86_64.mk b/gin/gin.target.linux-x86_64.mk index 450d526b1d..043e2e5ed1 100644 --- a/gin/gin.target.linux-x86_64.mk +++ b/gin/gin.target.linux-x86_64.mk @@ -247,7 +247,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |