Diff
Modified: trunk/Source/WebKit2/ChangeLog (89160 => 89161)
--- trunk/Source/WebKit2/ChangeLog 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-17 19:48:10 UTC (rev 89161)
@@ -1,3 +1,28 @@
+2011-06-17 Anders Carlsson <[email protected]>
+
+ Reviewed by Sam Weinig.
+
+ Move the remaining WebCore argument coders to the .cpp file
+ https://bugs.webkit.org/show_bug.cgi?id=62874
+
+ Also add includes that other files need that used to be provided by WebCoreArgumentCoders.h,
+ and get rid of the LAZY_NATIVE_CURSOR #if check because all WebKit2 platforms now support it.
+
+ * Shared/ContextMenuState.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ (CoreIPC::::encode):
+ (CoreIPC::::decode):
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/gtk/WebCoreArgumentCodersGtk.cpp:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ * Shared/qt/WebCoreArgumentCodersQt.cpp:
+ * UIProcess/API/mac/PDFViewController.mm:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebIconDatabase.cpp:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+
2011-06-17 Chang Shu <[email protected]>
Reviewed by Anders Carlsson.
Modified: trunk/Source/WebKit2/Shared/ContextMenuState.h (89160 => 89161)
--- trunk/Source/WebKit2/Shared/ContextMenuState.h 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/ContextMenuState.h 2011-06-17 19:48:10 UTC (rev 89161)
@@ -27,6 +27,7 @@
#define ContextMenuState_h
#include "WebCoreArgumentCoders.h"
+#include <wtf/text/WTFString.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (89160 => 89161)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -26,13 +26,118 @@
#include "config.h"
#include "WebCoreArgumentCoders.h"
+#include "ShareableBitmap.h"
+#include <WebCore/AuthenticationChallenge.h>
+#include <WebCore/Credential.h>
+#include <WebCore/Cursor.h>
+#include <WebCore/DatabaseDetails.h>
+#include <WebCore/Editor.h>
+#include <WebCore/GraphicsContext.h>
+#include <WebCore/Image.h>
#include <WebCore/PluginData.h>
+#include <WebCore/ProtectionSpace.h>
+#include <WebCore/TextCheckerClient.h>
+#include <WebCore/ViewportArguments.h>
+#include <WebCore/WindowFeatures.h>
+#include <wtf/text/StringHash.h>
+#if PLATFORM(QT)
+#include <WebCore/Animation.h>
+#include <WebCore/FloatPoint3D.h>
+#include <WebCore/IdentityTransformOperation.h>
+#include <WebCore/Matrix3DTransformOperation.h>
+#include <WebCore/MatrixTransformOperation.h>
+#include <WebCore/PerspectiveTransformOperation.h>
+#include <WebCore/RotateTransformOperation.h>
+#include <WebCore/ScaleTransformOperation.h>
+#include <WebCore/SkewTransformOperation.h>
+#include <WebCore/TimingFunction.h>
+#include <WebCore/TransformOperation.h>
+#include <WebCore/TransformOperations.h>
+#include <WebCore/TranslateTransformOperation.h>
+#endif
+
using namespace WebCore;
using namespace WebKit;
namespace CoreIPC {
-
+
+void ArgumentCoder<FloatPoint>::encode(ArgumentEncoder* encoder, const FloatPoint& floatPoint)
+{
+ SimpleArgumentCoder<FloatPoint>::encode(encoder, floatPoint);
+}
+
+bool ArgumentCoder<FloatPoint>::decode(ArgumentDecoder* decoder, FloatPoint& floatPoint)
+{
+ return SimpleArgumentCoder<FloatPoint>::decode(decoder, floatPoint);
+}
+
+
+void ArgumentCoder<FloatRect>::encode(ArgumentEncoder* encoder, const FloatRect& floatRect)
+{
+ SimpleArgumentCoder<FloatRect>::encode(encoder, floatRect);
+}
+
+bool ArgumentCoder<FloatRect>::decode(ArgumentDecoder* decoder, FloatRect& floatRect)
+{
+ return SimpleArgumentCoder<FloatRect>::decode(decoder, floatRect);
+}
+
+
+void ArgumentCoder<FloatSize>::encode(ArgumentEncoder* encoder, const FloatSize& floatSize)
+{
+ SimpleArgumentCoder<FloatSize>::encode(encoder, floatSize);
+}
+
+bool ArgumentCoder<FloatSize>::decode(ArgumentDecoder* decoder, FloatSize& floatSize)
+{
+ return SimpleArgumentCoder<FloatSize>::decode(decoder, floatSize);
+}
+
+
+void ArgumentCoder<IntPoint>::encode(ArgumentEncoder* encoder, const IntPoint& intPoint)
+{
+ SimpleArgumentCoder<IntPoint>::encode(encoder, intPoint);
+}
+
+bool ArgumentCoder<IntPoint>::decode(ArgumentDecoder* decoder, IntPoint& intPoint)
+{
+ return SimpleArgumentCoder<IntPoint>::decode(decoder, intPoint);
+}
+
+
+void ArgumentCoder<IntRect>::encode(ArgumentEncoder* encoder, const IntRect& intRect)
+{
+ SimpleArgumentCoder<IntRect>::encode(encoder, intRect);
+}
+
+bool ArgumentCoder<IntRect>::decode(ArgumentDecoder* decoder, IntRect& intRect)
+{
+ return SimpleArgumentCoder<IntRect>::decode(decoder, intRect);
+}
+
+
+void ArgumentCoder<IntSize>::encode(ArgumentEncoder* encoder, const IntSize& intSize)
+{
+ SimpleArgumentCoder<IntSize>::encode(encoder, intSize);
+}
+
+bool ArgumentCoder<IntSize>::decode(ArgumentDecoder* decoder, IntSize& intSize)
+{
+ return SimpleArgumentCoder<IntSize>::decode(decoder, intSize);
+}
+
+
+void ArgumentCoder<ViewportArguments>::encode(ArgumentEncoder* encoder, const ViewportArguments& viewportArguments)
+{
+ SimpleArgumentCoder<ViewportArguments>::encode(encoder, viewportArguments);
+}
+
+bool ArgumentCoder<ViewportArguments>::decode(ArgumentDecoder* decoder, ViewportArguments& viewportArguments)
+{
+ return SimpleArgumentCoder<ViewportArguments>::decode(decoder, viewportArguments);
+}
+
void ArgumentCoder<MimeClassInfo>::encode(ArgumentEncoder* encoder, const MimeClassInfo& mimeClassInfo)
{
encoder->encode(mimeClassInfo.type);
@@ -209,7 +314,6 @@
return true;
}
-#if USE(LAZY_NATIVE_CURSOR)
void ArgumentCoder<Cursor>::encode(ArgumentEncoder* encoder, const Cursor& cursor)
{
encoder->encodeEnum(cursor.type());
@@ -249,7 +353,6 @@
cursor = Cursor(image.get(), hotSpot);
return true;
}
-#endif // USE(LAZY_NATIVE_CURSOR)
void ArgumentCoder<WindowFeatures>::encode(ArgumentEncoder* encoder, const WindowFeatures& windowFeatures)
@@ -443,6 +546,116 @@
}
#if PLATFORM(QT)
+
+void ArgumentCoder<FloatPoint3D>::encode(ArgumentEncoder* encoder, const FloatPoint3D& floatPoint3D)
+{
+ SimpleArgumentCoder<FloatPoint3D>::encode(encoder, floatPoint3D);
+}
+
+bool ArgumentCoder<FloatPoint3D>::decode(ArgumentDecoder* decoder, FloatPoint3D& floatPoint3D)
+{
+ return SimpleArgumentCoder<FloatPoint3D>::decode(decoder, floatPoint3D);
+}
+
+
+void ArgumentCoder<Length>::encode(ArgumentEncoder* encoder, const Length& length)
+{
+ SimpleArgumentCoder<Length>::encode(encoder, length);
+}
+
+bool ArgumentCoder<Length>::decode(ArgumentDecoder* decoder, Length& length)
+{
+ return SimpleArgumentCoder<Length>::decode(decoder, length);
+}
+
+
+void ArgumentCoder<TransformationMatrix>::encode(ArgumentEncoder* encoder, const TransformationMatrix& transformationMatrix)
+{
+ SimpleArgumentCoder<TransformationMatrix>::encode(encoder, transformationMatrix);
+}
+
+bool ArgumentCoder<TransformationMatrix>::decode(ArgumentDecoder* decoder, TransformationMatrix& transformationMatrix)
+{
+ return SimpleArgumentCoder<TransformationMatrix>::decode(decoder, transformationMatrix);
+}
+
+
+void ArgumentCoder<MatrixTransformOperation>::encode(ArgumentEncoder* encoder, const MatrixTransformOperation& operation)
+{
+ SimpleArgumentCoder<MatrixTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<MatrixTransformOperation>::decode(ArgumentDecoder* decoder, MatrixTransformOperation& operation)
+{
+ return SimpleArgumentCoder<MatrixTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<Matrix3DTransformOperation>::encode(ArgumentEncoder* encoder, const Matrix3DTransformOperation& operation)
+{
+ SimpleArgumentCoder<Matrix3DTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<Matrix3DTransformOperation>::decode(ArgumentDecoder* decoder, Matrix3DTransformOperation& operation)
+{
+ return SimpleArgumentCoder<Matrix3DTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<PerspectiveTransformOperation>::encode(ArgumentEncoder* encoder, const PerspectiveTransformOperation& operation)
+{
+ SimpleArgumentCoder<PerspectiveTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<PerspectiveTransformOperation>::decode(ArgumentDecoder* decoder, PerspectiveTransformOperation& operation)
+{
+ return SimpleArgumentCoder<PerspectiveTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<RotateTransformOperation>::encode(ArgumentEncoder* encoder, const RotateTransformOperation& operation)
+{
+ SimpleArgumentCoder<RotateTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<RotateTransformOperation>::decode(ArgumentDecoder* decoder, RotateTransformOperation& operation)
+{
+ return SimpleArgumentCoder<RotateTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<ScaleTransformOperation>::encode(ArgumentEncoder* encoder, const ScaleTransformOperation& operation)
+{
+ SimpleArgumentCoder<ScaleTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<ScaleTransformOperation>::decode(ArgumentDecoder* decoder, ScaleTransformOperation& operation)
+{
+ return SimpleArgumentCoder<ScaleTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<SkewTransformOperation>::encode(ArgumentEncoder* encoder, const SkewTransformOperation& operation)
+{
+ SimpleArgumentCoder<SkewTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<SkewTransformOperation>::decode(ArgumentDecoder* decoder, SkewTransformOperation& operation)
+{
+ return SimpleArgumentCoder<SkewTransformOperation>::decode(decoder, operation);
+}
+
+
+void ArgumentCoder<TranslateTransformOperation>::encode(ArgumentEncoder* encoder, const TranslateTransformOperation& operation)
+{
+ SimpleArgumentCoder<TranslateTransformOperation>::encode(encoder, operation);
+}
+
+bool ArgumentCoder<TranslateTransformOperation>::decode(ArgumentDecoder* decoder, TranslateTransformOperation& operation)
+{
+ return SimpleArgumentCoder<TranslateTransformOperation>::decode(decoder, operation);
+}
+
void ArgumentCoder<RefPtr<TimingFunction> >::encode(ArgumentEncoder* encoder, const RefPtr<TimingFunction>& function)
{
// We don't want to encode null-references.
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (89160 => 89161)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2011-06-17 19:48:10 UTC (rev 89161)
@@ -27,72 +27,95 @@
#define WebCoreArgumentCoders_h
#include "ArgumentCoders.h"
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "Arguments.h"
-#include "ShareableBitmap.h"
-#include <WebCore/Animation.h>
-#include <WebCore/AuthenticationChallenge.h>
-#include <WebCore/BitmapImage.h>
-#include <WebCore/Credential.h>
-#include <WebCore/Cursor.h>
-#include <WebCore/DatabaseDetails.h>
-#include <WebCore/Editor.h>
-#include <WebCore/EditorClient.h>
-#include <WebCore/FloatPoint3D.h>
-#include <WebCore/FloatRect.h>
-#include <WebCore/GraphicsContext.h>
-#include <WebCore/IdentityTransformOperation.h>
-#include <WebCore/IntRect.h>
-#include <WebCore/KeyboardEvent.h>
-#include <WebCore/Length.h>
-#include <WebCore/Matrix3DTransformOperation.h>
-#include <WebCore/MatrixTransformOperation.h>
-#include <WebCore/PerspectiveTransformOperation.h>
-#include <WebCore/ProtectionSpace.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/RotateTransformOperation.h>
-#include <WebCore/ScaleTransformOperation.h>
-#include <WebCore/SkewTransformOperation.h>
-#include <WebCore/TextCheckerClient.h>
-#include <WebCore/TimingFunction.h>
-#include <WebCore/TransformOperation.h>
-#include <WebCore/TransformOperations.h>
-#include <WebCore/TransformationMatrix.h>
-#include <WebCore/TranslateTransformOperation.h>
-#include <WebCore/ViewportArguments.h>
-#include <WebCore/WindowFeatures.h>
-#include <limits>
namespace WebCore {
+ class AuthenticationChallenge;
+ class Color;
+ class Credential;
+ class Cursor;
+ class DatabaseDetails;
+ class FloatPoint;
+ class FloatRect;
+ class FloatSize;
class HTTPHeaderMap;
+ class IntPoint;
+ class IntRect;
+ class IntSize;
+ class ProtectionSpace;
+ class ResourceError;
+ class ResourceRequest;
+ class ResourceResponse;
+ struct CompositionUnderline;
+ struct GrammarDetail;
struct MimeClassInfo;
struct PluginInfo;
+ struct TextCheckingResult;
+ struct ViewportArguments;
+ struct WindowFeatures;
}
+#if PLATFORM(MAC)
+namespace WebCore {
+ struct KeypressCommand;
+}
+#endif
+
+#if PLATFORM(QT)
+namespace WebCore {
+ class Animation;
+ class FloatPoint3D;
+ class Matrix3DTransformOperation;
+ class MatrixTransformOperation;
+ class PerspectiveTransformOperation;
+ class RotateTransformOperation;
+ class ScaleTransformOperation;
+ class SkewTransformOperation;
+ class TimingFunction;
+ class TransformOperation;
+ class TransformOperations;
+ class TransformationMatrix;
+ class TranslateTransformOperation;
+ struct Length;
+}
+#endif
+
namespace CoreIPC {
-template<> struct ArgumentCoder<WebCore::IntPoint> : SimpleArgumentCoder<WebCore::IntPoint> { };
-template<> struct ArgumentCoder<WebCore::IntSize> : SimpleArgumentCoder<WebCore::IntSize> { };
-template<> struct ArgumentCoder<WebCore::IntRect> : SimpleArgumentCoder<WebCore::IntRect> { };
-template<> struct ArgumentCoder<WebCore::ViewportArguments> : SimpleArgumentCoder<WebCore::ViewportArguments> { };
+template<> struct ArgumentCoder<WebCore::FloatPoint> {
+ static void encode(ArgumentEncoder*, const WebCore::FloatPoint&);
+ static bool decode(ArgumentDecoder*, WebCore::FloatPoint&);
+};
-template<> struct ArgumentCoder<WebCore::FloatPoint> : SimpleArgumentCoder<WebCore::FloatPoint> { };
-template<> struct ArgumentCoder<WebCore::FloatPoint3D> : SimpleArgumentCoder<WebCore::FloatPoint3D> { };
-template<> struct ArgumentCoder<WebCore::FloatSize> : SimpleArgumentCoder<WebCore::FloatSize> { };
-template<> struct ArgumentCoder<WebCore::FloatRect> : SimpleArgumentCoder<WebCore::FloatRect> { };
-template<> struct ArgumentCoder<WebCore::Length> : SimpleArgumentCoder<WebCore::Length> { };
-template<> struct ArgumentCoder<WebCore::TransformationMatrix> : SimpleArgumentCoder<WebCore::TransformationMatrix> { };
+template<> struct ArgumentCoder<WebCore::FloatRect> {
+ static void encode(ArgumentEncoder*, const WebCore::FloatRect&);
+ static bool decode(ArgumentDecoder*, WebCore::FloatRect&);
+};
-template<> struct ArgumentCoder<WebCore::MatrixTransformOperation> : SimpleArgumentCoder<WebCore::MatrixTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::Matrix3DTransformOperation> : SimpleArgumentCoder<WebCore::Matrix3DTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::PerspectiveTransformOperation> : SimpleArgumentCoder<WebCore::PerspectiveTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::RotateTransformOperation> : SimpleArgumentCoder<WebCore::RotateTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::ScaleTransformOperation> : SimpleArgumentCoder<WebCore::ScaleTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::SkewTransformOperation> : SimpleArgumentCoder<WebCore::SkewTransformOperation> { };
-template<> struct ArgumentCoder<WebCore::TranslateTransformOperation> : SimpleArgumentCoder<WebCore::TranslateTransformOperation> { };
+template<> struct ArgumentCoder<WebCore::FloatSize> {
+ static void encode(ArgumentEncoder*, const WebCore::FloatSize&);
+ static bool decode(ArgumentDecoder*, WebCore::FloatSize&);
+};
+template<> struct ArgumentCoder<WebCore::IntPoint> {
+ static void encode(ArgumentEncoder*, const WebCore::IntPoint&);
+ static bool decode(ArgumentDecoder*, WebCore::IntPoint&);
+};
+
+template<> struct ArgumentCoder<WebCore::IntRect> {
+ static void encode(ArgumentEncoder*, const WebCore::IntRect&);
+ static bool decode(ArgumentDecoder*, WebCore::IntRect&);
+};
+
+template<> struct ArgumentCoder<WebCore::IntSize> {
+ static void encode(ArgumentEncoder*, const WebCore::IntSize&);
+ static bool decode(ArgumentDecoder*, WebCore::IntSize&);
+};
+
+template<> struct ArgumentCoder<WebCore::ViewportArguments> {
+ static void encode(ArgumentEncoder*, const WebCore::ViewportArguments&);
+ static bool decode(ArgumentDecoder*, WebCore::ViewportArguments&);
+};
+
template<> struct ArgumentCoder<WebCore::MimeClassInfo> {
static void encode(ArgumentEncoder*, const WebCore::MimeClassInfo&);
static bool decode(ArgumentDecoder*, WebCore::MimeClassInfo&);
@@ -123,12 +146,10 @@
static bool decode(ArgumentDecoder*, WebCore::Credential&);
};
-#if USE(LAZY_NATIVE_CURSOR)
template<> struct ArgumentCoder<WebCore::Cursor> {
static void encode(ArgumentEncoder*, const WebCore::Cursor&);
static bool decode(ArgumentDecoder*, WebCore::Cursor&);
};
-#endif
template<> struct ArgumentCoder<WebCore::ResourceRequest> {
static void encode(ArgumentEncoder*, const WebCore::ResourceRequest&);
@@ -182,6 +203,56 @@
};
#if PLATFORM(QT)
+template<> struct ArgumentCoder<WebCore::FloatPoint3D> {
+ static void encode(ArgumentEncoder*, const WebCore::FloatPoint3D&);
+ static bool decode(ArgumentDecoder*, WebCore::FloatPoint3D&);
+};
+
+template<> struct ArgumentCoder<WebCore::Length> {
+ static void encode(ArgumentEncoder*, const WebCore::Length&);
+ static bool decode(ArgumentDecoder*, WebCore::Length&);
+};
+
+template<> struct ArgumentCoder<WebCore::TransformationMatrix> {
+ static void encode(ArgumentEncoder*, const WebCore::TransformationMatrix&);
+ static bool decode(ArgumentDecoder*, WebCore::TransformationMatrix&);
+};
+
+template<> struct ArgumentCoder<WebCore::MatrixTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::MatrixTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::MatrixTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::Matrix3DTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::Matrix3DTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::Matrix3DTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::PerspectiveTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::PerspectiveTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::PerspectiveTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::RotateTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::RotateTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::RotateTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::ScaleTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::ScaleTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::ScaleTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::SkewTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::SkewTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::SkewTransformOperation&);
+};
+
+template<> struct ArgumentCoder<WebCore::TranslateTransformOperation> {
+ static void encode(ArgumentEncoder*, const WebCore::TranslateTransformOperation&);
+ static bool decode(ArgumentDecoder*, WebCore::TranslateTransformOperation&);
+};
+
template<> struct ArgumentCoder<RefPtr<WebCore::TimingFunction> > {
static void encode(ArgumentEncoder*, const RefPtr<WebCore::TimingFunction>&);
static bool decode(ArgumentDecoder*, RefPtr<WebCore::TimingFunction>&);
Modified: trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp (89160 => 89161)
--- trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -25,9 +25,12 @@
*/
#include "config.h"
-#include "ResourceRequest.h"
#include "WebCoreArgumentCoders.h"
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+
using namespace WebCore;
namespace CoreIPC {
Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (89160 => 89161)
--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2011-06-17 19:48:10 UTC (rev 89161)
@@ -29,6 +29,9 @@
#import "ArgumentCodersCF.h"
#import "PlatformCertificateInfo.h"
#import "WebKitSystemInterface.h"
+#import <WebCore/KeyboardEvent.h>
+#import <WebCore/ResourceError.h>
+#import <WebCore/ResourceRequest.h>
using namespace WebCore;
using namespace WebKit;
Modified: trunk/Source/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp (89160 => 89161)
--- trunk/Source/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -27,6 +27,8 @@
#include "WebCoreArgumentCoders.h"
#include <WebCore/NotImplemented.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp (89160 => 89161)
--- trunk/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -31,7 +31,10 @@
#include "PlatformCertificateInfo.h"
#include <CFNetwork/CFURLRequestPriv.h>
#include <WebCore/CertificateCFWin.h>
+#include <WebCore/ResourceError.h>
#include <WebCore/ResourceHandle.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm 2011-06-17 19:48:10 UTC (rev 89161)
@@ -36,6 +36,7 @@
#import "WebPreferences.h"
#import <PDFKit/PDFKit.h>
#import <WebCore/LocalizedStrings.h>
+#import <wtf/text/CString.h>
#import <wtf/text/WTFString.h>
// Redeclarations of PDFKit notifications. We can't use the API since we use a weak link to the framework.
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2011-06-17 19:48:10 UTC (rev 89161)
@@ -29,6 +29,8 @@
#include "ShareableBitmap.h"
#include "WebPageProxy.h"
#include "WebPopupMenuProxy.h"
+#include <WebCore/EditorClient.h>
+#include <WebCore/SpellingCorrectionController.h>
#include <wtf/Forward.h>
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -33,6 +33,7 @@
#include <WebCore/FileSystem.h>
#include <WebCore/IconDatabase.h>
#include <WebCore/IconDatabaseBase.h>
+#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-17 19:48:10 UTC (rev 89161)
@@ -75,6 +75,7 @@
#include <WebCore/FloatRect.h>
#include <WebCore/FocusDirection.h>
#include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/TextCheckerClient.h>
#include <WebCore/WindowFeatures.h>
#include <stdio.h>
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-17 19:48:10 UTC (rev 89161)
@@ -35,7 +35,7 @@
#include "GeolocationPermissionRequestManagerProxy.h"
#include "PlatformProcessIdentifier.h"
#include "SandboxExtension.h"
-#include "SharedMemory.h"
+#include "ShareableBitmap.h"
#include "WKBase.h"
#include "WKPagePrivate.h"
#include "WebContextMenuItemData.h"
@@ -49,7 +49,9 @@
#include "WebPopupMenuProxy.h"
#include "WebResourceLoadClient.h"
#include "WebUIClient.h"
+#include <WebCore/DragActions.h>
#include <WebCore/ScrollTypes.h>
+#include <WebCore/TextChecking.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (89160 => 89161)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-06-17 19:33:39 UTC (rev 89160)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-06-17 19:48:10 UTC (rev 89161)
@@ -41,6 +41,7 @@
#import <WebCore/IntRect.h>
#import <WebKit/WebNSWindowExtras.h>
#import <WebKitSystemInterface.h>
+#import <wtf/UnusedParam.h>
static const NSTimeInterval tickleTimerInterval = 1.0;
