diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 04:55:58 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 04:55:58 +0000 |
| commit | f0b851441ccfad4a399f3b000739301618ffece3 (patch) | |
| tree | 19f6d902b1c01bf435829bb38a80db056c9120ad /webkit | |
| parent | 08518a73423b16e5f0762b65c87604f4495618b6 (diff) | |
| download | chromium_src-f0b851441ccfad4a399f3b000739301618ffece3.zip chromium_src-f0b851441ccfad4a399f3b000739301618ffece3.tar.gz chromium_src-f0b851441ccfad4a399f3b000739301618ffece3.tar.bz2 | |
Revert r5816 due to InvokeMethods failures in test_shell_tests.
Review URL: http://codereview.chromium.org/11342
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -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 |
3 files changed, 3 insertions, 7 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 4d915cc..5edcae4 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, - windowless_ || received_first_paint_notification_ ? visible_ : false); + 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 3cc60ed..e16f1b6 100644 --- a/webkit/glue/webplugin_impl.h +++ b/webkit/glue/webplugin_impl.h @@ -305,8 +305,7 @@ class WebPluginImpl : public WebPlugin, WebPluginDelegate* delegate_; bool force_geometry_update_; bool visible_; - // Set when we receive the first paint notification for a windowed - // plugin widget. + // Set when we receive the first paint notification for the 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 74f5bd6..287d268 100644 --- a/webkit/port/bindings/v8/v8_np_utils.cpp +++ b/webkit/port/bindings/v8/v8_np_utils.cpp @@ -53,10 +53,7 @@ void ConvertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject *owner, if (object.IsEmpty()) return; - if (object->IsInt32()) { - INT32_TO_NPVARIANT(object->NumberValue(), *result); - - } else if (object->IsNumber()) { + if (object->IsNumber()) { DOUBLE_TO_NPVARIANT(object->NumberValue(), *result); } else if (object->IsBoolean()) { |