mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02: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
68 lines
1.7 KiB
C++
68 lines
1.7 KiB
C++
// Copyright (c) 2012 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 "libcef/common/scheme_registrar_impl.h"
|
|
|
|
#include <string>
|
|
|
|
#include "libcef/common/content_client.h"
|
|
|
|
#include "base/bind.h"
|
|
#include "base/logging.h"
|
|
|
|
CefSchemeRegistrarImpl::CefSchemeRegistrarImpl()
|
|
: supported_thread_id_(base::PlatformThread::CurrentId()) {
|
|
}
|
|
|
|
bool CefSchemeRegistrarImpl::AddCustomScheme(
|
|
const CefString& scheme_name,
|
|
bool is_standard,
|
|
bool is_local,
|
|
bool is_display_isolated) {
|
|
if (!VerifyContext())
|
|
return false;
|
|
|
|
const std::string& scheme = scheme_name;
|
|
|
|
if (is_standard)
|
|
standard_schemes_.push_back(scheme);
|
|
|
|
CefContentClient::SchemeInfo scheme_info = {
|
|
scheme, is_standard, is_local, is_display_isolated};
|
|
CefContentClient::Get()->AddCustomScheme(scheme_info);
|
|
|
|
return true;
|
|
}
|
|
|
|
void CefSchemeRegistrarImpl::GetStandardSchemes(
|
|
std::vector<std::string>* standard_schemes) {
|
|
if (!VerifyContext())
|
|
return;
|
|
|
|
if (standard_schemes_.empty())
|
|
return;
|
|
|
|
standard_schemes->insert(standard_schemes->end(), standard_schemes_.begin(),
|
|
standard_schemes_.end());
|
|
}
|
|
|
|
bool CefSchemeRegistrarImpl::VerifyRefCount() {
|
|
return HasOneRef();
|
|
}
|
|
|
|
void CefSchemeRegistrarImpl::Detach() {
|
|
if (VerifyContext())
|
|
supported_thread_id_ = base::kInvalidThreadId;
|
|
}
|
|
|
|
bool CefSchemeRegistrarImpl::VerifyContext() {
|
|
if (base::PlatformThread::CurrentId() != supported_thread_id_) {
|
|
// This object should only be accessed from the thread that created it.
|
|
NOTREACHED();
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|