Diff
Modified: trunk/Source/WebKit2/ChangeLog (160030 => 160031)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 20:37:57 UTC (rev 160031)
@@ -1,3 +1,21 @@
+2013-12-03 Tim Horton <timothy_hor...@apple.com>
+
+ Remove TiledCoreAnimationDrawingArea(Proxy)IOS
+ https://bugs.webkit.org/show_bug.cgi?id=125176
+
+ Reviewed by Simon Fraser.
+
+ Remove unused code.
+
+ * UIProcess/API/ios/WKContentView.mm:
+ * UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h: Removed.
+ * UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm: Removed.
+ * Shared/DrawingAreaInfo.h:
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::create):
+ * WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h: Removed.
+ * WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm: Removed.
+
2013-12-03 Anders Carlsson <ander...@apple.com>
Remove old WebKit::APIClient cruft
Modified: trunk/Source/WebKit2/Shared/DrawingAreaInfo.h (160030 => 160031)
--- trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/Shared/DrawingAreaInfo.h 2013-12-03 20:37:57 UTC (rev 160031)
@@ -30,9 +30,7 @@
enum DrawingAreaType {
#if PLATFORM(MAC)
-#if PLATFORM(IOS)
- DrawingAreaTypeTiledCoreAnimationIOS,
-#else
+#if !PLATFORM(IOS)
DrawingAreaTypeTiledCoreAnimation,
#endif
DrawingAreaTypeRemoteLayerTree,
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (160030 => 160031)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-03 20:37:57 UTC (rev 160031)
@@ -28,7 +28,6 @@
#import "PageClientImplIOS.h"
#import "RemoteLayerTreeDrawingAreaProxy.h"
-#import "TiledCoreAnimationDrawingAreaProxyIOS.h"
#import "UIWKRemoteView.h"
#import "WKBrowsingContextControllerInternal.h"
#import "WKBrowsingContextGroupPrivate.h"
Deleted: trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h (160030 => 160031)
--- trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h 2013-12-03 20:37:57 UTC (rev 160031)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2012 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 TiledCoreAnimationDrawingAreaProxyIOS_h
-#define TiledCoreAnimationDrawingAreaProxyIOS_h
-
-#include "DrawingAreaProxy.h"
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-
-class TiledCoreAnimationDrawingAreaProxyIOS : public DrawingAreaProxy {
-public:
- explicit TiledCoreAnimationDrawingAreaProxyIOS(WebPageProxy*);
- virtual ~TiledCoreAnimationDrawingAreaProxyIOS();
-
-private:
- // DrawingAreaProxy
- virtual void deviceScaleFactorDidChange() OVERRIDE;
- virtual void sizeDidChange() OVERRIDE;
- virtual void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) OVERRIDE;
-};
-
-} // namespace WebKit
-
-#endif // TiledCoreAnimationDrawingAreaProxyIOS_h
Deleted: trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm (160030 => 160031)
--- trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm 2013-12-03 20:37:57 UTC (rev 160031)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2012 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 "TiledCoreAnimationDrawingAreaProxyIOS.h"
-
-#import "DrawingAreaMessages.h"
-#import "WebPageProxy.h"
-#import "WebProcessProxy.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-TiledCoreAnimationDrawingAreaProxyIOS::TiledCoreAnimationDrawingAreaProxyIOS(WebPageProxy* webPageProxy)
- : DrawingAreaProxy(DrawingAreaTypeTiledCoreAnimationIOS, webPageProxy)
-{
-}
-
-TiledCoreAnimationDrawingAreaProxyIOS::~TiledCoreAnimationDrawingAreaProxyIOS()
-{
-}
-
-void TiledCoreAnimationDrawingAreaProxyIOS::deviceScaleFactorDidChange()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), m_webPageProxy->pageID());
-}
-
-void TiledCoreAnimationDrawingAreaProxyIOS::sizeDidChange()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::UpdateGeometry(m_size, IntSize()), m_webPageProxy->pageID());
-}
-
-void TiledCoreAnimationDrawingAreaProxyIOS::enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext& layerTreeContext)
-{
- m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (160030 => 160031)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2013-12-03 20:37:57 UTC (rev 160031)
@@ -28,10 +28,6 @@
#include <wtf/Functional.h>
// Subclasses
-#if PLATFORM(IOS)
-#include "TiledCoreAnimationDrawingAreaIOS.h"
-#endif
-
#if PLATFORM(MAC)
#include "RemoteLayerTreeDrawingArea.h"
#include "TiledCoreAnimationDrawingArea.h"
@@ -51,10 +47,7 @@
{
switch (parameters.drawingAreaType) {
#if PLATFORM(MAC)
-#if PLATFORM(IOS)
- case DrawingAreaTypeTiledCoreAnimationIOS:
- return std::make_unique<TiledCoreAnimationDrawingAreaIOS>(webPage, parameters);
-#else
+#if !PLATFORM(IOS)
case DrawingAreaTypeTiledCoreAnimation:
return std::make_unique<TiledCoreAnimationDrawingArea>(webPage, parameters);
#endif
Deleted: trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h (160030 => 160031)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h 2013-12-03 20:37:57 UTC (rev 160031)
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2012 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 TiledCoreAnimationDrawingAreaIOS_h
-#define TiledCoreAnimationDrawingAreaIOS_h
-
-#include "DrawingArea.h"
-#include <WebCore/GraphicsLayerClient.h>
-#include <WebCore/LayerFlushScheduler.h>
-#include <WebCore/LayerFlushSchedulerClient.h>
-#include <wtf/RetainPtr.h>
-
-OBJC_CLASS CAContext;
-OBJC_CLASS CALayer;
-
-namespace WebKit {
-
-class TiledCoreAnimationDrawingAreaIOS : public DrawingArea, private WebCore::GraphicsLayerClient, private WebCore::LayerFlushSchedulerClient {
-public:
- TiledCoreAnimationDrawingAreaIOS(WebPage*, const WebPageCreationParameters&);
- virtual ~TiledCoreAnimationDrawingAreaIOS();
-
-private:
- // DrawingArea
- virtual void setNeedsDisplay() OVERRIDE;
- virtual void setNeedsDisplayInRect(const WebCore::IntRect&) OVERRIDE;
- virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) OVERRIDE;
- virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) OVERRIDE;
- virtual void scheduleCompositingLayerFlush() OVERRIDE;
-
- // GraphicsLayerClient
- virtual bool shouldUseTiledBacking(const WebCore::GraphicsLayer*) const OVERRIDE;
- virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) OVERRIDE;
- virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) OVERRIDE;
-
- virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip) OVERRIDE;
-
- virtual float minimumDocumentScale() const OVERRIDE;
- virtual bool allowCompositingLayerVisualDegradation() const OVERRIDE;
-
- // LayerFlushSchedulerClient
- virtual bool flushLayers() OVERRIDE;
-
- // Message handlers.
- virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition);
- virtual void setDeviceScaleFactor(float) OVERRIDE;
-
- WebCore::LayerFlushScheduler m_layerFlushScheduler;
-
- RetainPtr<CAContext> m_context;
- RetainPtr<CALayer> m_rootLayer;
-
- OwnPtr<WebCore::GraphicsLayer> m_contentLayer;
-};
-
-} // namespace WebKit
-
-#endif // TiledCoreAnimationDrawingAreaIOS_h
Deleted: trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm (160030 => 160031)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm 2013-12-03 20:21:29 UTC (rev 160030)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm 2013-12-03 20:37:57 UTC (rev 160031)
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2012 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 "TiledCoreAnimationDrawingAreaIOS.h"
-
-#import "DrawingAreaProxyMessages.h"
-#import "WebPage.h"
-#import <QuartzCore/CAContext.h>
-#import <QuartzCore/QuartzCore.h>
-#import <UIKit/UIKit.h>
-#import <WebCore/Frame.h>
-#import <WebCore/FrameView.h>
-#import <WebCore/GraphicsContext.h>
-#import <WebCore/GraphicsLayerCA.h>
-#import <WebCore/MainFrame.h>
-#import <WebCore/NotImplemented.h>
-#import <WebCore/Page.h>
-#import <WebCore/PlatformCALayer.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-TiledCoreAnimationDrawingAreaIOS::~TiledCoreAnimationDrawingAreaIOS()
-{
- m_layerFlushScheduler.invalidate();
-}
-
-TiledCoreAnimationDrawingAreaIOS::TiledCoreAnimationDrawingAreaIOS(WebPage* webPage, const WebPageCreationParameters& parameters)
- : DrawingArea(DrawingAreaTypeTiledCoreAnimationIOS, webPage)
- , m_layerFlushScheduler(this)
-{
- Page* page = webPage->corePage();
-
- page->settings().setForceCompositingMode(true);
- page->settings().setScrollingCoordinatorEnabled(true);
- page->settings().setDelegatesPageScaling(true);
-
- m_rootLayer = [CALayer layer];
- CGRect rootLayerFrame = m_webPage->bounds();
- m_rootLayer.get().frame = rootLayerFrame;
- m_rootLayer.get().opaque = YES;
-
- RetainPtr<NSMutableDictionary> options = adoptNS([[NSMutableDictionary alloc] init]);
-
- [options.get() setObject:@YES forKey:kCAContextIgnoresHitTest];
-
- m_context = [CAContext remoteContextWithOptions:options.get()];
- [m_context.get() setLevel:-CGFLOAT_MAX];
-
- [m_context.get() setLayer:m_rootLayer.get()];
-
- LayerTreeContext layerTreeContext;
- layerTreeContext.contextID = [m_context.get() contextId];
-
- m_webPage->send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(0, layerTreeContext));
-
- page->settings().setShowDebugBorders(true);
- page->settings().setShowRepaintCounter(false);
-}
-
-void TiledCoreAnimationDrawingAreaIOS::setNeedsDisplay()
-{
- notImplemented();
-}
-
-void TiledCoreAnimationDrawingAreaIOS::setNeedsDisplayInRect(const WebCore::IntRect&)
-{
- notImplemented();
-}
-
-void TiledCoreAnimationDrawingAreaIOS::scroll(const IntRect&, const IntSize&)
-{
- notImplemented();
-}
-
-void TiledCoreAnimationDrawingAreaIOS::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
-{
- CALayer *rootCompositingLayer = graphicsLayer ? graphicsLayer->platformLayer() : nil;
- if (!rootCompositingLayer)
- return;
-
- [CATransaction begin];
- [CATransaction setDisableActions:YES];
-
- m_rootLayer.get().sublayers = [NSArray arrayWithObject:rootCompositingLayer];
-
- [CATransaction commit];
-}
-
-void TiledCoreAnimationDrawingAreaIOS::scheduleCompositingLayerFlush()
-{
- m_layerFlushScheduler.schedule();
-}
-
-bool TiledCoreAnimationDrawingAreaIOS::shouldUseTiledBacking(const GraphicsLayer*) const
-{
- return true;
-}
-
-void TiledCoreAnimationDrawingAreaIOS::notifyAnimationStarted(const GraphicsLayer*, double time)
-{
-}
-
-void TiledCoreAnimationDrawingAreaIOS::notifyFlushRequired(const GraphicsLayer*)
-{
-}
-
-void TiledCoreAnimationDrawingAreaIOS::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
-{
-}
-
-float TiledCoreAnimationDrawingAreaIOS::minimumDocumentScale() const
-{
- return 1.0;
-}
-
-bool TiledCoreAnimationDrawingAreaIOS::allowCompositingLayerVisualDegradation() const
-{
- return false;
-}
-
-bool TiledCoreAnimationDrawingAreaIOS::flushLayers()
-{
- @autoreleasepool {
- m_webPage->layoutIfNeeded();
- return m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes();
- }
-}
-
-void TiledCoreAnimationDrawingAreaIOS::updateGeometry(const IntSize& viewSize, const WebCore::IntSize& layerPosition)
-{
- m_webPage->setSize(viewSize);
- m_webPage->layoutIfNeeded();
-}
-
-void TiledCoreAnimationDrawingAreaIOS::setDeviceScaleFactor(float deviceScaleFactor)
-{
- m_webPage->setDeviceScaleFactor(deviceScaleFactor);
-}
-
-} // namespace WebKit
