diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 20:16:38 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 20:16:38 +0000 |
| commit | ce185864d3ef3d2a3fd40ae93300a5858f961c94 (patch) | |
| tree | c8a6e9f9fc755f872cdc1f384148296a81bfc501 /chrome/plugin/webplugin_proxy.cc | |
| parent | 09f83fa89c9ab23b5f9623b06f1322850d21a15a (diff) | |
| download | chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.zip chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.tar.gz chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.tar.bz2 | |
Revert change 20173 because it breaks the ui_tests, plugin_tests
and most likely some page cyclers.
Review URL: http://codereview.chromium.org/155236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/webplugin_proxy.cc')
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index b2fe778..3d6a6ac 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -13,7 +13,6 @@ #include "base/singleton.h" #include "base/waitable_event.h" #include "build/build_config.h" -#include "chrome/common/child_process_logging.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_proxy.h" @@ -36,8 +35,7 @@ static ContextMap& GetContextMap() { WebPluginProxy::WebPluginProxy( PluginChannel* channel, int route_id, - WebPluginDelegate* delegate, - const GURL& page_url) + WebPluginDelegate* delegate) : channel_(channel), route_id_(route_id), cp_browsing_context_(0), @@ -45,7 +43,6 @@ WebPluginProxy::WebPluginProxy( plugin_element_(NULL), delegate_(delegate), waiting_for_paint_(false), - page_url_(page_url), ALLOW_THIS_IN_INITIALIZER_LIST(runnable_method_factory_(this)) { } @@ -162,9 +159,10 @@ NPObject* WebPluginProxy::GetWindowScriptNPObject() { if (!success) return NULL; - window_npobject_ = NPObjectProxy::Create( - channel_, npobject_route_id, npobject_ptr, modal_dialog_event_.get(), - page_url_); + window_npobject_ = NPObjectProxy::Create(channel_, + npobject_route_id, + npobject_ptr, + modal_dialog_event_.get()); return window_npobject_; } @@ -181,9 +179,10 @@ NPObject* WebPluginProxy::GetPluginElement() { if (!success) return NULL; - plugin_element_ = NPObjectProxy::Create( - channel_, npobject_route_id, npobject_ptr, modal_dialog_event_.get(), - page_url_); + plugin_element_ = NPObjectProxy::Create(channel_, + npobject_route_id, + npobject_ptr, + modal_dialog_event_.get()); return plugin_element_; } @@ -519,8 +518,6 @@ void WebPluginProxy::InitiateHTTPRangeRequest(const char* url, } void WebPluginProxy::OnPaint(const gfx::Rect& damaged_rect) { - child_process_logging::ScopedActiveURLSetter url_setter(page_url_); - Paint(damaged_rect); Send(new PluginHostMsg_InvalidateRect(route_id_, damaged_rect)); } |