mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-02 04:16:42 +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
126 lines
3.8 KiB
C++
126 lines
3.8 KiB
C++
// Copyright (c) 2011 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 "tests/unittests/test_suite.h"
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/logging.h"
|
|
#include "base/test/test_suite.h"
|
|
|
|
#if defined(OS_MACOSX)
|
|
#include "base/debug/stack_trace.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/i18n/icu_util.h"
|
|
#include "base/path_service.h"
|
|
#include "base/test/test_timeouts.h"
|
|
#endif
|
|
|
|
#include "tests/cefclient/client_switches.h"
|
|
|
|
CommandLine* CefTestSuite::commandline_ = NULL;
|
|
|
|
CefTestSuite::CefTestSuite(int argc, char** argv)
|
|
: TestSuite(argc, argv) {
|
|
}
|
|
|
|
// static
|
|
void CefTestSuite::InitCommandLine(int argc, const char* const* argv) {
|
|
if (commandline_) {
|
|
// If this is intentional, Reset() must be called first. If we are using
|
|
// the shared build mode, we have to share a single object across multiple
|
|
// shared libraries.
|
|
return;
|
|
}
|
|
|
|
commandline_ = new CommandLine(CommandLine::NO_PROGRAM);
|
|
#if defined(OS_WIN)
|
|
commandline_->ParseFromString(::GetCommandLineW());
|
|
#elif defined(OS_POSIX)
|
|
commandline_->InitFromArgv(argc, argv);
|
|
#endif
|
|
}
|
|
|
|
// static
|
|
void CefTestSuite::GetSettings(CefSettings& settings) {
|
|
#if defined(OS_WIN)
|
|
settings.multi_threaded_message_loop =
|
|
commandline_->HasSwitch(cefclient::kMultiThreadedMessageLoop);
|
|
#endif
|
|
|
|
CefString(&settings.cache_path) =
|
|
commandline_->GetSwitchValueASCII(cefclient::kCachePath);
|
|
|
|
// Always expose the V8 gc() function to give tests finer-grained control over
|
|
// memory management.
|
|
std::string javascript_flags = "--expose-gc";
|
|
// Value of kJavascriptFlags switch.
|
|
std::string other_javascript_flags =
|
|
commandline_->GetSwitchValueASCII("js-flags");
|
|
if (!other_javascript_flags.empty())
|
|
javascript_flags += " " + other_javascript_flags;
|
|
CefString(&settings.javascript_flags) = javascript_flags;
|
|
|
|
// Necessary for V8Test.OnUncaughtException tests.
|
|
settings.uncaught_exception_stack_size = 10;
|
|
|
|
// Necessary for the OSRTest tests.
|
|
settings.windowless_rendering_enabled = true;
|
|
}
|
|
|
|
// static
|
|
bool CefTestSuite::GetCachePath(std::string& path) {
|
|
DCHECK(commandline_);
|
|
|
|
if (commandline_->HasSwitch(cefclient::kCachePath)) {
|
|
// Set the cache_path value.
|
|
path = commandline_->GetSwitchValueASCII(cefclient::kCachePath);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
#if defined(OS_MACOSX)
|
|
void CefTestSuite::Initialize() {
|
|
// The below code is copied from base/test/test_suite.cc to avoid calling
|
|
// RegisterMockCrApp() on Mac.
|
|
|
|
base::FilePath exe;
|
|
PathService::Get(base::FILE_EXE, &exe);
|
|
|
|
// Initialize logging.
|
|
logging::LoggingSettings log_settings;
|
|
log_settings.log_file =
|
|
exe.ReplaceExtension(FILE_PATH_LITERAL("log")).value().c_str();
|
|
log_settings.logging_dest = logging::LOG_TO_ALL;
|
|
log_settings.lock_log = logging::LOCK_LOG_FILE;
|
|
log_settings.delete_old = logging::DELETE_OLD_LOG_FILE;
|
|
logging::InitLogging(log_settings);
|
|
|
|
// We want process and thread IDs because we may have multiple processes.
|
|
// Note: temporarily enabled timestamps in an effort to catch bug 6361.
|
|
logging::SetLogItems(true, true, true, true);
|
|
|
|
CHECK(base::debug::EnableInProcessStackDumping());
|
|
|
|
// In some cases, we do not want to see standard error dialogs.
|
|
if (!base::debug::BeingDebugged() &&
|
|
!CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
|
|
SuppressErrorDialogs();
|
|
base::debug::SetSuppressDebugUI(true);
|
|
logging::SetLogAssertHandler(UnitTestAssertHandler);
|
|
}
|
|
|
|
base::i18n::InitializeICU();
|
|
|
|
CatchMaybeTests();
|
|
ResetCommandLine();
|
|
|
|
TestTimeouts::Initialize();
|
|
}
|
|
#endif // defined(OS_MACOSX)
|