Diff
Modified: trunk/Source/WebCore/ChangeLog (92571 => 92572)
--- trunk/Source/WebCore/ChangeLog 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/ChangeLog 2011-08-07 11:29:13 UTC (rev 92572)
@@ -1,3 +1,22 @@
+2011-08-07 Jochen Eisinger <[email protected]>
+
+ 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 <[email protected]>
Add the ability to search the AccessibilityObject cache
Modified: trunk/Source/WebCore/GNUmakefile.list.am (92571 => 92572)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-08-07 11:29:13 UTC (rev 92572)
@@ -2119,6 +2119,7 @@
Source/WebCore/loader/FrameLoaderStateMachine.cpp \
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 \
Source/WebCore/loader/FTPDirectoryParser.h \
@@ -2255,7 +2256,6 @@
Source/WebCore/page/Frame.h \
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 \
Source/WebCore/page/FrameView.cpp \
Modified: trunk/Source/WebCore/WebCore.gypi (92571 => 92572)
--- trunk/Source/WebCore/WebCore.gypi 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/WebCore.gypi 2011-08-07 11:29:13 UTC (rev 92572)
@@ -558,6 +558,7 @@
'loader/FrameLoaderClient.h',
'loader/FrameLoaderStateMachine.h',
'loader/FrameLoaderTypes.h',
+ 'loader/FrameLoadRequest.h',
'loader/FrameNetworkingContext.h',
'loader/HistoryController.h',
'loader/NavigationAction.h',
@@ -615,7 +616,6 @@
'page/FocusController.h',
'page/FocusDirection.h',
'page/Frame.h',
- 'page/FrameLoadRequest.h',
'page/FrameTree.h',
'page/FrameView.h',
'page/Geolocation.h',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (92571 => 92572)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-07 11:29:13 UTC (rev 92572)
@@ -25510,10 +25510,6 @@
</File>
</File>
<File
- RelativePath="..\page\FrameLoadRequest.h"
- >
- </File>
- <File
RelativePath="..\page\FrameTree.cpp"
>
</File>
@@ -26038,6 +26034,10 @@
>
</File>
<File
+ RelativePath="..\loader\FrameLoadRequest.h"
+ >
+ </File>
+ <File
RelativePath="..\loader\FrameNetworkingContext.h"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (92571 => 92572)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-08-07 11:29:13 UTC (rev 92572)
@@ -14570,7 +14570,6 @@
65BF022A0974816300C43196 /* Frame.h */,
A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */,
A7B070D1130A409C00A3763C /* FrameActionScheduler.h */,
- 658436850AE01B7400E53753 /* FrameLoadRequest.h */,
65A21482097A3F5300B9050A /* FrameTree.cpp */,
65A21483097A3F5300B9050A /* FrameTree.h */,
65CBFEF70974F607001DAC25 /* FrameView.cpp */,
@@ -18901,6 +18900,7 @@
D000EBA011BDAFD400C47726 /* FrameLoaderStateMachine.cpp */,
D000EBA111BDAFD400C47726 /* FrameLoaderStateMachine.h */,
93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */,
+ 658436850AE01B7400E53753 /* FrameLoadRequest.h */,
628D214D12131EF40055DCFC /* FrameNetworkingContext.h */,
51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */,
51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */,
Copied: trunk/Source/WebCore/loader/FrameLoadRequest.h (from rev 92571, trunk/Source/WebCore/page/FrameLoadRequest.h) (0 => 92572)
--- trunk/Source/WebCore/loader/FrameLoadRequest.h (rev 0)
+++ trunk/Source/WebCore/loader/FrameLoadRequest.h 2011-08-07 11:29:13 UTC (rev 92572)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2003, 2006, 2010 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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 FrameLoadRequest_h
+#define FrameLoadRequest_h
+
+#include "ResourceRequest.h"
+#include "SecurityOrigin.h"
+
+namespace WebCore {
+
+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, const String& frameName)
+ : m_requester(requester)
+ , m_resourceRequest(resourceRequest)
+ , m_frameName(frameName)
+ {
+ }
+
+ bool isEmpty() const { return m_resourceRequest.isEmpty(); }
+
+ const SecurityOrigin* requester() const { return m_requester.get(); }
+
+ 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; }
+
+private:
+ RefPtr<SecurityOrigin> m_requester;
+ ResourceRequest m_resourceRequest;
+ String m_frameName;
+};
+
+}
+
+#endif // FrameLoadRequest_h
Deleted: trunk/Source/WebCore/page/FrameLoadRequest.h (92571 => 92572)
--- trunk/Source/WebCore/page/FrameLoadRequest.h 2011-08-07 09:48:04 UTC (rev 92571)
+++ trunk/Source/WebCore/page/FrameLoadRequest.h 2011-08-07 11:29:13 UTC (rev 92572)
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2003, 2006, 2010 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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 FrameLoadRequest_h
-#define FrameLoadRequest_h
-
-#include "ResourceRequest.h"
-#include "SecurityOrigin.h"
-
-namespace WebCore {
-
- 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, const String& frameName)
- : m_requester(requester)
- , m_resourceRequest(resourceRequest)
- , m_frameName(frameName)
- {
- }
-
- bool isEmpty() const { return m_resourceRequest.isEmpty(); }
-
- const SecurityOrigin* requester() const { return m_requester.get(); }
-
- 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; }
-
- private:
- RefPtr<SecurityOrigin> m_requester;
- ResourceRequest m_resourceRequest;
- String m_frameName;
- };
-
-}
-
-#endif // FrameLoadRequest_h
-
