Changeset 92572 in webkit

Timestamp:

Aug 7, 2011 4:29:13 AM (13 years ago)

Author:

jochen@chromium.org

Message:

Move FrameLoadRequest to loader/
​https://bugs.webkit.org/show_bug.cgi?id=65817

Reviewed by Alexey Proskuryakov.

• GNUmakefile.list.am:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• loader/FrameLoadRequest.h:

(WebCore::FrameLoadRequest::FrameLoadRequest):
(WebCore::FrameLoadRequest::isEmpty):
(WebCore::FrameLoadRequest::requester):
(WebCore::FrameLoadRequest::resourceRequest):
(WebCore::FrameLoadRequest::frameName):
(WebCore::FrameLoadRequest::setFrameName):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (2 diffs)
• WebCore.gypi (modified) (2 diffs)
• WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• loader/FrameLoadRequest.h (moved) (moved from trunk/Source/WebCore/page/FrameLoadRequest.h) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-07  Jochen Eisinger  <jochen@chromium.org>
+
+        Move FrameLoadRequest to loader/
+        https://bugs.webkit.org/show_bug.cgi?id=65817
+
+        Reviewed by Alexey Proskuryakov.
+
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/FrameLoadRequest.h:
+        (WebCore::FrameLoadRequest::FrameLoadRequest):
+        (WebCore::FrameLoadRequest::isEmpty):
+        (WebCore::FrameLoadRequest::requester):
+        (WebCore::FrameLoadRequest::resourceRequest):
+        (WebCore::FrameLoadRequest::frameName):
+        (WebCore::FrameLoadRequest::setFrameName):
+
 2011-08-07  Sam White  <samuel.white@rochester.edu>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2120 +2120 @@
         Source/WebCore/loader/FrameLoaderStateMachine.h \
         Source/WebCore/loader/FrameLoaderTypes.h \
+        Source/WebCore/loader/FrameLoadRequest.h \
         Source/WebCore/loader/FrameNetworkingContext.h \
         Source/WebCore/loader/FTPDirectoryParser.cpp \
@@ -2256 +2257 @@
         Source/WebCore/page/FrameActionScheduler.cpp \
         Source/WebCore/page/FrameActionScheduler.h \
-        Source/WebCore/page/FrameLoadRequest.h \
         Source/WebCore/page/FrameTree.cpp \
         Source/WebCore/page/FrameTree.h \

trunk/Source/WebCore/WebCore.gypi

@@ -559 +559 @@
             'loader/FrameLoaderStateMachine.h',
             'loader/FrameLoaderTypes.h',
+            'loader/FrameLoadRequest.h',
             'loader/FrameNetworkingContext.h',
             'loader/HistoryController.h',
@@ -616 +617 @@
             'page/FocusDirection.h',
             'page/Frame.h',
-            'page/FrameLoadRequest.h',
             'page/FrameTree.h',
             'page/FrameView.h',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -25511 +25511 @@
                         </File>
                         <File
-                                RelativePath="..\page\FrameLoadRequest.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\page\FrameTree.cpp"
                                 >
@@ -26036 +26032 @@
                         <File
                                 RelativePath="..\loader\FrameLoaderTypes.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\loader\FrameLoadRequest.h"
                                 >
                         </File>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -14571 +14571 @@
                                 A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */,
                                 A7B070D1130A409C00A3763C /* FrameActionScheduler.h */,
-                                658436850AE01B7400E53753 /* FrameLoadRequest.h */,
                                 65A21482097A3F5300B9050A /* FrameTree.cpp */,
                                 65A21483097A3F5300B9050A /* FrameTree.h */,
@@ -18902 +18901 @@
                                 D000EBA111BDAFD400C47726 /* FrameLoaderStateMachine.h */,
                                 93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */,
+                                658436850AE01B7400E53753 /* FrameLoadRequest.h */,
                                 628D214D12131EF40055DCFC /* FrameNetworkingContext.h */,
                                 51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */,

trunk/Source/WebCore/loader/FrameLoadRequest.h

@@ -32 +32 @@
 namespace WebCore {
 
-    struct FrameLoadRequest {
-    public:
-        explicit FrameLoadRequest(PassRefPtr<SecurityOrigin> requester)
-            : m_requester(requester)
-        {
-        }
+struct FrameLoadRequest {
+public:
+    explicit FrameLoadRequest(PassRefPtr<SecurityOrigin> requester)
+        : m_requester(requester)
+    {
+    }
 
-        FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest)
-            : m_requester(requester)
-            , m_resourceRequest(resourceRequest)
-        {
-        }
+    FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest)
+        : m_requester(requester)
+        , m_resourceRequest(resourceRequest)
+    {
+    }
 
-        FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest, const String& frameName)
-            : m_requester(requester)
-            , m_resourceRequest(resourceRequest)
-            , m_frameName(frameName)
-        {
-        }
+    FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest, const String& frameName)
+        : m_requester(requester)
+        , m_resourceRequest(resourceRequest)
+        , m_frameName(frameName)
+    {
+    }
 
-        bool isEmpty() const { return m_resourceRequest.isEmpty(); }
+    bool isEmpty() const { return m_resourceRequest.isEmpty(); }
 
-        const SecurityOrigin* requester() const { return m_requester.get(); }
+    const SecurityOrigin* requester() const { return m_requester.get(); }
 
-        ResourceRequest& resourceRequest() { return m_resourceRequest; }
-        const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
+    ResourceRequest& resourceRequest() { return m_resourceRequest; }
+    const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
 
-        const String& frameName() const { return m_frameName; }
-        void setFrameName(const String& frameName) { m_frameName = frameName; }
+    const String& frameName() const { return m_frameName; }
+    void setFrameName(const String& frameName) { m_frameName = frameName; }
 
-    private:
-        RefPtr<SecurityOrigin> m_requester;
-        ResourceRequest m_resourceRequest;
-        String m_frameName;
-    };
+private:
+    RefPtr<SecurityOrigin> m_requester;
+    ResourceRequest m_resourceRequest;
+    String m_frameName;
+};
 
 }
 
 #endif // FrameLoadRequest_h
-