mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
06e73fff15
- Add Views header files in a new include/views directory. - Add initial top-level window (CefWindow), control (CefBrowserView, CefLabelButton, CefMenuButton, CefPanel, CefScrollView, CefTextfield) and layout (CefBoxLayout, CefFlowLayout) support. See libcef/browser/views/view_impl.h comments for implementation details. - Add Views example usage in cefclient and cefsimple and Views unit tests in cef_unittests. Pass the `--use-views` command-line flag to cefclient, cefsimple and cef_unittests to run using the Views framework instead of platform APIs. For cefclient and cefsimple this will create the browser window and all related functionality using the Views framework. For cef_unittests this will run all tests (except OSR tests) in a Views-based browser window. Views- specific unit tests (`--gtest_filter=Views*`) will be run even if the the `--use-views` flag is not specified. - Pass the `--hide-frame` command-line flag to cefclient to demo a frameless Views-based browser window. - Pass the `--hide-controls` command-line flag to cefclient to demo a browser window without top controls. This also works in non-Views mode. - Pass the `--enable-high-dpi-support` command-line flag to cef_unittests on Windows to test high-DPI support on a display that supports it. - Add CefImage for reading/writing image file formats. - Add CefBrowser::DownloadImage() for downloading image URLs as a CefImage representation. This is primarily for loading favicons. - Add CefMenuModel::CreateMenuModel() and CefMenuModelDelegate for creating custom menus. This is primarily for use with CefMenuButton. - Add CefBrowser::TryCloseBrowser() helper for closing a browser. Also improve related documentation in cef_life_span_handler.h. - Rename cef_page_range_t to cef_range_t. It is now also used by CefTextfield. - Remove CefLifeSpanHandler::RunModal() which is never called. - Add draggable regions example to cefclient.
76 lines
2.2 KiB
C++
76 lines
2.2 KiB
C++
// Copyright 2016 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/browser/views/layout_util.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "libcef/browser/views/layout_adapter.h"
|
|
|
|
#include "ui/views/view.h"
|
|
|
|
namespace layout_util {
|
|
|
|
namespace {
|
|
|
|
// Manages the association between views::View and CefLayout instances.
|
|
class UserData : public base::SupportsUserData::Data {
|
|
public:
|
|
static CefRefPtr<CefLayout> GetFor(const views::View* view) {
|
|
UserData* data = static_cast<UserData*>(view->GetUserData(UserDataKey()));
|
|
if (data)
|
|
return data->layout_;
|
|
return nullptr;
|
|
}
|
|
|
|
// Assign ownership of the underlying views::LayoutManager to |owner_view|.
|
|
// The views::View that owns the views::LayoutManager will gain a ref-counted
|
|
// reference to the CefLayout and the CefLayout will keep an unowned reference
|
|
// to the views::LayoutManager. Destruction of the views::View will release
|
|
// the reference to the CefLayout.
|
|
static void Assign(CefRefPtr<CefLayout> cef_layout,
|
|
views::View* owner_view) {
|
|
DCHECK(owner_view);
|
|
DCHECK(cef_layout->IsValid());
|
|
|
|
views::LayoutManager* layout = CefLayoutAdapter::GetFor(cef_layout)->Get();
|
|
DCHECK(layout);
|
|
|
|
// The CefLayout previously associated with |owner_view|, if any, will be
|
|
// destroyed by this call.
|
|
owner_view->SetUserData(UserDataKey(), new UserData(cef_layout));
|
|
}
|
|
|
|
private:
|
|
explicit UserData(CefRefPtr<CefLayout> cef_layout)
|
|
: layout_(cef_layout) {
|
|
DCHECK(layout_);
|
|
}
|
|
|
|
~UserData() override {
|
|
CefLayoutAdapter::GetFor(layout_)->Detach();
|
|
}
|
|
|
|
static void* UserDataKey() {
|
|
// We just need a unique constant. Use the address of a static that
|
|
// COMDAT folding won't touch in an optimizing linker.
|
|
static int data_key = 0;
|
|
return reinterpret_cast<void*>(&data_key);
|
|
}
|
|
|
|
CefRefPtr<CefLayout> layout_;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
CefRefPtr<CefLayout> GetFor(const views::View* view) {
|
|
return UserData::GetFor(view);
|
|
}
|
|
|
|
void Assign(CefRefPtr<CefLayout> layout, views::View* owner_view) {
|
|
return UserData::Assign(layout, owner_view);
|
|
}
|
|
|
|
} // namespace layout_util
|