| Index: Source/core/html/HTMLPlugInElement.cpp
|
| diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp
|
| index 883ccb6b6fcd5e789b739d48cae7be35a3d826be..0b2df23c31693eb216d32f4f308cd4248aba55c8 100644
|
| --- a/Source/core/html/HTMLPlugInElement.cpp
|
| +++ b/Source/core/html/HTMLPlugInElement.cpp
|
| @@ -74,7 +74,7 @@
|
|
|
| HTMLPlugInElement::~HTMLPlugInElement()
|
| {
|
| - ASSERT(m_pluginWrapper.hasNoValue()); // cleared in detach()
|
| + ASSERT(!m_pluginWrapper); // cleared in detach()
|
| ASSERT(!m_isDelayingLoadEvent);
|
|
|
| if (m_NPObject) {
|
| @@ -209,20 +209,20 @@
|
| m_pluginWrapper.clear();
|
| }
|
|
|
| -ScriptValue HTMLPlugInElement::pluginWrapper()
|
| +SharedPersistent<v8::Object>* HTMLPlugInElement::pluginWrapper()
|
| {
|
| Frame* frame = document().frame();
|
| if (!frame)
|
| - return ScriptValue();
|
| + return 0;
|
|
|
| // If the host dynamically turns off JavaScript (or Java) we will still
|
| // return the cached allocated Bindings::Instance. Not supporting this
|
| // edge-case is OK.
|
| - if (m_pluginWrapper.hasNoValue()) {
|
| + if (!m_pluginWrapper) {
|
| if (Widget* widget = pluginWidget())
|
| m_pluginWrapper = frame->script().createPluginWrapper(widget);
|
| }
|
| - return m_pluginWrapper;
|
| + return m_pluginWrapper.get();
|
| }
|
|
|
| bool HTMLPlugInElement::dispatchBeforeLoadEvent(const String& sourceURL)
|
|
|