mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 09:08:06 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
206 lines
6.0 KiB
C++
206 lines
6.0 KiB
C++
// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
// Include this first to avoid type conflicts with CEF headers.
|
|
#include "tests/unittests/chromium_includes.h"
|
|
|
|
#include "include/cef_runnable.h"
|
|
#include "include/cef_task.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "tests/unittests/test_handler.h"
|
|
|
|
namespace {
|
|
|
|
void GetForCurrentThread(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForCurrentThread();
|
|
EXPECT_TRUE(runner.get());
|
|
EXPECT_TRUE(runner->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner->BelongsToThread(TID_UI));
|
|
EXPECT_FALSE(runner->BelongsToThread(TID_IO));
|
|
EXPECT_TRUE(runner->IsSame(runner));
|
|
|
|
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForCurrentThread();
|
|
EXPECT_TRUE(runner2.get());
|
|
EXPECT_TRUE(runner->IsSame(runner2));
|
|
EXPECT_TRUE(runner2->IsSame(runner));
|
|
|
|
// Not on the IO thread.
|
|
CefRefPtr<CefTaskRunner> runner3 = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner3.get());
|
|
EXPECT_FALSE(runner->IsSame(runner3));
|
|
EXPECT_FALSE(runner3->IsSame(runner));
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
void GetForThread(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner.get());
|
|
EXPECT_FALSE(runner->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
|
|
EXPECT_FALSE(runner->BelongsToThread(TID_UI));
|
|
EXPECT_TRUE(runner->IsSame(runner));
|
|
|
|
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner2.get());
|
|
EXPECT_TRUE(runner->IsSame(runner2));
|
|
EXPECT_TRUE(runner2->IsSame(runner));
|
|
|
|
CefRefPtr<CefTaskRunner> runner3 = CefTaskRunner::GetForThread(TID_UI);
|
|
EXPECT_TRUE(runner3.get());
|
|
EXPECT_FALSE(runner->IsSame(runner3));
|
|
EXPECT_FALSE(runner3->IsSame(runner));
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
void PostTaskEvent1(bool* got_it, CefRefPtr<CefTaskRunner> runner) {
|
|
// Currently on the IO thread.
|
|
EXPECT_TRUE(runner->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
|
|
EXPECT_FALSE(runner->BelongsToThread(TID_UI));
|
|
|
|
// Current thread should be the IO thread.
|
|
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForCurrentThread();
|
|
EXPECT_TRUE(runner2.get());
|
|
EXPECT_TRUE(runner2->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner2->BelongsToThread(TID_IO));
|
|
EXPECT_FALSE(runner2->BelongsToThread(TID_UI));
|
|
EXPECT_TRUE(runner->IsSame(runner2));
|
|
EXPECT_TRUE(runner2->IsSame(runner));
|
|
|
|
// Current thread should be the IO thread.
|
|
CefRefPtr<CefTaskRunner> runner3 = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner3.get());
|
|
EXPECT_TRUE(runner3->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner3->BelongsToThread(TID_IO));
|
|
EXPECT_FALSE(runner3->BelongsToThread(TID_UI));
|
|
EXPECT_TRUE(runner->IsSame(runner3));
|
|
EXPECT_TRUE(runner3->IsSame(runner));
|
|
|
|
// Current thread should not be the UI thread.
|
|
CefRefPtr<CefTaskRunner> runner4 = CefTaskRunner::GetForThread(TID_UI);
|
|
EXPECT_TRUE(runner4.get());
|
|
EXPECT_FALSE(runner4->BelongsToCurrentThread());
|
|
EXPECT_FALSE(runner4->BelongsToThread(TID_IO));
|
|
EXPECT_TRUE(runner4->BelongsToThread(TID_UI));
|
|
EXPECT_FALSE(runner->IsSame(runner4));
|
|
EXPECT_FALSE(runner4->IsSame(runner));
|
|
|
|
*got_it = true;
|
|
}
|
|
|
|
void PostTask1(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner.get());
|
|
EXPECT_FALSE(runner->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
|
|
|
|
bool got_it = false;
|
|
runner->PostTask(NewCefRunnableFunction(&PostTaskEvent1, &got_it, runner));
|
|
|
|
WaitForThread(runner);
|
|
EXPECT_TRUE(got_it);
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
void PostDelayedTask1(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
|
|
EXPECT_TRUE(runner.get());
|
|
EXPECT_FALSE(runner->BelongsToCurrentThread());
|
|
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
|
|
|
|
bool got_it = false;
|
|
runner->PostDelayedTask(
|
|
NewCefRunnableFunction(&PostTaskEvent1, &got_it, runner), 0);
|
|
|
|
WaitForThread(runner);
|
|
EXPECT_TRUE(got_it);
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
void PostTaskEvent2(bool* got_it) {
|
|
EXPECT_TRUE(CefCurrentlyOn(TID_IO));
|
|
EXPECT_FALSE(CefCurrentlyOn(TID_UI));
|
|
|
|
*got_it = true;
|
|
}
|
|
|
|
void PostTask2(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
EXPECT_FALSE(CefCurrentlyOn(TID_IO));
|
|
|
|
bool got_it = false;
|
|
CefPostTask(TID_IO, NewCefRunnableFunction(&PostTaskEvent2, &got_it));
|
|
|
|
WaitForThread(TID_IO);
|
|
EXPECT_TRUE(got_it);
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
void PostDelayedTask2(bool* ran_test) {
|
|
// Currently on the UI thread.
|
|
EXPECT_FALSE(CefCurrentlyOn(TID_IO));
|
|
|
|
bool got_it = false;
|
|
CefPostDelayedTask(TID_IO,
|
|
NewCefRunnableFunction(&PostTaskEvent2, &got_it), 0);
|
|
|
|
WaitForThread(TID_IO);
|
|
EXPECT_TRUE(got_it);
|
|
|
|
*ran_test = true;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST(TaskTest, GetForCurrentThread) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&GetForCurrentThread, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|
|
|
|
TEST(TaskTest, GetForThread) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&GetForThread, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|
|
|
|
TEST(TaskTest, PostTask1) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&PostTask1, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|
|
|
|
TEST(TaskTest, PostDelayedTask1) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&PostDelayedTask1, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|
|
|
|
TEST(TaskTest, PostTask2) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&PostTask2, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|
|
|
|
TEST(TaskTest, PostDelayedTask2) {
|
|
bool ran_test = false;
|
|
CefPostTask(TID_UI, NewCefRunnableFunction(&PostDelayedTask2, &ran_test));
|
|
WaitForThread(TID_UI);
|
|
EXPECT_TRUE(ran_test);
|
|
}
|