diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/cpp_bound_class_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.h | 3 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_np_utils.cpp | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index d57604a..73b118f2 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -194,7 +194,7 @@ TEST_F(CppBoundClassTest, InvokeMethods) { "example.echoValue()", "null", // Too few arguments "example.echoType(false)", "true", - "example.echoType(19)", "3.14159", + "example.echoType(19)", "7", "example.echoType(9.876)", "3.14159", "example.echoType('test string')", "'Success!'", "example.echoType()", "null", // Too few arguments diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 5edcae4..4d915cc 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -656,7 +656,7 @@ void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) { delegate_->UpdateGeometry( webkit_glue::FromIntRect(window_rect), webkit_glue::FromIntRect(clip_rect), cutout_rects, - received_first_paint_notification_? visible_ : false); + windowless_ || received_first_paint_notification_ ? visible_ : false); // delegate_ can go away as a result of above call, so check it first. if (force_geometry_update_ && delegate_) { diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h index e16f1b6..3cc60ed 100644 --- a/webkit/glue/webplugin_impl.h +++ b/webkit/glue/webplugin_impl.h @@ -305,7 +305,8 @@ class WebPluginImpl : public WebPlugin, WebPluginDelegate* delegate_; bool force_geometry_update_; bool visible_; - // Set when we receive the first paint notification for the plugin widget. + // Set when we receive the first paint notification for a windowed + // plugin widget. bool received_first_paint_notification_; WebPluginContainer* widget_; diff --git a/webkit/port/bindings/v8/v8_np_utils.cpp b/webkit/port/bindings/v8/v8_np_utils.cpp index 287d268..74f5bd6 100644 --- a/webkit/port/bindings/v8/v8_np_utils.cpp +++ b/webkit/port/bindings/v8/v8_np_utils.cpp @@ -53,7 +53,10 @@ void ConvertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject *owner, if (object.IsEmpty()) return; - if (object->IsNumber()) { + if (object->IsInt32()) { + INT32_TO_NPVARIANT(object->NumberValue(), *result); + + } else if (object->IsNumber()) { DOUBLE_TO_NPVARIANT(object->NumberValue(), *result); } else if (object->IsBoolean()) { |