Remove a file that was supposed to be removed in r158096
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jul 2015 05:59:46 +0000 (05:59 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jul 2015 05:59:46 +0000 (05:59 +0000)
* platform/graphics/mac/WebTiledLayer.h: Removed.
* platform/graphics/mac/WebTiledLayer.mm: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187384 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/mac/WebTiledLayer.h [deleted file]
Source/WebCore/platform/graphics/mac/WebTiledLayer.mm [deleted file]

index 45c6082..8277832 100644 (file)
@@ -1,3 +1,10 @@
+2015-07-24  Tim Horton  <timothy_horton@apple.com>
+
+        Remove a file that was supposed to be removed in r158096
+
+        * platform/graphics/mac/WebTiledLayer.h: Removed.
+        * platform/graphics/mac/WebTiledLayer.mm: Removed.
+
 2015-07-24  Jinwoo Song  <jinwoo7.song@samsung.com>
 
         [EFL] Build fix in ProtectionSpaceBase.cpp
diff --git a/Source/WebCore/platform/graphics/mac/WebTiledLayer.h b/Source/WebCore/platform/graphics/mac/WebTiledLayer.h
deleted file mode 100644 (file)
index ddef049..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009 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. ``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
- * 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 WebTiledLayer_h
-#define WebTiledLayer_h
-
-#import "WebLayer.h"
-
-@interface WebTiledLayer : CATiledLayer 
-{
-}
-
-// implements WebLayerAdditions
-
-@end
-
-#endif // WebTiledLayer_h
-
diff --git a/Source/WebCore/platform/graphics/mac/WebTiledLayer.mm b/Source/WebCore/platform/graphics/mac/WebTiledLayer.mm
deleted file mode 100644 (file)
index 4d5d1ca..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2009 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. ``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
- * 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"
-#import "WebTiledLayer.h"
-
-#import "GraphicsContext.h"
-#import "GraphicsLayerCA.h"
-#import "PlatformCALayer.h"
-
-#if PLATFORM(IOS)
-#import "WebCoreThread.h"
-#import "WebCoreThreadRun.h"
-#endif
-
-using namespace WebCore;
-
-@implementation WebTiledLayer
-
-// Set a zero duration for the fade in of tiles
-+ (CFTimeInterval)fadeDuration
-{
-    return 0;
-}
-
-// Make sure that tiles are drawn on the main thread
-+ (BOOL)shouldDrawOnMainThread
-{
-#if PLATFORM(IOS)
-    // FIXME: WebKit2 always wants to draw on the main thread, but there is
-    // probably a better way to check for WebKit2 than using the existance of
-    // the web thread as a proxy.
-    return !WebThreadIsEnabled();
-#else
-    return YES;
-#endif
-}
-
-+ (unsigned int)prefetchedTiles
-{
-    return 2;
-}
-
-// Disable default animations
-- (id<CAAction>)actionForKey:(NSString *)key
-{
-    UNUSED_PARAM(key);
-    return nil;
-}
-
-- (void)setNeedsDisplay
-{
-    PlatformCALayer* layer = PlatformCALayer::platformCALayer(self);
-    if (layer && layer->owner() && layer->owner()->platformCALayerDrawsContent())
-        [super setNeedsDisplay];
-}
-
-- (void)setNeedsDisplayInRect:(CGRect)dirtyRect
-{
-    PlatformCALayer* platformLayer = PlatformCALayer::platformCALayer(self);
-    if (!platformLayer) {
-        [super setNeedsDisplayInRect:dirtyRect];
-        return;
-    }
-
-    if (PlatformCALayerClient* layerOwner = platformLayer->owner()) {
-        if (layerOwner->platformCALayerDrawsContent()) {
-            if (layerOwner->platformCALayerContentsOrientation() == WebCore::GraphicsLayer::CompositingCoordinatesBottomUp)
-                dirtyRect.origin.y = [self bounds].size.height - dirtyRect.origin.y - dirtyRect.size.height;
-
-            [super setNeedsDisplayInRect:dirtyRect];
-
-            if (layerOwner->platformCALayerShowRepaintCounter(platformLayer)) {
-                CGRect bounds = [self bounds];
-                CGRect indicatorRect = CGRectMake(bounds.origin.x, bounds.origin.y, 52, 27);
-                if (layerOwner->platformCALayerContentsOrientation() == WebCore::GraphicsLayer::CompositingCoordinatesBottomUp)
-                    indicatorRect.origin.y = [self bounds].size.height - indicatorRect.origin.y - indicatorRect.size.height;
-
-                [super setNeedsDisplayInRect:indicatorRect];
-            }
-        }
-    }
-}
-
-- (void)display
-{
-    [super display];
-#if PLATFORM(IOS)
-    // CATiledLayer never calls display on a background thread, so it's safe
-    // to assume we're either on the main thread or on the web thread.
-    if (pthread_main_np())
-        WebThreadLock();
-    ASSERT(WebThreadIsLockedOrDisabled());
-#endif
-    PlatformCALayer* layer = PlatformCALayer::platformCALayer(self);
-    if (layer && layer->owner())
-        layer->owner()->platformCALayerLayerDidDisplay(self);
-}
-
-- (void)drawInContext:(CGContextRef)context
-{
-#if PLATFORM(IOS)
-    void (^draw)() = ^{
-#endif
-    PlatformCALayer* layer = PlatformCALayer::platformCALayer(self);
-    if (layer)
-        drawLayerContents(context, layer);
-#if PLATFORM(IOS)
-    };
-    if (pthread_main_np()) {
-        WebThreadLock();
-        draw();
-    } else
-        WebThreadRunSync(draw);
-#endif
-}
-
-@end // implementation WebTiledLayer