Diff
Modified: trunk/Source/WebKit2/ChangeLog (159221 => 159222)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,5 +1,28 @@
2013-11-13 Anders Carlsson <[email protected]>
+ Remove WebGraphicsContext
+ https://bugs.webkit.org/show_bug.cgi?id=124302
+
+ Reviewed by Dan Bernstein.
+
+ WebGraphicsContext and its API "object", WKGraphicsContextRef was only used
+ for the overhang paint callback which has been removed.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKGraphicsContextGetCGContext):
+ * Shared/API/c/WKGraphicsContext.cpp: Removed.
+ * Shared/API/c/WKGraphicsContext.h: Removed.
+ * Shared/API/c/cg/WKGraphicsContextCG.cpp: Removed.
+ * Shared/API/c/cg/WKGraphicsContextCG.h: Removed.
+ * Shared/APIObject.h:
+ * Shared/WebGraphicsContext.cpp: Removed.
+ * Shared/WebGraphicsContext.h: Removed.
+ * UIProcess/API/C/WebKit2_C.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+
+2013-11-13 Anders Carlsson <[email protected]>
+
WKArrayIsMutable should not be mangled
https://bugs.webkit.org/show_bug.cgi?id=124299
Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (159221 => 159222)
--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2013-11-13 20:29:37 UTC (rev 159222)
@@ -31,9 +31,20 @@
extern "C" {
WK_EXPORT bool WKArrayIsMutable(WKArrayRef array);
+
+#if PLATFORM(MAC)
+WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
+#endif
}
bool WKArrayIsMutable(WKArrayRef array)
{
return false;
}
+
+#if PLATFORM(MAC)
+CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
+{
+ return nullptr;
+}
+#endif
Deleted: trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp (159221 => 159222)
--- trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
- */
-
-#include "config.h"
-#include "WKGraphicsContext.h"
-
-#include "WKSharedAPICast.h"
-#include "WebGraphicsContext.h"
-
-using namespace WebKit;
-
-WKTypeID WKGraphicsContextGetTypeID()
-{
- return toAPI(WebGraphicsContext::APIType);
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h (159221 => 159222)
--- trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WKGraphicsContext_h
-#define WKGraphicsContext_h
-
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKGraphicsContextGetTypeID();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContext_h */
Deleted: trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp (159221 => 159222)
--- trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
- */
-
-
-#include "config.h"
-#include "WKGraphicsContextCG.h"
-
-#include "WKSharedAPICast.h"
-#include "WebGraphicsContext.h"
-
-using namespace WebKit;
-
-CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContextRef)
-{
- return toImpl(graphicsContextRef)->platformContext();
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h (159221 => 159222)
--- trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WKGraphicsContextCG_h
-#define WKGraphicsContextCG_h
-
-#include <CoreGraphics/CGContext.h>
-#include <WebKit2/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContextCG_h */
Modified: trunk/Source/WebKit2/Shared/APIObject.h (159221 => 159222)
--- trunk/Source/WebKit2/Shared/APIObject.h 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2013-11-13 20:29:37 UTC (rev 159222)
@@ -59,7 +59,6 @@
Data,
Dictionary,
Error,
- GraphicsContext,
Image,
ProtectionSpace,
RenderLayer,
Deleted: trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp (159221 => 159222)
--- trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
- */
-
-#include "config.h"
-#include "WebGraphicsContext.h"
-
-#if USE(CAIRO)
-#include <WebCore/PlatformContextCairo.h>
-#endif
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebGraphicsContext::WebGraphicsContext(GraphicsContext* graphicsContext)
-#if USE(CG)
- : m_platformContext(graphicsContext->platformContext())
-#elif USE(CAIRO)
- : m_platformContext(graphicsContext->platformContext()->cr())
-#endif
-{
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/WebGraphicsContext.h (159221 => 159222)
--- trunk/Source/WebKit2/Shared/WebGraphicsContext.h 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/WebGraphicsContext.h 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WebGraphicsContext_h
-#define WebGraphicsContext_h
-
-#include "APIObject.h"
-#include <WebCore/GraphicsContext.h>
-#include <wtf/PassRefPtr.h>
-
-#if USE(CG)
-#include <wtf/RetainPtr.h>
-#elif USE(CAIRO)
-#include <WebCore/RefPtrCairo.h>
-#endif
-
-namespace WebKit {
-
-class WebGraphicsContext : public API::TypedObject<API::Object::Type::GraphicsContext> {
-public:
- static PassRefPtr<WebGraphicsContext> create(WebCore::GraphicsContext* graphicsContext)
- {
- return adoptRef(new WebGraphicsContext(graphicsContext));
- }
-
-#if USE(CG)
- CGContextRef platformContext() { return m_platformContext.get(); }
-#elif USE(CAIRO)
- cairo_t* platformContext() { return m_platformContext.get(); }
-#endif
-
-
-private:
- explicit WebGraphicsContext(WebCore::GraphicsContext*);
-
-#if USE(CG)
- RetainPtr<CGContextRef> m_platformContext;
-#elif USE(CAIRO)
- RefPtr<cairo_t> m_platformContext;
-#endif
-};
-
-} // namespace WebKit
-
-#endif // WebGraphicsContext_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (159221 => 159222)
--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2013-11-13 20:29:37 UTC (rev 159222)
@@ -43,7 +43,6 @@
#include <WebKit2/WKGeolocationManager.h>
#include <WebKit2/WKGeolocationPermissionRequest.h>
#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKGraphicsContext.h>
#include <WebKit2/WKHitTestResult.h>
#include <WebKit2/WKMutableArray.h>
#include <WebKit2/WKMutableDictionary.h>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (159221 => 159222)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-13 20:29:37 UTC (rev 159222)
@@ -1007,12 +1007,6 @@
BCA0EFA012332642007D3CFB /* WebEditCommandProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */; };
BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA284D41492F2C7001F9042 /* WKConnection.mm */; };
BCA284D71492F2C7001F9042 /* WKConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA284D51492F2C7001F9042 /* WKConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
- BCA56A1C12F9028E00C566C7 /* WebGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */; };
- BCA56A1D12F9028E00C566C7 /* WebGraphicsContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */; };
- BCA56A6512F9C8F900C566C7 /* WKGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BCA56A6612F9C8F900C566C7 /* WKGraphicsContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */; };
- BCA56A6912F9C9AD00C566C7 /* WKGraphicsContextCG.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BCA56A6A12F9C9AD00C566C7 /* WKGraphicsContextCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */; };
BCA8C6A811E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6A611E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp */; };
BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
@@ -2561,12 +2555,6 @@
BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebEditCommandProxy.cpp; sourceTree = "<group>"; };
BCA284D41492F2C7001F9042 /* WKConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKConnection.mm; sourceTree = "<group>"; };
BCA284D51492F2C7001F9042 /* WKConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnection.h; sourceTree = "<group>"; };
- BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGraphicsContext.h; sourceTree = "<group>"; };
- BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGraphicsContext.cpp; sourceTree = "<group>"; };
- BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGraphicsContext.h; sourceTree = "<group>"; };
- BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGraphicsContext.cpp; sourceTree = "<group>"; };
- BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGraphicsContextCG.h; sourceTree = "<group>"; };
- BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGraphicsContextCG.cpp; sourceTree = "<group>"; };
BCA8C6A611E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageLoaderClient.cpp; sourceTree = "<group>"; };
BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageLoaderClient.h; sourceTree = "<group>"; };
BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageUIClient.cpp; sourceTree = "<group>"; };
@@ -3423,8 +3411,6 @@
BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */,
BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */,
0F174AA2142A4CB60039250F /* WebGeometry.h */,
- BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */,
- BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */,
7801C095142290C400FAF9AF /* WebHitTestResult.cpp */,
7801C096142290C400FAF9AF /* WebHitTestResult.h */,
BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */,
@@ -5135,8 +5121,6 @@
BCCF6AC412C91F3B008F9C35 /* cg */ = {
isa = PBXGroup;
children = (
- BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */,
- BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */,
BCCF6AC712C91F59008F9C35 /* WKImageCG.cpp */,
BCCF6AC812C91F59008F9C35 /* WKImageCG.h */,
);
@@ -5180,8 +5164,6 @@
37F623B712A57B6200E3FDF6 /* WKFindOptions.h */,
0F174AA6142AAC610039250F /* WKGeometry.cpp */,
BCC8B373125FB69000DE46A4 /* WKGeometry.h */,
- BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */,
- BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */,
BCCF6AC012C91F34008F9C35 /* WKImage.cpp */,
BCCF6AC112C91F34008F9C35 /* WKImage.h */,
BC4075E1124FF0270068F20A /* WKMutableArray.cpp */,
@@ -5786,7 +5768,6 @@
BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */,
- BCA56A1C12F9028E00C566C7 /* WebGraphicsContext.h in Headers */,
BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */,
7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */,
511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */,
@@ -5966,8 +5947,6 @@
BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,
BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */,
BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
- BCA56A6512F9C8F900C566C7 /* WKGraphicsContext.h in Headers */,
- BCA56A6912F9C9AD00C566C7 /* WKGraphicsContextCG.h in Headers */,
B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,
5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,
5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */,
@@ -7117,7 +7096,6 @@
BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
- BCA56A1D12F9028E00C566C7 /* WebGraphicsContext.cpp in Sources */,
BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,
7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */,
511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
@@ -7280,8 +7258,6 @@
BC06F44F12DBDF3F002D78DE /* WKGeolocationPermissionRequest.cpp in Sources */,
BC0E619912D6CD120012A72A /* WKGeolocationPosition.cpp in Sources */,
0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */,
- BCA56A6612F9C8F900C566C7 /* WKGraphicsContext.cpp in Sources */,
- BCA56A6A12F9C9AD00C566C7 /* WKGraphicsContextCG.cpp in Sources */,
B62E7310143047A60069EC35 /* WKHitTestResult.cpp in Sources */,
5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */,
5123CF1B133D260A0056F800 /* WKIconDatabaseCG.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (159221 => 159222)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-11-13 20:29:37 UTC (rev 159222)
@@ -29,7 +29,6 @@
#include "InjectedBundleHitTestResult.h"
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
-#include "WebGraphicsContext.h"
#include "WebSecurityOrigin.h"
#include <wtf/text/WTFString.h>
