OOPIFs: Fixing submitting forms targeting a remote frame.

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

 /*
  * 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 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.
  */
 
 #ifndef FormSubmission_h
 #define FormSubmission_h
 
+#include "core/loader/FrameLoadRequest.h"

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

Needed for createFrameLoadRequest, but introduces an include-loop that needs to
be broken by a fwd-decl in FrameLoadRequest.h

 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/Referrer.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
+class Document;
 class EncodedFormData;
 class Event;
-struct FrameLoadRequest;
 class HTMLFormElement;
 
 class FormSubmission : public GarbageCollectedFinalized<FormSubmission> {
 public:
     enum SubmitMethod { GetMethod, PostMethod, DialogMethod };
 
     class Attributes {
         DISALLOW_NEW();
         WTF_MAKE_NONCOPYABLE(Attributes);
     public:
@@ skipping 31 matching lines @@
 
         String m_action;
         AtomicString m_target;
         AtomicString m_encodingType;
         String m_acceptCharset;
     };
 
     static FormSubmission* create(HTMLFormElement*, const Attributes&, Event*);
     DECLARE_TRACE();
 
-    void populateFrameLoadRequest(FrameLoadRequest&);
+    FrameLoadRequest createFrameLoadRequest(Document* originDocument);
 
     KURL requestURL() const;
 
     SubmitMethod method() const { return m_method; }
     const KURL& action() const { return m_action; }
     const AtomicString& target() const { return m_target; }
     void clearTarget() { m_target = nullAtom; }
     HTMLFormElement* form() const { return m_form.get(); }
     EncodedFormData* data() const { return m_formData.get(); }
-    Event* event() const { return m_event.get(); }

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

This accessor is no longer needed after folding 2 statements from
ScheduledFormSubmission::fire into FormSubmission::createFrameLoadRequest.

 
     const String& result() const { return m_result; }
 
 private:
     FormSubmission(SubmitMethod, const KURL& action, const AtomicString& target, const AtomicString& contentType, HTMLFormElement*, PassRefPtr<EncodedFormData>, const String& boundary, Event*);
     // FormSubmission for DialogMethod
     FormSubmission(const String& result);
 
     // FIXME: Hold an instance of Attributes instead of individual members.
     SubmitMethod m_method;
     KURL m_action;
     AtomicString m_target;
     AtomicString m_contentType;
     Member<HTMLFormElement> m_form;
     RefPtr<EncodedFormData> m_formData;
     String m_boundary;
     Member<Event> m_event;
     String m_result;
 };
 
 } // namespace blink
 
 #endif // FormSubmission_h