bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 66afc5e5 (#540276)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-03-20 16:15:08 -04:00
parent 4fb6e1ba29
commit 7a59914f97
128 changed files with 1921 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
tests/ceftests/task_unittest.cc
View File

@@ -3,6 +3,7 @@
// can be found in the LICENSE file.
#include "include/base/cef_bind.h"
#include "include/cef_command_line.h"
#include "include/cef_task.h"
#include "include/wrapper/cef_closure_task.h"
#include "tests/ceftests/test_handler.h"
@@ -10,13 +11,22 @@
namespace {
void GetForCurrentThread(bool* ran_test) {
void WaitForEvent(CefRefPtr<CefWaitableEvent> event) {
if (CefCommandLine::GetGlobalCommandLine()->HasSwitch(
"disable-test-timeout")) {
event->Wait();
} else {
EXPECT_TRUE(event->TimedWait(1000));
}
}
void GetForCurrentThread(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForCurrentThread();
EXPECT_TRUE(runner.get());
EXPECT_TRUE(runner->BelongsToCurrentThread());
EXPECT_TRUE(runner->BelongsToThread(TID_FILE));
EXPECT_FALSE(runner->BelongsToThread(TID_DB));
EXPECT_FALSE(runner->BelongsToThread(TID_IO));
EXPECT_TRUE(runner->IsSame(runner));
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForCurrentThread();
@@ -24,25 +34,26 @@ void GetForCurrentThread(bool* ran_test) {
EXPECT_TRUE(runner->IsSame(runner2));
EXPECT_TRUE(runner2->IsSame(runner));
// Not on the DB thread.
CefRefPtr<CefTaskRunner> runner3 = CefTaskRunner::GetForThread(TID_DB);
// 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;
event->Signal();
}
void GetForThread(bool* ran_test) {
void GetForThread(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_DB);
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
EXPECT_TRUE(runner.get());
EXPECT_FALSE(runner->BelongsToCurrentThread());
EXPECT_TRUE(runner->BelongsToThread(TID_DB));
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
EXPECT_FALSE(runner->BelongsToThread(TID_FILE));
EXPECT_TRUE(runner->IsSame(runner));
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForThread(TID_DB);
CefRefPtr<CefTaskRunner> runner2 = CefTaskRunner::GetForThread(TID_IO);
EXPECT_TRUE(runner2.get());
EXPECT_TRUE(runner->IsSame(runner2));
EXPECT_TRUE(runner2->IsSame(runner));
@@ -53,28 +64,31 @@ void GetForThread(bool* ran_test) {
EXPECT_FALSE(runner3->IsSame(runner));
*ran_test = true;
event->Signal();
}
void PostTaskEvent1(bool* got_it, CefRefPtr<CefTaskRunner> runner) {
// Currently on the DB thread.
void PostTaskEvent1(bool* ran_test,
CefRefPtr<CefWaitableEvent> event,
CefRefPtr<CefTaskRunner> runner) {
// Currently on the IO thread.
EXPECT_TRUE(runner->BelongsToCurrentThread());
EXPECT_TRUE(runner->BelongsToThread(TID_DB));
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
EXPECT_FALSE(runner->BelongsToThread(TID_FILE));
// Current thread should be the DB thread.
// 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_DB));
EXPECT_TRUE(runner2->BelongsToThread(TID_IO));
EXPECT_FALSE(runner2->BelongsToThread(TID_FILE));
EXPECT_TRUE(runner->IsSame(runner2));
EXPECT_TRUE(runner2->IsSame(runner));
// Current thread should be the DB thread.
CefRefPtr<CefTaskRunner> runner3 = CefTaskRunner::GetForThread(TID_DB);
// 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_DB));
EXPECT_TRUE(runner3->BelongsToThread(TID_IO));
EXPECT_FALSE(runner3->BelongsToThread(TID_FILE));
EXPECT_TRUE(runner->IsSame(runner3));
EXPECT_TRUE(runner3->IsSame(runner));
@@ -83,129 +97,121 @@ void PostTaskEvent1(bool* got_it, CefRefPtr<CefTaskRunner> runner) {
CefRefPtr<CefTaskRunner> runner4 = CefTaskRunner::GetForThread(TID_FILE);
EXPECT_TRUE(runner4.get());
EXPECT_FALSE(runner4->BelongsToCurrentThread());
EXPECT_FALSE(runner4->BelongsToThread(TID_DB));
EXPECT_FALSE(runner4->BelongsToThread(TID_IO));
EXPECT_TRUE(runner4->BelongsToThread(TID_FILE));
EXPECT_FALSE(runner->IsSame(runner4));
EXPECT_FALSE(runner4->IsSame(runner));
*got_it = true;
*ran_test = true;
event->Signal();
}
void PostTask1(bool* ran_test) {
void PostTask1(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_DB);
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
EXPECT_TRUE(runner.get());
EXPECT_FALSE(runner->BelongsToCurrentThread());
EXPECT_TRUE(runner->BelongsToThread(TID_DB));
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
bool got_it = false;
runner->PostTask(
CefCreateClosureTask(base::Bind(&PostTaskEvent1, &got_it, runner)));
WaitForThread(runner);
EXPECT_TRUE(got_it);
*ran_test = true;
runner->PostTask(CefCreateClosureTask(
base::Bind(&PostTaskEvent1, ran_test, event, runner)));
}
void PostDelayedTask1(bool* ran_test) {
void PostDelayedTask1(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_DB);
CefRefPtr<CefTaskRunner> runner = CefTaskRunner::GetForThread(TID_IO);
EXPECT_TRUE(runner.get());
EXPECT_FALSE(runner->BelongsToCurrentThread());
EXPECT_TRUE(runner->BelongsToThread(TID_DB));
EXPECT_TRUE(runner->BelongsToThread(TID_IO));
bool got_it = false;
runner->PostDelayedTask(
CefCreateClosureTask(base::Bind(&PostTaskEvent1, &got_it, runner)), 0);
WaitForThread(runner);
EXPECT_TRUE(got_it);
*ran_test = true;
runner->PostDelayedTask(CefCreateClosureTask(base::Bind(
&PostTaskEvent1, ran_test, event, runner)),
0);
}
void PostTaskEvent2(bool* got_it) {
EXPECT_TRUE(CefCurrentlyOn(TID_DB));
void PostTaskEvent2(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
EXPECT_TRUE(CefCurrentlyOn(TID_IO));
EXPECT_FALSE(CefCurrentlyOn(TID_FILE));
*got_it = true;
}
void PostTask2(bool* ran_test) {
// Currently on the FILE thread.
EXPECT_FALSE(CefCurrentlyOn(TID_DB));
bool got_it = false;
CefPostTask(TID_DB,
CefCreateClosureTask(base::Bind(&PostTaskEvent2, &got_it)));
WaitForThread(TID_DB);
EXPECT_TRUE(got_it);
*ran_test = true;
event->Signal();
}
void PostDelayedTask2(bool* ran_test) {
void PostTask2(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
EXPECT_FALSE(CefCurrentlyOn(TID_DB));
EXPECT_FALSE(CefCurrentlyOn(TID_IO));
CefPostTask(TID_IO, CefCreateClosureTask(
base::Bind(&PostTaskEvent2, ran_test, event)));
}
void PostDelayedTask2(bool* ran_test, CefRefPtr<CefWaitableEvent> event) {
// Currently on the FILE thread.
EXPECT_FALSE(CefCurrentlyOn(TID_IO));
bool got_it = false;
CefPostDelayedTask(
TID_DB, CefCreateClosureTask(base::Bind(&PostTaskEvent2, &got_it)), 0);
WaitForThread(TID_DB);
EXPECT_TRUE(got_it);
*ran_test = true;
TID_IO,
CefCreateClosureTask(base::Bind(&PostTaskEvent2, ran_test, event)), 0);
}
} // namespace
TEST(TaskTest, GetForCurrentThread) {
bool ran_test = false;
CefPostTask(TID_FILE, CefCreateClosureTask(
base::Bind(&GetForCurrentThread, &ran_test)));
WaitForThread(TID_FILE);
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE, CefCreateClosureTask(base::Bind(&GetForCurrentThread,
&ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}
TEST(TaskTest, GetForThread) {
bool ran_test = false;
CefPostTask(TID_FILE,
CefCreateClosureTask(base::Bind(&GetForThread, &ran_test)));
WaitForThread(TID_FILE);
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE, CefCreateClosureTask(
base::Bind(&GetForThread, &ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}
TEST(TaskTest, PostTask1) {
bool ran_test = false;
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE,
CefCreateClosureTask(base::Bind(&PostTask1, &ran_test)));
WaitForThread(TID_FILE);
CefCreateClosureTask(base::Bind(&PostTask1, &ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}
TEST(TaskTest, PostDelayedTask1) {
bool ran_test = false;
CefPostTask(TID_FILE,
CefCreateClosureTask(base::Bind(&PostDelayedTask1, &ran_test)));
WaitForThread(TID_FILE);
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE, CefCreateClosureTask(
base::Bind(&PostDelayedTask1, &ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}
TEST(TaskTest, PostTask2) {
bool ran_test = false;
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE,
CefCreateClosureTask(base::Bind(&PostTask2, &ran_test)));
WaitForThread(TID_FILE);
CefCreateClosureTask(base::Bind(&PostTask2, &ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}
TEST(TaskTest, PostDelayedTask2) {
bool ran_test = false;
CefPostTask(TID_FILE,
CefCreateClosureTask(base::Bind(&PostDelayedTask2, &ran_test)));
WaitForThread(TID_FILE);
CefRefPtr<CefWaitableEvent> event =
CefWaitableEvent::CreateWaitableEvent(true, false);
CefPostTask(TID_FILE, CefCreateClosureTask(
base::Bind(&PostDelayedTask2, &ran_test, event)));
WaitForEvent(event);
EXPECT_TRUE(ran_test);
}