Fix layering of ApplicationCacheHost

Source/core/loader/appcache/ApplicationCacheHost.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 
-#include "public/platform/WebURL.h"
-#include "public/platform/WebURLError.h"
-#include "public/platform/WebURLResponse.h"
-#include "public/platform/WebVector.h"
-#include "ApplicationCacheHostInternal.h"
-#include "WebFrameImpl.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/events/ProgressEvent.h"
+#include "core/frame/Frame.h"
+#include "core/frame/Settings.h"
 #include "core/inspector/InspectorApplicationCacheAgent.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/appcache/ApplicationCache.h"
-#include "core/frame/Frame.h"
+#include "core/loader/appcache/ApplicationCacheHostInternal.h"
 #include "core/page/Page.h"
-#include "core/frame/Settings.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/weborigin/SecurityOrigin.h"
+#include "public/platform/WebURL.h"
+#include "public/platform/WebURLError.h"
+#include "public/platform/WebURLResponse.h"
+#include "public/platform/WebVector.h"
 
 using namespace blink;
 
 namespace WebCore {
 
 // We provide a custom implementation of this class that calls out to the
 // embedding application instead of using WebCore's built in appcache system.
 // This file replaces webcore/appcache/ApplicationCacheHost.cpp in our build.
 
 ApplicationCacheHost::ApplicationCacheHost(DocumentLoader* documentLoader)
@@ skipping 13 matching lines @@
     // We defer creating the outer host object to avoid spurious creation/destruction
     // around creating empty documents. At this point, we're initiating a main resource
     // load for the document, so its for real.
 
     if (!isApplicationCacheEnabled())
         return;
 
     m_internal = adoptPtr(new ApplicationCacheHostInternal(this));
     if (m_internal->m_outerHost) {
         WrappedResourceRequest wrapped(request);
-        m_internal->m_outerHost->willStartMainResourceRequest(wrapped, WebFrameImpl::fromFrame(m_documentLoader->frame()));
-    } else
+
+        const WebApplicationCacheHost* spawningHost = 0;
+        if (Frame* frame = m_documentLoader->frame()) {
+            Frame* spawningFrame = frame->tree().parent();
+            if (!spawningFrame)
+                spawningFrame = frame->loader().opener();
+            if (!spawningFrame)
+                spawningFrame = frame;
+            if (DocumentLoader* spawningDocLoader = spawningFrame->loader().documentLoader())
+                spawningHost = ApplicationCacheHostInternal::toWebApplicationCacheHost(spawningDocLoader->applicationCacheHost());
+        }
+
+        m_internal->m_outerHost->willStartMainResourceRequest(wrapped, spawningHost);
+    } else {
         m_internal.clear();
+    }
 
     // NOTE: The semantics of this method, and others in this interface, are subtly different
     // than the method names would suggest. For example, in this method never returns an appcached
     // response in the SubstituteData out argument, instead we return the appcached response thru
     // the usual resource loading pipeline.
 }
 
 void ApplicationCacheHost::selectCacheWithoutManifest()
 {
     if (m_internal)
@@ skipping 138 matching lines @@
 
 void ApplicationCacheHost::abort()
 {
     if (m_internal)
         m_internal->m_outerHost->abort();
 }
 
 bool ApplicationCacheHost::isApplicationCacheEnabled()
 {
     ASSERT(m_documentLoader->frame());
-    return m_documentLoader->frame()->settings()
-           && m_documentLoader->frame()->settings()->offlineWebApplicationCacheEnabled();
+    return m_documentLoader->frame()->settings() && m_documentLoader->frame()->settings()->offlineWebApplicationCacheEnabled();
 }
 
-}  // namespace WebCore
+} // namespace WebCore