FrameLoader::subresourceLoader() should return a reference.
<https://webkit.org/b/120830>
Reviewed by Anders Carlsson.
There is always a SubresourceLoader, so this method could never return null.
Also made m_subresourceLoader an OwnPtr to reduce header dependencies.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155194 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp
index 9481d5c..a551121 100644
--- a/Source/WebCore/html/HTMLObjectElement.cpp
+++ b/Source/WebCore/html/HTMLObjectElement.cpp
@@ -50,6 +50,7 @@
#include "RenderWidget.h"
#include "ScriptEventListener.h"
#include "Settings.h"
+#include "SubframeLoader.h"
#include "Text.h"
#include "Widget.h"
#include <wtf/Ref.h>
@@ -206,8 +207,8 @@
// resource's URL to be given by a param named "src", "movie", "code" or "url"
// if we know that resource points to a plug-in.
if (url.isEmpty() && !urlParameter.isEmpty()) {
- SubframeLoader* loader = document().frame()->loader().subframeLoader();
- if (loader->resourceWillUsePlugin(urlParameter, serviceType, shouldPreferPlugInsForImages()))
+ SubframeLoader& loader = document().frame()->loader().subframeLoader();
+ if (loader.resourceWillUsePlugin(urlParameter, serviceType, shouldPreferPlugInsForImages()))
url = urlParameter;
}
}
@@ -316,8 +317,8 @@
if (!renderer()) // Do not load the plugin if beforeload removed this element or its renderer.
return;
- SubframeLoader* loader = document().frame()->loader().subframeLoader();
- bool success = beforeLoadAllowedLoad && hasValidClassId() && loader->requestObject(this, url, getNameAttribute(), serviceType, paramNames, paramValues);
+ SubframeLoader& loader = document().frame()->loader().subframeLoader();
+ bool success = beforeLoadAllowedLoad && hasValidClassId() && loader.requestObject(this, url, getNameAttribute(), serviceType, paramNames, paramValues);
if (!success && fallbackContent)
renderFallbackContent();
}
