Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (148122 => 148123)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,15 @@
+2013-04-08 Anders Carlsson <ander...@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 <gga...@apple.com>
Removed bitrotted TimeoutChecker code
Modified: trunk/Source/_javascript_Core/bytecode/SpeculatedType.h (148122 => 148123)
--- trunk/Source/_javascript_Core/bytecode/SpeculatedType.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/_javascript_Core/bytecode/SpeculatedType.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -30,6 +30,7 @@
#define SpeculatedType_h
#include "JSCJSValue.h"
+#include <wtf/PrintStream.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/JSCJSValue.h (148122 => 148123)
--- trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WTF/ChangeLog (148122 => 148123)
--- trunk/Source/WTF/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WTF/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,16 @@
+2013-04-08 Anders Carlsson <ander...@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.gom...@samsung.com>
Remove ENABLE_3D_PLUGIN
Modified: trunk/Source/WTF/wtf/Forward.h (148122 => 148123)
--- trunk/Source/WTF/wtf/Forward.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WTF/wtf/Forward.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -49,6 +49,7 @@
class Int32Array;
class MemoryInstrumentation;
class MemoryObjectInfo;
+ class PrintStream;
class String;
template <typename T> class StringBuffer;
class StringBuilder;
@@ -83,6 +84,7 @@
using WTF::Int32Array;
using WTF::MemoryInstrumentation;
using WTF::MemoryObjectInfo;
+using WTF::PrintStream;
using WTF::String;
using WTF::StringBuffer;
using WTF::StringBuilder;
Modified: trunk/Source/WTF/wtf/HashTable.h (148122 => 148123)
--- trunk/Source/WTF/wtf/HashTable.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WTF/wtf/HashTable.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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
Modified: trunk/Source/WTF/wtf/StreamBuffer.h (148122 => 148123)
--- trunk/Source/WTF/wtf/StreamBuffer.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WTF/wtf/StreamBuffer.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -33,6 +33,7 @@
#include <wtf/Deque.h>
#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace WTF {
Modified: trunk/Source/WebCore/ChangeLog (148122 => 148123)
--- trunk/Source/WebCore/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,32 @@
+2013-04-08 Anders Carlsson <ander...@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.fra...@apple.com>
Minor code cleanup in AnimationBase::progress
Modified: trunk/Source/WebCore/dom/Document.cpp (148122 => 148123)
--- trunk/Source/WebCore/dom/Document.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/history/CachedFrame.cpp (148122 => 148123)
--- trunk/Source/WebCore/history/CachedFrame.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/history/PageCache.cpp (148122 => 148123)
--- trunk/Source/WebCore/history/PageCache.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/history/PageCache.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (148122 => 148123)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/inspector/InspectorState.cpp (148122 => 148123)
--- trunk/Source/WebCore/inspector/InspectorState.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/inspector/InspectorState.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -33,6 +33,7 @@
#include "InspectorState.h"
#include "InspectorStateClient.h"
+#include <wtf/PassOwnPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (148122 => 148123)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (148122 => 148123)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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 @@
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 @@
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);
Modified: trunk/Source/WebCore/loader/FrameLoader.h (148122 => 148123)
--- trunk/Source/WebCore/loader/FrameLoader.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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 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 @@
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 @@
// 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;
Modified: trunk/Source/WebCore/loader/MixedContentChecker.h (148122 => 148123)
--- trunk/Source/WebCore/loader/MixedContentChecker.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/loader/MixedContentChecker.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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 {
Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (148122 => 148123)
--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/page/History.cpp (148122 => 148123)
--- trunk/Source/WebCore/page/History.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/page/History.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/page/Page.cpp (148122 => 148123)
--- trunk/Source/WebCore/page/Page.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/page/Page.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h (148122 => 148123)
--- trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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 {
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (148122 => 148123)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -41,6 +41,8 @@
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;
Modified: trunk/Source/WebCore/platform/network/BlobData.h (148122 => 148123)
--- trunk/Source/WebCore/platform/network/BlobData.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/platform/network/BlobData.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WebCore/testing/Internals.cpp (148122 => 148123)
--- trunk/Source/WebCore/testing/Internals.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148122 => 148123)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,14 @@
+2013-04-08 Anders Carlsson <ander...@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 <gga...@apple.com>
Removed bitrotted TimeoutChecker code
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (148122 => 148123)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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"
Modified: trunk/Source/WebKit/mac/ChangeLog (148122 => 148123)
--- trunk/Source/WebKit/mac/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,15 @@
+2013-04-08 Anders Carlsson <ander...@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 <gga...@apple.com>
Removed bitrotted TimeoutChecker code
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (148122 => 148123)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (148122 => 148123)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WebKit/win/ChangeLog (148122 => 148123)
--- trunk/Source/WebKit/win/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/win/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,14 @@
+2013-04-08 Anders Carlsson <ander...@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_f...@apple.com>
Build fix.
Modified: trunk/Source/WebKit/win/WebView.cpp (148122 => 148123)
--- trunk/Source/WebKit/win/WebView.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WebKit2/ChangeLog (148122 => 148123)
--- trunk/Source/WebKit2/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,16 @@
+2013-04-08 Anders Carlsson <ander...@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 <gga...@apple.com>
Removed bitrotted TimeoutChecker code
Modified: trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (148122 => 148123)
--- trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2013-04-10 19:11:20 UTC (rev 148123)
@@ -30,6 +30,7 @@
#import <WebCore/ResourceError.h>
#import <WebKitSystemInterface.h>
#import <wtf/MainThread.h>
+#import <wtf/PassOwnPtr.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h (148122 => 148123)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.h 2013-04-10 19:11:20 UTC (rev 148123)
@@ -34,6 +34,8 @@
typedef struct OpaqueJSValue* JSObjectRef;
typedef const struct OpaqueJSValue* JSValueRef;
+OBJC_CLASS NSData;
+
namespace WebCore {
struct PluginInfo;
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (148122 => 148123)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (148122 => 148123)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
Modified: trunk/Tools/ChangeLog (148122 => 148123)
--- trunk/Tools/ChangeLog 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Tools/ChangeLog 2013-04-10 19:11:20 UTC (rev 148123)
@@ -1,3 +1,14 @@
+2013-04-10 Anders Carlsson <ander...@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 <zdober...@igalia.com>
[GTK] Include a crash-fixing patch for the at-spi2-atk dependency
Modified: trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp (148122 => 148123)
--- trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp 2013-04-10 19:03:02 UTC (rev 148122)
+++ trunk/Tools/WebKitTestRunner/WorkQueueManager.cpp 2013-04-10 19:11:20 UTC (rev 148123)
@@ -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>
