mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +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
138 lines
5.0 KiB
C++
138 lines
5.0 KiB
C++
// Copyright (c) 2010 Marshall A. Greenblatt. 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 name Chromium Embedded
|
|
// Framework 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.
|
|
|
|
|
|
#ifndef CEF_INCLUDE_INTERNAL_CEF_MAC_H_
|
|
#define CEF_INCLUDE_INTERNAL_CEF_MAC_H_
|
|
#pragma once
|
|
|
|
#include "include/internal/cef_types_mac.h"
|
|
#include "include/internal/cef_types_wrappers.h"
|
|
|
|
// Handle types.
|
|
#define CefCursorHandle cef_cursor_handle_t
|
|
#define CefEventHandle cef_event_handle_t
|
|
#define CefWindowHandle cef_window_handle_t
|
|
#define CefTextInputContext cef_text_input_context_t
|
|
|
|
struct CefMainArgsTraits {
|
|
typedef cef_main_args_t struct_type;
|
|
|
|
static inline void init(struct_type* s) {}
|
|
static inline void clear(struct_type* s) {}
|
|
|
|
static inline void set(const struct_type* src, struct_type* target,
|
|
bool copy) {
|
|
target->argc = src->argc;
|
|
target->argv = src->argv;
|
|
}
|
|
};
|
|
|
|
// Class representing CefExecuteProcess arguments.
|
|
class CefMainArgs : public CefStructBase<CefMainArgsTraits> {
|
|
public:
|
|
typedef CefStructBase<CefMainArgsTraits> parent;
|
|
|
|
CefMainArgs() : parent() {}
|
|
explicit CefMainArgs(const cef_main_args_t& r) : parent(r) {}
|
|
explicit CefMainArgs(const CefMainArgs& r) : parent(r) {}
|
|
CefMainArgs(int argc, char** argv) : parent() {
|
|
this->argc = argc;
|
|
this->argv = argv;
|
|
}
|
|
};
|
|
|
|
struct CefWindowInfoTraits {
|
|
typedef cef_window_info_t struct_type;
|
|
|
|
static inline void init(struct_type* s) {}
|
|
|
|
static inline void clear(struct_type* s) {
|
|
cef_string_clear(&s->window_name);
|
|
}
|
|
|
|
static inline void set(const struct_type* src, struct_type* target,
|
|
bool copy) {
|
|
cef_string_set(src->window_name.str, src->window_name.length,
|
|
&target->window_name, copy);
|
|
target->x = src->x;
|
|
target->y = src->y;
|
|
target->width = src->width;
|
|
target->height = src->height;
|
|
target->hidden = src->hidden;
|
|
target->parent_view = src->parent_view;
|
|
target->windowless_rendering_enabled = src->windowless_rendering_enabled;
|
|
target->transparent_painting_enabled = src->transparent_painting_enabled;
|
|
target->view = src->view;
|
|
}
|
|
};
|
|
|
|
// Class representing window information.
|
|
class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
|
|
public:
|
|
typedef CefStructBase<CefWindowInfoTraits> parent;
|
|
|
|
CefWindowInfo() : parent() {}
|
|
explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
|
|
explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
|
|
|
|
///
|
|
// Create the browser as a child view.
|
|
///
|
|
void SetAsChild(CefWindowHandle parent, int x, int y, int width,
|
|
int height) {
|
|
parent_view = parent;
|
|
this->x = x;
|
|
this->y = y;
|
|
this->width = width;
|
|
this->height = height;
|
|
hidden = false;
|
|
}
|
|
|
|
///
|
|
// Create the browser using windowless (off-screen) rendering. No view
|
|
// will be created for the browser and all rendering will occur via the
|
|
// CefRenderHandler interface. The |parent| value will be used to identify
|
|
// monitor info and to act as the parent view for dialogs, context menus,
|
|
// etc. If |parent| is not provided then the main screen monitor will be used
|
|
// and some functionality that requires a parent view may not function
|
|
// correctly. If |transparent| is true a transparent background color will be
|
|
// used (RGBA=0x00000000). If |transparent| is false the background will be
|
|
// white and opaque. In order to create windowless browsers the
|
|
// CefSettings.windowless_rendering_enabled value must be set to true.
|
|
///
|
|
void SetAsWindowless(CefWindowHandle parent, bool transparent) {
|
|
windowless_rendering_enabled = true;
|
|
parent_view = parent;
|
|
transparent_painting_enabled = transparent;
|
|
}
|
|
};
|
|
|
|
#endif // CEF_INCLUDE_INTERNAL_CEF_MAC_H_
|