Diff
Modified: trunk/Source/WebKit2/ChangeLog (93232 => 93233)
--- trunk/Source/WebKit2/ChangeLog 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-17 19:11:22 UTC (rev 93233)
@@ -1,3 +1,16 @@
+2011-08-17 Anders Carlsson <[email protected]>
+
+ Remove unused Core Animation related classes
+ https://bugs.webkit.org/show_bug.cgi?id=66393
+
+ Reviewed by Darin Adler.
+
+ * Shared/mac/CoreAnimationRenderer.h: Removed.
+ * Shared/mac/CoreAnimationRenderer.mm: Removed.
+ * Shared/mac/ShareableSurface.cpp: Removed.
+ * Shared/mac/ShareableSurface.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2011-08-15 Dmitry Titov <[email protected]>
FrameLoaderClient::transferLoadingResourceFromPage does not have enough parameters
Deleted: trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.h (93232 => 93233)
--- trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.h 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.h 2011-08-17 19:11:22 UTC (rev 93233)
@@ -1,69 +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 CoreAnimationRenderer_h
-#define CoreAnimationRenderer_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RetainPtr.h>
-
-OBJC_CLASS CALayer;
-OBJC_CLASS CARenderer;
-
-typedef struct _CGLContextObject* CGLContextObj;
-
-namespace WebKit {
-
-class CoreAnimationRenderer : public RefCounted<CoreAnimationRenderer> {
-public:
- class Client {
- public:
- virtual ~Client() { }
- virtual void rendererDidChange(CoreAnimationRenderer*) = 0;
- };
-
- static PassRefPtr<CoreAnimationRenderer> create(Client*, CGLContextObj, CALayer *);
- ~CoreAnimationRenderer();
-
- void invalidate();
-
- void setBounds(CGRect);
- void render(CFTimeInterval frameTime, CVTimeStamp*, CFTimeInterval& nextFrameTime);
-
-private:
- CoreAnimationRenderer(Client*, CGLContextObj, CALayer *);
-
- static void rendererDidChange(void*);
- void rendererDidChange();
-
- Client* m_client;
- CGLContextObj m_cglContext;
- RetainPtr<CARenderer> m_renderer;
-};
-
-} // namespace WebKit
-
-#endif // CoreAnimationRenderer_h
Deleted: trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.mm (93232 => 93233)
--- trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.mm 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/Shared/mac/CoreAnimationRenderer.mm 2011-08-17 19:11:22 UTC (rev 93233)
@@ -1,100 +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.
- */
-
-#import "config.h"
-#import "CoreAnimationRenderer.h"
-
-#import <WebKitSystemInterface.h>
-#import <QuartzCore/QuartzCore.h>
-#import <OpenGL/CGLMacro.h>
-
-// The CGLMacro.h header adds an implicit CGLContextObj parameter to all OpenGL calls,
-// which is good because it allows us to make OpenGL calls without saving and restoring the
-// current context. The context argument is named "cgl_ctx" by default, so we use the macro
-// below to declare this variable.
-#define DECLARE_GL_CONTEXT_VARIABLE(name) \
- CGLContextObj cgl_ctx = (name)
-
-namespace WebKit {
-
-PassRefPtr<CoreAnimationRenderer> CoreAnimationRenderer::create(Client* client, CGLContextObj cglContextObj, CALayer *layer)
-{
- return adoptRef(new CoreAnimationRenderer(client, cglContextObj, layer));
-}
-
-CoreAnimationRenderer::CoreAnimationRenderer(Client* client, CGLContextObj cglContextObj, CALayer *layer)
- : m_client(client)
- , m_cglContext(cglContextObj)
- , m_renderer([CARenderer rendererWithCGLContext:m_cglContext options:nil])
-{
- [m_renderer.get() setLayer:layer];
-
- WKCARendererAddChangeNotificationObserver(m_renderer.get(), rendererDidChange, this);
-}
-
-CoreAnimationRenderer::~CoreAnimationRenderer()
-{
- ASSERT(!m_client);
-}
-
-void CoreAnimationRenderer::setBounds(CGRect bounds)
-{
- [m_renderer.get() setBounds:bounds];
-
- [CATransaction begin];
- [CATransaction setDisableActions:YES];
- [[m_renderer.get() layer] setFrame:bounds];
- [CATransaction commit];
-}
-
-void CoreAnimationRenderer::render(CFTimeInterval frameTime, CVTimeStamp* timeStamp, CFTimeInterval& nextFrameTime)
-{
- [m_renderer.get() beginFrameAtTime:frameTime timeStamp:timeStamp];
- [m_renderer.get() render];
- nextFrameTime = [m_renderer.get() nextFrameTime];
- [m_renderer.get() endFrame];
-}
-
-void CoreAnimationRenderer::invalidate()
-{
- ASSERT(m_client);
-
- WKCARendererRemoveChangeNotificationObserver(m_renderer.get(), rendererDidChange, this);
- m_client = 0;
-}
-
-void CoreAnimationRenderer::rendererDidChange(void* context)
-{
- static_cast<CoreAnimationRenderer*>(context)->rendererDidChange();
-}
-
-void CoreAnimationRenderer::rendererDidChange()
-{
- ASSERT(m_client);
-
- m_client->rendererDidChange(this);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/mac/ShareableSurface.cpp (93232 => 93233)
--- trunk/Source/WebKit2/Shared/mac/ShareableSurface.cpp 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/Shared/mac/ShareableSurface.cpp 2011-08-17 19:11:22 UTC (rev 93233)
@@ -1,215 +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 "ShareableSurface.h"
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "MachPort.h"
-#include <IOSurface/IOSurface.h>
-#include <OpenGL/CGLIOSurface.h>
-#include <OpenGL/CGLMacro.h>
-#include <OpenGL/OpenGL.h>
-#include <mach/mach_port.h>
-
-// The CGLMacro.h header adds an implicit CGLContextObj parameter to all OpenGL calls,
-// which is good because it allows us to make OpenGL calls without saving and restoring the
-// current context. The context argument is named "cgl_ctx" by default, so we the macro
-// below to declare this variable.
-#define DECLARE_GL_CONTEXT_VARIABLE(name) \
- CGLContextObj cgl_ctx = (name)
-
-// It expects a context named "
-using namespace WebCore;
-
-namespace WebKit {
-
-ShareableSurface::Handle::Handle()
- : m_port(MACH_PORT_NULL)
-{
-}
-
-ShareableSurface::Handle::~Handle()
-{
- if (m_port != MACH_PORT_NULL)
- mach_port_deallocate(mach_task_self(), m_port);
-}
-
-void ShareableSurface::Handle::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
- encoder->encode(CoreIPC::MachPort(m_port, MACH_MSG_TYPE_MOVE_SEND));
- m_port = MACH_PORT_NULL;
-}
-
-bool ShareableSurface::Handle::decode(CoreIPC::ArgumentDecoder* decoder, Handle& handle)
-{
- ASSERT_ARG(handle, handle.m_port == MACH_PORT_NULL);
-
- CoreIPC::MachPort machPort;
- if (!decoder->decode(machPort))
- return false;
-
- handle.m_port = machPort.port();
- return false;
-}
-
-static RetainPtr<IOSurfaceRef> createIOSurface(const IntSize& size)
-{
- int width = size.width();
- int height = size.height();
-
- unsigned bytesPerElement = 4;
- unsigned long bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerElement);
- if (!bytesPerRow)
- return 0;
-
- unsigned long allocSize = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * bytesPerRow);
- if (!allocSize)
- return 0;
-
- unsigned pixelFormat = 'BGRA';
-
- static const size_t numKeys = 6;
- const void *keys[numKeys];
- const void *values[numKeys];
- keys[0] = kIOSurfaceWidth;
- values[0] = CFNumberCreate(0, kCFNumberIntType, &width);
- keys[1] = kIOSurfaceHeight;
- values[1] = CFNumberCreate(0, kCFNumberIntType, &height);
- keys[2] = kIOSurfacePixelFormat;
- values[2] = CFNumberCreate(0, kCFNumberIntType, &pixelFormat);
- keys[3] = kIOSurfaceBytesPerElement;
- values[3] = CFNumberCreate(0, kCFNumberIntType, &bytesPerElement);
- keys[4] = kIOSurfaceBytesPerRow;
- values[4] = CFNumberCreate(0, kCFNumberLongType, &bytesPerRow);
- keys[5] = kIOSurfaceAllocSize;
- values[5] = CFNumberCreate(0, kCFNumberLongType, &allocSize);
-
- RetainPtr<CFDictionaryRef> dictionary(AdoptCF, CFDictionaryCreate(0, keys, values, numKeys, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- for (unsigned i = 0; i < numKeys; i++)
- CFRelease(values[i]);
-
- return RetainPtr<IOSurfaceRef>(AdoptCF, IOSurfaceCreate(dictionary.get()));
-}
-
-PassRefPtr<ShareableSurface> ShareableSurface::create(CGLContextObj cglContextObj, const IntSize& size)
-{
- RetainPtr<IOSurfaceRef> ioSurface = createIOSurface(size);
- if (!ioSurface)
- return 0;
-
- return adoptRef(new ShareableSurface(cglContextObj, size, ioSurface.get()));
-}
-
-PassRefPtr<ShareableSurface> ShareableSurface::create(CGLContextObj cglContextObj, const Handle& handle)
-{
- ASSERT_ARG(handle, handle.m_port != MACH_PORT_NULL);
-
- RetainPtr<IOSurfaceRef> ioSurface(AdoptCF, IOSurfaceLookupFromMachPort(handle.m_port));
- if (!ioSurface)
- return 0;
-
- IntSize size = IntSize(IOSurfaceGetWidth(ioSurface.get()), IOSurfaceGetHeight(ioSurface.get()));
-
- return adoptRef(new ShareableSurface(cglContextObj, size, ioSurface.get()));
-}
-
-ShareableSurface::ShareableSurface(CGLContextObj cglContextObj, const IntSize& size, IOSurfaceRef ioSurface)
- : m_cglContextObj(CGLRetainContext(cglContextObj))
- , m_size(size)
- , m_textureID(0)
- , m_frameBufferObjectID(0)
- , m_ioSurface(ioSurface)
-{
-}
-
-ShareableSurface::~ShareableSurface()
-{
- DECLARE_GL_CONTEXT_VARIABLE(m_cglContextObj);
-
- if (m_textureID)
- glDeleteTextures(1, &m_textureID);
-
- if (m_frameBufferObjectID)
- glDeleteFramebuffersEXT(1, &m_frameBufferObjectID);
-
- CGLReleaseContext(m_cglContextObj);
-}
-
-bool ShareableSurface::createHandle(Handle& handle)
-{
- ASSERT_ARG(handle, handle.m_port == MACH_PORT_NULL);
-
- mach_port_t port = IOSurfaceCreateMachPort(m_ioSurface.get());
- if (port == MACH_PORT_NULL)
- return false;
-
- handle.m_port = port;
- return true;
-}
-
-void ShareableSurface::attach()
-{
- DECLARE_GL_CONTEXT_VARIABLE(m_cglContextObj);
-
- if (!m_frameBufferObjectID) {
- // Generate a frame buffer object.
- glGenFramebuffersEXT(1, &m_frameBufferObjectID);
-
- // Associate it with the texture.
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_frameBufferObjectID);
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_EXT, textureID(), 0);
- } else
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_frameBufferObjectID);
-}
-
-void ShareableSurface::detach()
-{
- DECLARE_GL_CONTEXT_VARIABLE(m_cglContextObj);
-
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-}
-
-unsigned ShareableSurface::textureID()
-{
- if (m_textureID)
- return m_textureID;
-
- DECLARE_GL_CONTEXT_VARIABLE(m_cglContextObj);
-
- // Generate a texture.
- glGenTextures(1, &m_textureID);
-
- // Associate it with our IOSurface.
- glBindTexture(GL_TEXTURE_RECTANGLE_EXT, m_textureID);
- CGLTexImageIOSurface2D(cgl_ctx, GL_TEXTURE_RECTANGLE_EXT, GL_RGBA8, m_size.width(), m_size.height(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, m_ioSurface.get(), 0);
- glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
-
- return m_textureID;
-}
-
-} // namespace WebKit
-
Deleted: trunk/Source/WebKit2/Shared/mac/ShareableSurface.h (93232 => 93233)
--- trunk/Source/WebKit2/Shared/mac/ShareableSurface.h 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/Shared/mac/ShareableSurface.h 2011-08-17 19:11:22 UTC (rev 93233)
@@ -1,98 +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 ShareableSurface_h
-#define ShareableSurface_h
-
-#include <WebCore/IntSize.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RetainPtr.h>
-
-typedef struct _CGLContextObject* CGLContextObj;
-typedef struct __IOSurface* IOSurfaceRef;
-
-namespace CoreIPC {
- class ArgumentDecoder;
- class ArgumentEncoder;
-}
-
-namespace WebKit {
-
-class ShareableSurface : public RefCounted<ShareableSurface> {
-public:
- class Handle {
- WTF_MAKE_NONCOPYABLE(Handle);
-
- public:
- Handle();
- ~Handle();
-
- void encode(CoreIPC::ArgumentEncoder*) const;
- static bool decode(CoreIPC::ArgumentDecoder*, Handle&);
-
- private:
- friend class ShareableSurface;
-
- mutable mach_port_t m_port;
- };
-
- // Create a shareable surface with the given size. Returns 0 on failure.
- static PassRefPtr<ShareableSurface> create(CGLContextObj, const WebCore::IntSize&);
-
- // Create a shareable surface from a handle. Returns 0 on failure.
- static PassRefPtr<ShareableSurface> create(CGLContextObj, const Handle&);
-
- ~ShareableSurface();
-
- bool createHandle(Handle&);
-
- unsigned textureID();
-
- void attach();
- void detach();
-
-private:
- ShareableSurface(CGLContextObj, const WebCore::IntSize&, IOSurfaceRef);
-
- // The OpenGL context.
- CGLContextObj m_cglContextObj;
-
- // The size of the surface.
- WebCore::IntSize m_size;
-
- // The ID of the texture.
- unsigned m_textureID;
-
- // The frame buffer object ID of the texture; used when the surface is used as a render destination.
- unsigned m_frameBufferObjectID;
-
- RetainPtr<IOSurfaceRef> m_ioSurface;
-};
-
-} // namespace WebKit
-
-#endif // ShareableSurface_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (93232 => 93233)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-08-17 19:10:19 UTC (rev 93232)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2011-08-17 19:11:22 UTC (rev 93233)
@@ -174,10 +174,6 @@
1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */; };
1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */; };
- 1A9636BC12F348490078A062 /* ShareableSurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9636BA12F348490078A062 /* ShareableSurface.cpp */; };
- 1A9636BD12F348490078A062 /* ShareableSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9636BB12F348490078A062 /* ShareableSurface.h */; };
- 1A9639F712F38ECD0078A062 /* CoreAnimationRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9639F512F38ECD0078A062 /* CoreAnimationRenderer.h */; };
- 1A9639F812F38ECD0078A062 /* CoreAnimationRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9639F612F38ECD0078A062 /* CoreAnimationRenderer.mm */; };
1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */; };
@@ -1090,10 +1086,6 @@
1A9101091268C8CA001842F5 /* FindIndicatorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindIndicatorWindow.mm; sourceTree = "<group>"; };
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeContextMac.mm; sourceTree = "<group>"; };
- 1A9636BA12F348490078A062 /* ShareableSurface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableSurface.cpp; sourceTree = "<group>"; };
- 1A9636BB12F348490078A062 /* ShareableSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareableSurface.h; sourceTree = "<group>"; };
- 1A9639F512F38ECD0078A062 /* CoreAnimationRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAnimationRenderer.h; sourceTree = "<group>"; };
- 1A9639F612F38ECD0078A062 /* CoreAnimationRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreAnimationRenderer.mm; sourceTree = "<group>"; };
1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1AA1C7DE100E846E0078DEBC /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
@@ -2894,8 +2886,6 @@
E1A31731134CEA6C007C9A4F /* AttributedString.h */,
E1A31734134CEA80007C9A4F /* AttributedString.mm */,
1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */,
- 1A9639F512F38ECD0078A062 /* CoreAnimationRenderer.h */,
- 1A9639F612F38ECD0078A062 /* CoreAnimationRenderer.mm */,
5112CB071385B97B0030867D /* KeychainAttribute.cpp */,
5112CB051385B8D90030867D /* KeychainAttribute.h */,
1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */,
@@ -2916,8 +2906,6 @@
5112CA4813858D4B0030867D /* SecKeychainItemRequestData.h */,
5112CA4913858D4B0030867D /* SecKeychainItemResponseData.cpp */,
5112CA4A13858D4B0030867D /* SecKeychainItemResponseData.h */,
- 1A9636BA12F348490078A062 /* ShareableSurface.cpp */,
- 1A9636BB12F348490078A062 /* ShareableSurface.h */,
BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */,
BC111B5B112F629800337BAB /* WebEventFactory.h */,
BC111B5C112F629800337BAB /* WebEventFactory.mm */,
@@ -3752,8 +3740,6 @@
E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */,
1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */,
BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
- 1A9636BD12F348490078A062 /* ShareableSurface.h in Headers */,
- 1A9639F712F38ECD0078A062 /* CoreAnimationRenderer.h in Headers */,
BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */,
BC8147D512F66D31007B2C32 /* InjectedBundleNavigationAction.h in Headers */,
BC7043CC12F75EE0006472B9 /* WKBundleNavigationAction.h in Headers */,
@@ -4406,8 +4392,6 @@
BC9585C812F095B800755821 /* WebGestureEvent.cpp in Sources */,
1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */,
6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */,
- 1A9636BC12F348490078A062 /* ShareableSurface.cpp in Sources */,
- 1A9639F812F38ECD0078A062 /* CoreAnimationRenderer.mm in Sources */,
BC8147AA12F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp in Sources */,
BC8147D612F66D31007B2C32 /* InjectedBundleNavigationAction.cpp in Sources */,
BC7043CD12F75EE0006472B9 /* WKBundleNavigationAction.cpp in Sources */,
