<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160031] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160031">160031</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 12:37:57 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDrawingAreaInfoh">trunk/Source/WebKit2/Shared/DrawingAreaInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessiosTiledCoreAnimationDrawingAreaProxyIOSh">trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosTiledCoreAnimationDrawingAreaProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosTiledCoreAnimationDrawingAreaIOSh">trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosTiledCoreAnimationDrawingAreaIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-03 Tim Horton <timothy_horton@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.
+
</ins><span class="cx"> 2013-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove old WebKit::APIClient cruft
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDrawingAreaInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DrawingAreaInfo.h (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,9 +30,7 @@
</span><span class="cx">
</span><span class="cx"> enum DrawingAreaType {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#if PLATFORM(IOS)
- DrawingAreaTypeTiledCoreAnimationIOS,
-#else
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> DrawingAreaTypeTiledCoreAnimation,
</span><span class="cx"> #endif
</span><span class="cx"> DrawingAreaTypeRemoteLayerTree,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "PageClientImplIOS.h"
</span><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxy.h"
</span><del>-#import "TiledCoreAnimationDrawingAreaProxyIOS.h"
</del><span class="cx"> #import "UIWKRemoteView.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextGroupPrivate.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosTiledCoreAnimationDrawingAreaProxyIOSh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.h (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosTiledCoreAnimationDrawingAreaProxyIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,10 +28,6 @@
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx">
</span><span class="cx"> // Subclasses
</span><del>-#if PLATFORM(IOS)
-#include "TiledCoreAnimationDrawingAreaIOS.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "RemoteLayerTreeDrawingArea.h"
</span><span class="cx"> #include "TiledCoreAnimationDrawingArea.h"
</span><span class="lines">@@ -51,10 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (parameters.drawingAreaType) {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#if PLATFORM(IOS)
- case DrawingAreaTypeTiledCoreAnimationIOS:
- return std::make_unique<TiledCoreAnimationDrawingAreaIOS>(webPage, parameters);
-#else
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> case DrawingAreaTypeTiledCoreAnimation:
</span><span class="cx"> return std::make_unique<TiledCoreAnimationDrawingArea>(webPage, parameters);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosTiledCoreAnimationDrawingAreaIOSh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.h (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosTiledCoreAnimationDrawingAreaIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/ios/TiledCoreAnimationDrawingAreaIOS.mm (160030 => 160031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,165 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre>
</div>
</div>
</body>
</html>