| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2011 Google Inc. All rights reserved. |    2  * Copyright (C) 2011 Google Inc. All rights reserved. | 
|    3  * |    3  * | 
|    4  * Redistribution and use in source and binary forms, with or without |    4  * Redistribution and use in source and binary forms, with or without | 
|    5  * modification, are permitted provided that the following conditions |    5  * modification, are permitted provided that the following conditions | 
|    6  * are met: |    6  * are met: | 
|    7  * 1.  Redistributions of source code must retain the above copyright |    7  * 1.  Redistributions of source code must retain the above copyright | 
|    8  *     notice, this list of conditions and the following disclaimer. |    8  *     notice, this list of conditions and the following disclaimer. | 
|    9  * 2.  Redistributions in binary form must reproduce the above copyright |    9  * 2.  Redistributions in binary form must reproduce the above copyright | 
|   10  *     notice, this list of conditions and the following disclaimer in the |   10  *     notice, this list of conditions and the following disclaimer in the | 
|   11  *     documentation and/or other materials provided with the distribution. |   11  *     documentation and/or other materials provided with the distribution. | 
|   12  * |   12  * | 
|   13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
     Y |   13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
     Y | 
|   14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |   14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 
|   15  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |   15  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
|   16  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
     Y |   16  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
     Y | 
|   17  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |   17  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 
|   18  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |   18  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 
|   19  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
     N |   19  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
     N | 
|   20  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   20  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   21  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |   21  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 
|   22  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   22  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   23  */ |   23  */ | 
|   24  |   24  | 
|   25 #include "config.h" |   25 #include "config.h" | 
|   26  |   26  | 
|   27 #include <gtest/gtest.h> |   27 #include <gtest/gtest.h> | 
|   28 #include "NativeImageSkia.h" |  | 
|   29 #include "core/platform/graphics/GraphicsLayer.h" |   28 #include "core/platform/graphics/GraphicsLayer.h" | 
|   30 #include "core/platform/graphics/Image.h" |   29 #include "core/platform/graphics/Image.h" | 
|   31 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" |   30 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" | 
 |   31 #include "core/platform/graphics/skia/NativeImageSkia.h" | 
|   32 #include <public/WebImageLayer.h> |   32 #include <public/WebImageLayer.h> | 
|   33 #include <wtf/PassOwnPtr.h> |   33 #include <wtf/PassOwnPtr.h> | 
|   34  |   34  | 
|   35 using namespace WebCore; |   35 using namespace WebCore; | 
|   36  |   36  | 
|   37 namespace { |   37 namespace { | 
|   38  |   38  | 
|   39 class MockGraphicsLayerClient : public GraphicsLayerClient { |   39 class MockGraphicsLayerClient : public GraphicsLayerClient { | 
|   40   public: |   40   public: | 
|   41     virtual void notifyAnimationStarted(const GraphicsLayer*, double time) { } |   41     virtual void notifyAnimationStarted(const GraphicsLayer*, double time) { } | 
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  121     ASSERT_FALSE(graphicsLayer->contentsLayer()); |  121     ASSERT_FALSE(graphicsLayer->contentsLayer()); | 
|  122  |  122  | 
|  123     graphicsLayer->setContentsToImage(opaqueImage.get()); |  123     graphicsLayer->setContentsToImage(opaqueImage.get()); | 
|  124     ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque()); |  124     ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque()); | 
|  125  |  125  | 
|  126     graphicsLayer->setContentsToImage(nonOpaqueImage.get()); |  126     graphicsLayer->setContentsToImage(nonOpaqueImage.get()); | 
|  127     ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque()); |  127     ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque()); | 
|  128 } |  128 } | 
|  129  |  129  | 
|  130 } // namespace |  130 } // namespace | 
| OLD | NEW |