OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP.

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 359 matching lines @@
         return false;
     }
 
     if (!canShowMIMEType(m_response.mimeType(), m_frame->page()))
         return false;
     return true;
 }
 
 void DocumentLoader::cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse& response)
 {
+    // TODO(alexmos): Figure out how this needs to be called in OOPIF scenarios.
     InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame, this, mainResourceIdentifier(), response);
 
-    frame()->document()->enforceSandboxFlags(SandboxOrigin);
-    if (FrameOwner* owner = frame()->owner())
-        owner->dispatchLoad();
+    // If this load was started in a different process, that process needs to
+    // be notified about the block, so that it can fire the FrameOwner load
+    // event and set a unique origin for the frame that was blocked.
+    //
+    // TODO(mkwst,alexmos): This will become unnecessary after XFO and CSP
+    // enforcement is moved to the browser process (https://crbug.com/555418).
+    frameLoader()->client()->didBlockLoad();
+
+    frame()->updateForBlockedLoad();
 
     // 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()));
     return;
 }
 
 void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     ASSERT_UNUSED(resource, m_mainResource == resource);
@@ skipping 370 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