Merge 112184

Source/WebCore/loader/FormState.h

 /*
  * Copyright (C) 2006, 2009 Apple 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. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
  */
 
 #ifndef FormState_h
 #define FormState_h
 
 #include "PlatformString.h"
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-    class Frame;
+    class Document;
     class HTMLFormElement;
 
     enum FormSubmissionTrigger {
         SubmittedByJavaScript,
         NotSubmittedByJavaScript
     };
     
     typedef Vector<std::pair<String, String> > StringPairVector;
 
     class FormState : public RefCounted<FormState> {
     public:
-        static PassRefPtr<FormState> create(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Frame>, FormSubmissionTrigger);
+        static PassRefPtr<FormState> create(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document>, FormSubmissionTrigger);
 
         HTMLFormElement* form() const { return m_form.get(); }
         const StringPairVector& textFieldValues() const { return m_textFieldValues; }
-        Frame* sourceFrame() const { return m_sourceFrame.get(); }
+        Document* sourceDocument() const { return m_sourceDocument.get(); }
         FormSubmissionTrigger formSubmissionTrigger() const { return m_formSubmissionTrigger; }
 
     private:
-        FormState(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Frame>, FormSubmissionTrigger);
+        FormState(PassRefPtr<HTMLFormElement>, StringPairVector& textFieldValuesToAdopt, PassRefPtr<Document>, FormSubmissionTrigger);
 
         RefPtr<HTMLFormElement> m_form;
         StringPairVector m_textFieldValues;
-        RefPtr<Frame> m_sourceFrame;
+        RefPtr<Document> m_sourceDocument;
         FormSubmissionTrigger m_formSubmissionTrigger;
     };
 
 }
 
 #endif // FormState_h