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, 89 deletions

diff --git a/Source/WebKit/chromium/tests/CCTimerTest.cpp b/Source/WebKit/chromium/tests/CCTimerTest.cpp
deleted file mode 100644
index 852558885..000000000
--- a/Source/WebKit/chromium/tests/CCTimerTest.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2011 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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"
-
-#include "CCTimer.h"
-
-#include "CCSchedulerTestCommon.h"
-#include <gtest/gtest.h>
-
-using namespace WebCore;
-using namespace WebKitTests;
-
-namespace {
-
-class CCTimerTest : public testing::Test, public CCTimerClient {
-public:
-    CCTimerTest() : m_flag(false) { }
-
-    void onTimerFired() { m_flag = true; }
-
-protected:
-    FakeCCThread m_thread;
-    bool m_flag;
-};
-
-TEST_F(CCTimerTest, OneShot)
-{
-    CCTimer timer(&m_thread, this);
-    timer.startOneShot(0.001);
-    EXPECT_TRUE(timer.isActive());
-    m_thread.runPendingTask();
-    EXPECT_FALSE(timer.isActive());
-    EXPECT_TRUE(m_flag);
-    EXPECT_FALSE(m_thread.hasPendingTask());
-}
-
-TEST_F(CCTimerTest, StopManually)
-{
-    CCTimer timer(&m_thread, this);
-    timer.startOneShot(0.001);
-    EXPECT_TRUE(timer.isActive());
-    timer.stop();
-    EXPECT_FALSE(timer.isActive());
-
-    m_thread.runPendingTask();
-    EXPECT_FALSE(m_flag);
-    EXPECT_FALSE(m_thread.hasPendingTask());
-}
-
-TEST_F(CCTimerTest, StopByScope)
-{
-    {
-        CCTimer timer(&m_thread, this);
-        timer.startOneShot(0.001);
-    }
-
-    m_thread.runPendingTask();
-    EXPECT_FALSE(m_flag);
-}
-
-}