Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343)

New snapshot with build fixes for latest qtbase

1 files changed, 0 insertions, 153 deletions

diff --git a/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp
deleted file mode 100644
index b85149bcd..000000000
--- a/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2012 Google 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 "ScrollbarLayerChromium.h"
-
-#include "CCScrollbarAnimationController.h"
-#include "CCScrollbarLayerImpl.h"
-#include "CCSingleThreadProxy.h"
-#include "FakeWebScrollbarThemeGeometry.h"
-#include "TreeSynchronizer.h"
-#include <gtest/gtest.h>
-#include <public/WebScrollbar.h>
-#include <public/WebScrollbarThemeGeometry.h>
-#include <public/WebScrollbarThemePainter.h>
-
-using namespace WebCore;
-
-namespace {
-
-class FakeWebScrollbar : public WebKit::WebScrollbar {
-public:
-    static PassOwnPtr<FakeWebScrollbar> create() { return adoptPtr(new FakeWebScrollbar()); }
-
-    // WebScrollbar implementation
-    virtual bool isOverlay() const OVERRIDE { return false; }
-    virtual int value() const OVERRIDE { return 0; }
-    virtual WebKit::WebPoint location() const OVERRIDE { return WebKit::WebPoint(); }
-    virtual WebKit::WebSize size() const OVERRIDE { return WebKit::WebSize(); }
-    virtual bool enabled() const OVERRIDE { return true; }
-    virtual int maximum() const OVERRIDE { return 0; }
-    virtual int totalSize() const OVERRIDE { return 0; }
-    virtual bool isScrollViewScrollbar() const OVERRIDE { return false; }
-    virtual bool isScrollableAreaActive() const OVERRIDE { return true; }
-    virtual void getTickmarks(WebKit::WebVector<WebKit::WebRect>&) const OVERRIDE { }
-    virtual ScrollbarControlSize controlSize() const OVERRIDE { return WebScrollbar::RegularScrollbar; }
-    virtual ScrollbarPart pressedPart() const OVERRIDE { return WebScrollbar::NoPart; }
-    virtual ScrollbarPart hoveredPart() const OVERRIDE { return WebScrollbar::NoPart; }
-    virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const OVERRIDE { return WebScrollbar::ScrollbarOverlayStyleDefault; }
-    virtual bool isCustomScrollbar() const OVERRIDE { return false; }
-    virtual Orientation orientation() const OVERRIDE { return WebScrollbar::Horizontal; }
-    virtual bool isAlphaLocked() const OVERRIDE { return false; }
-    virtual void setIsAlphaLocked(bool) OVERRIDE { }
-};
-
-TEST(ScrollbarLayerChromiumTest, resolveScrollLayerPointer)
-{
-    DebugScopedSetImplThread impl;
-
-    WebKit::WebScrollbarThemePainter painter;
-
-    {
-        OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
-        RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create();
-        RefPtr<LayerChromium> child1 = LayerChromium::create();
-        RefPtr<LayerChromium> child2 = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), child1->id());
-        layerTreeRoot->addChild(child1);
-        layerTreeRoot->addChild(child2);
-
-        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
-
-        CCLayerImpl* ccChild1 = ccLayerTreeRoot->children()[0].get();
-        CCScrollbarLayerImpl* ccChild2 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1].get());
-
-        EXPECT_TRUE(ccChild1->scrollbarAnimationController());
-        EXPECT_EQ(ccChild1->horizontalScrollbarLayer(), ccChild2);
-    }
-
-    { // another traverse order
-        OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
-        RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create();
-        RefPtr<LayerChromium> child2 = LayerChromium::create();
-        RefPtr<LayerChromium> child1 = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), child2->id());
-        layerTreeRoot->addChild(child1);
-        layerTreeRoot->addChild(child2);
-
-        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
-
-        CCScrollbarLayerImpl* ccChild1 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[0].get());
-        CCLayerImpl* ccChild2 = ccLayerTreeRoot->children()[1].get();
-
-        EXPECT_TRUE(ccChild2->scrollbarAnimationController());
-        EXPECT_EQ(ccChild2->horizontalScrollbarLayer(), ccChild1);
-    }
-}
-
-TEST(ScrollbarLayerChromiumTest, scrollOffsetSynchronization)
-{
-    DebugScopedSetImplThread impl;
-
-    WebKit::WebScrollbarThemePainter painter;
-
-    OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
-    RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create();
-    RefPtr<LayerChromium> contentLayer = LayerChromium::create();
-    RefPtr<LayerChromium> scrollbarLayer = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), layerTreeRoot->id());
-    layerTreeRoot->addChild(contentLayer);
-    layerTreeRoot->addChild(scrollbarLayer);
-
-    layerTreeRoot->setScrollPosition(IntPoint(10, 20));
-    layerTreeRoot->setMaxScrollPosition(IntSize(30, 50));
-    contentLayer->setBounds(IntSize(100, 200));
-
-    OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
-
-    CCScrollbarLayerImpl* ccScrollbarLayer = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1].get());
-
-    EXPECT_EQ(10, ccScrollbarLayer->currentPos());
-    EXPECT_EQ(100, ccScrollbarLayer->totalSize());
-    EXPECT_EQ(30, ccScrollbarLayer->maximum());
-
-    layerTreeRoot->setScrollPosition(IntPoint(100, 200));
-    layerTreeRoot->setMaxScrollPosition(IntSize(300, 500));
-    contentLayer->setBounds(IntSize(1000, 2000));
-
-    CCScrollbarAnimationController* scrollbarController = ccLayerTreeRoot->scrollbarAnimationController();
-    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.release(), 0);
-    EXPECT_EQ(scrollbarController, ccLayerTreeRoot->scrollbarAnimationController());
-
-    EXPECT_EQ(100, ccScrollbarLayer->currentPos());
-    EXPECT_EQ(1000, ccScrollbarLayer->totalSize());
-    EXPECT_EQ(300, ccScrollbarLayer->maximum());
-
-    ccLayerTreeRoot->scrollBy(FloatSize(12, 34));
-
-    EXPECT_EQ(112, ccScrollbarLayer->currentPos());
-    EXPECT_EQ(1000, ccScrollbarLayer->totalSize());
-    EXPECT_EQ(300, ccScrollbarLayer->maximum());
-}
-
-}