Index: content/renderer/browser_plugin/browser_plugin_bindings.cc |
diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc |
index 56230a5f84c9e7f7ef3bf6cb3b953080c147fae1..c6d62b9f0865acd3af772fa6f2004c5c15a91525 100644 |
--- a/content/renderer/browser_plugin/browser_plugin_bindings.cc |
+++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc |
@@ -39,6 +39,7 @@ namespace { |
const char kAddEventListener[] = "addEventListener"; |
const char kBackMethod[] = "back"; |
+const char kContentWindow[] = "contentWindow"; |
const char kForwardMethod[] = "forward"; |
const char kGetProcessId[] = "getProcessId"; |
const char kGoMethod[] = "go"; |
@@ -58,6 +59,10 @@ bool IdentifierIsAddEventListener(NPIdentifier identifier) { |
return WebBindings::getStringIdentifier(kAddEventListener) == identifier; |
} |
+bool IdentifierIsContentWindow(NPIdentifier identifier) { |
+ return WebBindings::getStringIdentifier(kContentWindow) == identifier; |
+} |
+ |
bool IdentifierIsBackMethod(NPIdentifier identifier) { |
return WebBindings::getStringIdentifier(kBackMethod) == identifier; |
} |
@@ -269,6 +274,7 @@ bool BrowserPluginBindingsInvokeDefault(NPObject* np_obj, |
bool BrowserPluginBindingsHasProperty(NPObject* np_obj, NPIdentifier name) { |
return IdentifierIsSrcAttribute(name) || |
+ IdentifierIsContentWindow(name) || |
IdentifierIsPartitionAttribute(name); |
} |
@@ -291,6 +297,15 @@ bool BrowserPluginBindingsGetProperty(NPObject* np_obj, NPIdentifier name, |
return StringToNPVariant(src, result); |
} |
+ if (IdentifierIsContentWindow(name)) { |
+ NPObject* obj = bindings->instance()->GetContentWindow(); |
+ if (obj) { |
+ result->type = NPVariantType_Object; |
+ result->value.objectValue = WebBindings::retainObject(obj); |
+ } |
+ return true; |
+ } |
+ |
if (IdentifierIsPartitionAttribute(name)) { |
std::string partition_id = bindings->instance()->GetPartitionAttribute(); |
return StringToNPVariant(partition_id, result); |