diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 00:12:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 00:12:17 +0000 |
| commit | 53e6c0a0bac5dec0f4249bf99d42df25b609a3db (patch) | |
| tree | c61219e8989ce4e2a9ab4fe06d5e5384117601b4 /webkit | |
| parent | a9f206fe4f79573c7c8f90242738a6dc909afc0c (diff) | |
| download | chromium_src-53e6c0a0bac5dec0f4249bf99d42df25b609a3db.zip chromium_src-53e6c0a0bac5dec0f4249bf99d42df25b609a3db.tar.gz chromium_src-53e6c0a0bac5dec0f4249bf99d42df25b609a3db.tar.bz2 | |
Fix a ui test and test_shell_tests results since numbers
are now doubles (to match Safari). This was done in
http://trac.webkit.org/changeset/72974
BUG=64874
Review URL: http://codereview.chromium.org/5482002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/cpp_bound_class_unittest.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/plugins/test/plugin_windowed_test.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index f40b66b..283b807 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -238,8 +238,7 @@ TEST_F(CppBoundClassTest, InvokeMethods) { "example.echoValue()", "null", // Too few arguments "example.echoType(false)", "true", - // Re-enable after merging r72243. - //"example.echoType(19)", "3.14159", + "example.echoType(19)", "3.14159", "example.echoType(9.876)", "3.14159", "example.echoType('test string')", "'Success!'", "example.echoType()", "null", // Too few arguments diff --git a/webkit/glue/plugins/test/plugin_windowed_test.cc b/webkit/glue/plugins/test/plugin_windowed_test.cc index 2ed3ae6..c82aa55 100644 --- a/webkit/glue/plugins/test/plugin_windowed_test.cc +++ b/webkit/glue/plugins/test/plugin_windowed_test.cc @@ -90,8 +90,8 @@ NPError WindowedPluginTest::Destroy() { bool result = HostFunctions()->evaluate( id(), window_obj, &script_string, &result_var); if (!result || - result_var.type != NPVariantType_Int32 || - result_var.value.intValue != 42) { + result_var.type != NPVariantType_Double || + result_var.value.doubleValue != 42.0) { SetError("Failed to script during NPP_Destroy"); } } |