Commit 9b9d83ba authored by andersca@apple.com's avatar andersca@apple.com

Remove unneeded headers from FrameLoader.h

https://bugs.webkit.org/show_bug.cgi?id=114223

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Update for WTF changes.

* bytecode/SpeculatedType.h:
* runtime/JSCJSValue.h:

Source/WebCore:

Remove unneeded headers from FrameLoader.h and add them back into the respective .cpp files where needed.

* dom/Document.cpp:
* history/CachedFrame.cpp:
* history/PageCache.cpp:
* inspector/InspectorResourceAgent.cpp:
* loader/DocumentLoader.cpp:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
(WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad):
* loader/FrameLoader.h:
(WebCore):
(WebCore::FrameLoader::policyChecker):
(WebCore::FrameLoader::history):
(WebCore::FrameLoader::icon):
* loader/MixedContentChecker.h:
* loader/icon/IconLoader.cpp:
* page/History.cpp:
* page/Page.cpp:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* testing/Internals.cpp:

Source/WebKit/blackberry:

Include HistoryController.h from WebCore.

* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

Source/WebKit/mac:

Include HistoryController.h from WebCore.

* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebView.mm:

Source/WebKit/win:

Include HistoryController.h from WebCore.

* WebView.cpp:

Source/WebKit2:

Include HistoryController.h from WebCore.

* WebProcess/Plugins/PDF/SimplePDFPlugin.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebPage/WebPage.cpp:

Source/WTF:

* wtf/Forward.h:
Add PrintStream.

* wtf/HashTable.h:
Don't include DataLog.h unless DUMP_HASHTABLE_STATS_PER_TABLE is 1.

Tools:

Add back headers implicitly included by other headers.

* WebKitTestRunner/WorkQueueManager.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148123 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b53ca408
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Update for WTF changes.
* bytecode/SpeculatedType.h:
* runtime/JSCJSValue.h:
2013-04-09 Geoffrey Garen <ggaren@apple.com>
Removed bitrotted TimeoutChecker code
......@@ -30,6 +30,7 @@
#define SpeculatedType_h
#include "JSCJSValue.h"
#include <wtf/PrintStream.h>
namespace JSC {
......
......@@ -28,6 +28,7 @@
#include <stdint.h>
#include <wtf/AlwaysInline.h>
#include <wtf/Assertions.h>
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/HashTraits.h>
#include <wtf/MathExtras.h>
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
* wtf/Forward.h:
Add PrintStream.
* wtf/HashTable.h:
Don't include DataLog.h unless DUMP_HASHTABLE_STATS_PER_TABLE is 1.
2013-04-10 Laszlo Gombos <l.gombos@samsung.com>
Remove ENABLE_3D_PLUGIN
......
......@@ -49,6 +49,7 @@ namespace WTF {
class Int32Array;
class MemoryInstrumentation;
class MemoryObjectInfo;
class PrintStream;
class String;
template <typename T> class StringBuffer;
class StringBuilder;
......@@ -83,6 +84,7 @@ using WTF::Int16Array;
using WTF::Int32Array;
using WTF::MemoryInstrumentation;
using WTF::MemoryObjectInfo;
using WTF::PrintStream;
using WTF::String;
using WTF::StringBuffer;
using WTF::StringBuilder;
......
......@@ -24,7 +24,6 @@
#include <wtf/Alignment.h>
#include <wtf/Assertions.h>
#include <wtf/DataLog.h>
#include <wtf/FastMalloc.h>
#include <wtf/HashTraits.h>
#include <wtf/StdLibExtras.h>
......@@ -37,11 +36,15 @@
#include <wtf/PassOwnPtr.h>
#endif
namespace WTF {
#define DUMP_HASHTABLE_STATS 0
#define DUMP_HASHTABLE_STATS_PER_TABLE 0
#if DUMP_HASHTABLE_STATS_PER_TABLE
#include <wtf/DataLog.h>
#endif
namespace WTF {
// Enables internal WTF consistency checks that are invoked automatically. Non-WTF callers can call checkTableConsistency() even if internal checks are disabled.
#define CHECK_HASHTABLE_CONSISTENCY 0
......
......@@ -33,6 +33,7 @@
#include <wtf/Deque.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
namespace WTF {
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Remove unneeded headers from FrameLoader.h and add them back into the respective .cpp files where needed.
* dom/Document.cpp:
* history/CachedFrame.cpp:
* history/PageCache.cpp:
* inspector/InspectorResourceAgent.cpp:
* loader/DocumentLoader.cpp:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
(WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad):
* loader/FrameLoader.h:
(WebCore):
(WebCore::FrameLoader::policyChecker):
(WebCore::FrameLoader::history):
(WebCore::FrameLoader::icon):
* loader/MixedContentChecker.h:
* loader/icon/IconLoader.cpp:
* page/History.cpp:
* page/Page.cpp:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* testing/Internals.cpp:
2013-04-10 Simon Fraser <simon.fraser@apple.com>
Minor code cleanup in AnimationBase::progress
......@@ -105,6 +105,7 @@
#include "HTTPParsers.h"
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "IconController.h"
#include "ImageLoader.h"
#include "InspectorCounters.h"
#include "InspectorInstrumentation.h"
......
......@@ -37,6 +37,7 @@
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "FrameView.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "Logging.h"
#include "Page.h"
......
......@@ -43,6 +43,7 @@
#include "FrameLoaderStateMachine.h"
#include "FrameView.h"
#include "HistogramSupport.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "Logging.h"
#include "Page.h"
......
......@@ -43,6 +43,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "HTTPHeaderMap.h"
#include "IconController.h"
#include "IdentifiersFactory.h"
#include "InspectorClient.h"
#include "InspectorFrontend.h"
......
......@@ -33,6 +33,7 @@
#include "InspectorState.h"
#include "InspectorStateClient.h"
#include <wtf/PassOwnPtr.h>
namespace WebCore {
......
......@@ -47,10 +47,12 @@
#include "HTMLFormElement.h"
#include "HTMLFrameOwnerElement.h"
#include "HistoryItem.h"
#include "IconController.h"
#include "InspectorInstrumentation.h"
#include "Logging.h"
#include "MemoryCache.h"
#include "Page.h"
#include "PolicyChecker.h"
#include "ProgressTracker.h"
#include "ResourceBuffer.h"
#include "SchemeRegistry.h"
......
......@@ -73,7 +73,9 @@
#include "HTMLObjectElement.h"
#include "HTMLParserIdioms.h"
#include "HTTPParsers.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "IconController.h"
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#include "LoaderStrategy.h"
......@@ -210,11 +212,11 @@ private:
FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client)
: m_frame(frame)
, m_client(client)
, m_policyChecker(frame)
, m_history(frame)
, m_policyChecker(adoptPtr(new PolicyChecker(frame)))
, m_history(adoptPtr(new HistoryController(frame)))
, m_notifer(frame)
, m_subframeLoader(frame)
, m_icon(frame)
, m_icon(adoptPtr(new IconController(frame)))
, m_mixedContentChecker(frame)
, m_state(FrameStateProvisional)
, m_loadType(FrameLoadTypeStandard)
......@@ -3170,11 +3172,11 @@ void FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad()
ASSERT(!m_loadingFromCachedPage);
// We only use cache-only loads to avoid resubmitting forms.
ASSERT(isBackForwardLoadType(m_loadType));
ASSERT(m_history.provisionalItem()->formData());
ASSERT(m_history.provisionalItem() == m_requestedHistoryItem.get());
ASSERT(m_history->provisionalItem()->formData());
ASSERT(m_history->provisionalItem() == m_requestedHistoryItem.get());
FrameLoadType loadType = m_loadType;
HistoryItem* item = m_history.provisionalItem();
HistoryItem* item = m_history->provisionalItem();
stopAllLoaders(ShouldNotClearProvisionalItem);
loadDifferentDocumentItem(item, loadType, MayNotAttemptCacheOnlyLoadForFormSubmissionItem);
......
......@@ -35,13 +35,10 @@
#include "CachePolicy.h"
#include "FrameLoaderStateMachine.h"
#include "FrameLoaderTypes.h"
#include "HistoryController.h"
#include "IconController.h"
#include "IconURL.h"
#include "LayoutMilestones.h"
#include "MixedContentChecker.h"
#include "PolicyChecker.h"
#include "ResourceHandle.h"
#include "ResourceHandleTypes.h"
#include "ResourceLoadNotifier.h"
#include "SecurityContext.h"
#include "SubframeLoader.h"
......@@ -63,9 +60,13 @@ class FormState;
class FormSubmission;
class FrameLoaderClient;
class FrameNetworkingContext;
class HistoryController;
class HistoryItem;
class IconController;
class NavigationAction;
class NetworkingContext;
class Page;
class PolicyChecker;
class ResourceError;
class ResourceRequest;
class ResourceResponse;
......@@ -89,11 +90,11 @@ public:
Frame* frame() const { return m_frame; }
PolicyChecker* policyChecker() const { return &m_policyChecker; }
HistoryController* history() const { return &m_history; }
PolicyChecker* policyChecker() const { return m_policyChecker.get(); }
HistoryController* history() const { return m_history.get(); }
ResourceLoadNotifier* notifier() const { return &m_notifer; }
SubframeLoader* subframeLoader() const { return &m_subframeLoader; }
IconController* icon() const { return &m_icon; }
IconController* icon() const { return m_icon.get(); }
MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChecker; }
void prepareForHistoryNavigation();
......@@ -384,12 +385,12 @@ private:
// FIXME: These should be OwnPtr<T> to reduce build times and simplify
// header dependencies unless performance testing proves otherwise.
// Some of these could be lazily created for memory savings on devices.
mutable PolicyChecker m_policyChecker;
mutable HistoryController m_history;
OwnPtr<PolicyChecker> m_policyChecker;
OwnPtr<HistoryController> m_history;
mutable ResourceLoadNotifier m_notifer;
mutable SubframeLoader m_subframeLoader;
mutable FrameLoaderStateMachine m_stateMachine;
mutable IconController m_icon;
OwnPtr<IconController> m_icon;
mutable MixedContentChecker m_mixedContentChecker;
class FrameProgressTracker;
......
......@@ -31,7 +31,8 @@
#ifndef MixedContentChecker_h
#define MixedContentChecker_h
#include <wtf/text/WTFString.h>
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
namespace WebCore {
......
......@@ -34,6 +34,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "IconController.h"
#include "IconDatabase.h"
#include "Logging.h"
#include "ResourceBuffer.h"
......
......@@ -32,6 +32,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "Page.h"
#include "SecurityOrigin.h"
......
......@@ -46,6 +46,7 @@
#include "FrameTree.h"
#include "FrameView.h"
#include "HTMLElement.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
......
......@@ -33,6 +33,7 @@
#include <wtf/FixedArray.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/unicode/Unicode.h>
namespace WebCore {
......
......@@ -41,6 +41,8 @@ OBJC_CLASS AVPlayerLayer;
OBJC_CLASS AVAssetImageGenerator;
OBJC_CLASS WebCoreAVFMovieObserver;
typedef struct objc_object* id;
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
OBJC_CLASS WebCoreAVFLoaderDelegate;
OBJC_CLASS AVAssetResourceLoadingRequest;
......
......@@ -34,6 +34,7 @@
#include "FileSystem.h"
#include "KURL.h"
#include <wtf/Forward.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/text/WTFString.h>
......
......@@ -57,6 +57,7 @@
#include "HTMLNames.h"
#include "HTMLSelectElement.h"
#include "HTMLTextAreaElement.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "InspectorClient.h"
#include "InspectorConsoleAgent.h"
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Include HistoryController.h from WebCore.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
2013-04-09 Geoffrey Garen <ggaren@apple.com>
Removed bitrotted TimeoutChecker code
......
......@@ -37,6 +37,7 @@
#include "HTMLNames.h"
#include "HTMLPlugInElement.h"
#include "HTTPParsers.h"
#include "HistoryController.h"
#include "HistoryItem.h"
#include "IconDatabase.h"
#include "Image.h"
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Include HistoryController.h from WebCore.
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebView.mm:
2013-04-09 Geoffrey Garen <ggaren@apple.com>
Removed bitrotted TimeoutChecker code
......
......@@ -100,6 +100,7 @@
#import <WebCore/HTMLNames.h>
#import <WebCore/HTMLParserIdioms.h>
#import <WebCore/HTMLPlugInElement.h>
#import <WebCore/HistoryController.h>
#import <WebCore/HistoryItem.h>
#import <WebCore/HitTestResult.h>
#import <WebCore/IconDatabase.h>
......
......@@ -137,6 +137,7 @@
#import <WebCore/GeolocationError.h>
#import <WebCore/HTMLMediaElement.h>
#import <WebCore/HTMLNames.h>
#import <WebCore/HistoryController.h>
#import <WebCore/HistoryItem.h>
#import <WebCore/IconDatabase.h>
#import <WebCore/InitializeLogging.h>
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Include HistoryController.h from WebCore.
* WebView.cpp:
2013-04-05 Roger Fong <roger_fong@apple.com>
Build fix.
......
......@@ -100,6 +100,7 @@
#include <WebCore/HTMLMediaElement.h>
#include <WebCore/HTMLNames.h>
#include <WebCore/HWndDC.h>
#include <WebCore/HistoryController.h>
#include <WebCore/HistoryItem.h>
#include <WebCore/HitTestRequest.h>
#include <WebCore/HitTestResult.h>
......
2013-04-08 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Include HistoryController.h from WebCore.
* WebProcess/Plugins/PDF/SimplePDFPlugin.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebPage/WebPage.cpp:
2013-04-09 Geoffrey Garen <ggaren@apple.com>
Removed bitrotted TimeoutChecker code
......@@ -30,6 +30,7 @@
#import <WebCore/ResourceError.h>
#import <WebKitSystemInterface.h>
#import <wtf/MainThread.h>
#import <wtf/PassOwnPtr.h>
using namespace WebCore;
......
......@@ -34,6 +34,8 @@ typedef const struct OpaqueJSContext* JSContextRef;
typedef struct OpaqueJSValue* JSObjectRef;
typedef const struct OpaqueJSValue* JSValueRef;
OBJC_CLASS NSData;
namespace WebCore {
struct PluginInfo;
}
......
......@@ -61,6 +61,7 @@
#include <WebCore/FrameView.h>
#include <WebCore/HTMLAppletElement.h>
#include <WebCore/HTMLFormElement.h>
#include <WebCore/HistoryController.h>
#include <WebCore/HistoryItem.h>
#include <WebCore/MIMETypeRegistry.h>
#include <WebCore/MouseEvent.h>
......
......@@ -102,6 +102,7 @@
#include <WebCore/HTMLInputElement.h>
#include <WebCore/HTMLPlugInElement.h>
#include <WebCore/HTMLPlugInImageElement.h>
#include <WebCore/HistoryController.h>
#include <WebCore/HistoryItem.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/MIMETypeRegistry.h>
......
2013-04-10 Anders Carlsson <andersca@apple.com>
Remove unneeded headers from FrameLoader.h
https://bugs.webkit.org/show_bug.cgi?id=114223
Reviewed by Geoffrey Garen.
Add back headers implicitly included by other headers.
* WebKitTestRunner/WorkQueueManager.cpp:
2013-04-10 Zan Dobersek <zdobersek@igalia.com>
[GTK] Include a crash-fixing patch for the at-spi2-atk dependency
......@@ -30,6 +30,7 @@
#include "TestController.h"
#include <WebKit2/WKPage.h>
#include <WebKit2/WKRetainPtr.h>
#include <stdio.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/text/CString.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment