Commit empty document instead of canceling the load for blocked CSP/XFO responses.

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 76 matching lines @@
     , m_fetcher(FrameFetchContext::createContextAndFetcher(this))
     , m_originalRequest(req)
     , m_substituteData(substituteData)
     , m_request(req)
     , m_isClientRedirect(false)
     , m_replacesCurrentHistoryItem(false)
     , m_navigationType(NavigationTypeOther)
     , m_documentLoadTiming(*this)
     , m_timeOfLastDataReceived(0.0)
     , m_applicationCacheHost(ApplicationCacheHost::create(this))
+    , m_wasBlockedAfterXFrameOptionsOrCSP(false)
     , m_state(NotStarted)
     , m_inDataReceived(false)
     , m_dataBuffer(SharedBuffer::create())
 {
 }
 
 FrameLoader* DocumentLoader::frameLoader() const
 {
     if (!m_frame)
         return nullptr;
@@ skipping 265 matching lines @@
 
     if (!canShowMIMEType(m_response.mimeType(), m_frame->page()))
         return false;
     return true;
 }
 
 void DocumentLoader::cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse& response)
 {
     InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame, this, mainResourceIdentifier(), response);
 
-    frame()->document()->enforceSandboxFlags(SandboxOrigin);
-    if (FrameOwner* owner = frame()->owner())
-        owner->dispatchLoad();
+    setWasBlockedAfterXFrameOptionsOrCSP();
 
-    // The load event might have detached this frame. In that case, the load will already have been cancelled during detach.
-    if (frameLoader())
-        cancelMainResourceLoad(ResourceError::cancelledError(m_request.url()));
+    // Pretend that this was an empty HTTP 200 response.
+    clearMainResourceHandle();
+    m_response = ResourceResponse(blankURL(), "text/html", 0, nullAtom, String());
+    finishedLoading(monotonicallyIncreasingTime());
+
     return;
 }
 
 void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     ASSERT_UNUSED(resource, m_mainResource == resource);
     ASSERT_UNUSED(handle, !handle);
     RefPtrWillBeRawPtr<DocumentLoader> protect(this);
     ASSERT(frame());
 
@@ skipping 366 matching lines @@
 {
     m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing);
     if (!source.isNull())
         m_writer->appendReplacingData(source);
     endWriting(m_writer.get());
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink