Index: Source/core/loader/SubframeLoader.cpp |
diff --git a/Source/core/loader/SubframeLoader.cpp b/Source/core/loader/SubframeLoader.cpp |
index 654329783f55abf4ba850932bcd6b126e080aee8..ea852dee2b3ff6ed25f00ac565aa07925c0fd9ae 100644 |
--- a/Source/core/loader/SubframeLoader.cpp |
+++ b/Source/core/loader/SubframeLoader.cpp |
@@ -10,13 +10,13 @@ |
* are met: |
* |
* 1. Redistributions of source code must retain the above copyright |
- * notice, this list of conditions and the following disclaimer. |
+ * notice, this list of conditions and the following disclaimer. |
* 2. Redistributions in binary form must reproduce the above copyright |
* notice, this list of conditions and the following disclaimer in the |
- * documentation and/or other materials provided with the distribution. |
+ * documentation and/or other materials provided with the distribution. |
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of |
* its contributors may be used to endorse or promote products derived |
- * from this software without specific prior written permission. |
+ * from this software without specific prior written permission. |
* |
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
@@ -53,7 +53,7 @@ |
#include "weborigin/SecurityPolicy.h" |
namespace WebCore { |
- |
+ |
using namespace HTMLNames; |
SubframeLoader::SubframeLoader(Frame* frame) |
@@ -175,7 +175,7 @@ bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const S |
} |
// If the plug-in element already contains a subframe, loadOrRedirectSubframe will re-use it. Otherwise, |
- // it will create a new frame and set it as the RenderPart's widget, causing what was previously |
+ // it will create a new frame and set it as the RenderPart's widget, causing what was previously |
// in the widget to be torn down. |
return loadOrRedirectSubframe(ownerElement, completedURL, frameName, true); |
} |
@@ -261,7 +261,7 @@ bool SubframeLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const KUR |
m_frame->loader()->checkCallImplicitClose(); |
return false; |
} |
- |
+ |
// All new frames will have m_isComplete set to true at this point due to synchronously loading |
// an empty document in FrameLoader::init(). But many frames will now be starting an |
// asynchronous load of url, so we set m_isComplete to false and then check if the load is |
@@ -269,21 +269,21 @@ bool SubframeLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const KUR |
// loads, so that checkCompleted() below won't bail early.) |
// FIXME: Can we remove this entirely? m_isComplete normally gets set to false when a load is committed. |
frame->loader()->started(); |
- |
+ |
RenderObject* renderer = ownerElement->renderer(); |
FrameView* view = frame->view(); |
if (renderer && renderer->isWidget() && view) |
toRenderWidget(renderer)->setWidget(view); |
- |
+ |
m_frame->loader()->checkCallImplicitClose(); |
- |
+ |
// Some loads are performed synchronously (e.g., about:blank and loads |
// cancelled by returning a null ResourceRequest from requestFromDelegate). |
// In these cases, the synchronous load would have finished |
- // before we could connect the signals, so make sure to send the |
+ // before we could connect the signals, so make sure to send the |
// completed() signal for the child by hand and mark the load as being |
// complete. |
- // FIXME: In this case the Frame will have finished loading before |
+ // FIXME: In this case the Frame will have finished loading before |
// it's being added to the child list. It would be a good idea to |
// create the child first, then invoke the loader separately. |
if (frame->loader()->state() == FrameStateComplete && !frame->loader()->policyDocumentLoader()) |
@@ -307,10 +307,10 @@ bool SubframeLoader::shouldUsePlugin(const KURL& url, const String& mimeType, bo |
if (m_frame->page() && (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) { |
const PluginData* pluginData = m_frame->page()->pluginData(); |
String pluginName = pluginData ? pluginData->pluginNameForMimeType(mimeType) : String(); |
- if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", false)) |
+ if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", false)) |
return true; |
} |
- |
+ |
ObjectContentType objectType = m_frame->loader()->client()->objectContentType(url, mimeType, shouldPreferPlugInsForImages); |
// If an object's content can't be handled and it has no fallback, let |
// it be handled as a plugin to show the broken plugin icon. |