OOPIFs: Fixing submitting forms targeting a remote frame.

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

 /*
  * Copyright (C) 2010 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 252 matching lines @@
 KURL FormSubmission::requestURL() const
 {
     if (m_method == FormSubmission::PostMethod)
         return m_action;
 
     KURL requestURL(m_action);
     requestURL.setQuery(m_formData->flattenToString());
     return requestURL;
 }
 
 void FormSubmission::populateFrameLoadRequest(FrameLoadRequest& frameRequest)

[Nate Chapin, 2016/06/07 21:35:51]

I'm not sure this is worth keeping anymore. Maybe just have the sole caller get
the ResourceRequest from FormSubmission and setFrameName() directly?

[Łukasz Anforowicz, 2016/06/08 20:32:43]

Actually, I decided to go through RemoteFrame::navigate (which takes a
FrameLoadRequest& rather than ResourceRequest&) so let me keep the whole
populateFrameLoadRequest and avoid introducing a separate
populateResourceRequest.

 {
     if (!m_target.isEmpty())
         frameRequest.setFrameName(m_target);
 
+    populateResourceRequest(frameRequest.resourceRequest());
+}
+
+void FormSubmission::populateResourceRequest(ResourceRequest& resourceRequest)

[Nate Chapin, 2016/06/07 21:35:51]

Maybe have this return a ResourceRequest instead of populating an existing one?

[Łukasz Anforowicz, 2016/06/08 20:32:43]

Good idea.  Let me change
    void FormSubmission::populateFrameLoadRequest(FrameLoadRequest&)
into
    FrameLoadRequest FormSubmission::createFrameLoadRequest(Document*
originDocument)

+{
     if (m_method == FormSubmission::PostMethod) {
-        frameRequest.resourceRequest().setHTTPMethod("POST");
-        frameRequest.resourceRequest().setHTTPBody(m_formData);
+        resourceRequest.setHTTPMethod("POST");
+        resourceRequest.setHTTPBody(m_formData);
 
         // construct some user headers if necessary
         if (m_boundary.isEmpty())
-            frameRequest.resourceRequest().setHTTPContentType(m_contentType);
+            resourceRequest.setHTTPContentType(m_contentType);
         else
-            frameRequest.resourceRequest().setHTTPContentType(m_contentType + "; boundary=" + m_boundary);
+            resourceRequest.setHTTPContentType(m_contentType + "; boundary=" + m_boundary);
     }
 
-    frameRequest.resourceRequest().setURL(requestURL());
+    resourceRequest.setURL(requestURL());
 }
 
 } // namespace blink