mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-10 17:23:26 +01:00
dea4daffd7
This implementation supports both GPU compositing and software compositing (used when GPU is not supported or when passing `--disable-gpu --disable-gpu-compositing` command-line flags). GPU-accelerated features (WebGL and 3D CSS) that did not work with the previous off-screen rendering implementation do work with this implementation when GPU support is available. Rendering now operates on a per-frame basis. The frame rate is configurable via CefBrowserSettings.windowless_frame_rate up to a maximum of 60fps (potentially limited by how fast the system can generate new frames). CEF generates a bitmap from the compositor backing and passes it to CefRenderHandler::OnPaint. The previous CefRenderHandler/CefBrowserHost API for off-screen rendering has been restored mostly as-is with some minor changes: - CefBrowserHost::Invalidate no longer accepts a CefRect region argument. Instead of invalidating a specific region it now triggers generation of a new frame. - The |dirtyRects| argument to CefRenderHandler::OnPaint will now always be a single CefRect representing the whole view (frame) size. Previously, invalidated regions were listed separately. - Linux: CefBrowserHost::SendKeyEvent now expects X11 event information instead of GTK event information. See cefclient for an example of converting GTK events to the necessary format. - Sizes passed to the CefRenderHandler OnPaint and OnPopupSize methods are now already DPI scaled. Previously, the client had to perform DPI scaling. - Includes drag&drop implementation from issue #1032. - Includes unit test fixes from issue #1245. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1751 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
93 lines
2.5 KiB
C++
93 lines
2.5 KiB
C++
// Copyright (c) 2013 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 "cefclient/resource_util.h"
|
|
#include "include/cef_stream.h"
|
|
#include "include/wrapper/cef_byte_read_handler.h"
|
|
#include "cefclient/resource.h"
|
|
#include "cefclient/util.h"
|
|
|
|
namespace {
|
|
|
|
bool LoadBinaryResource(int binaryId, DWORD &dwSize, LPBYTE &pBytes) {
|
|
HINSTANCE hInst = GetModuleHandle(NULL);
|
|
HRSRC hRes = FindResource(hInst, MAKEINTRESOURCE(binaryId),
|
|
MAKEINTRESOURCE(256));
|
|
if (hRes) {
|
|
HGLOBAL hGlob = LoadResource(hInst, hRes);
|
|
if (hGlob) {
|
|
dwSize = SizeofResource(hInst, hRes);
|
|
pBytes = (LPBYTE)LockResource(hGlob);
|
|
if (dwSize > 0 && pBytes)
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
int GetResourceId(const char* resource_name) {
|
|
// Map of resource labels to BINARY id values.
|
|
static struct _resource_map {
|
|
char* name;
|
|
int id;
|
|
} resource_map[] = {
|
|
{"binding.html", IDS_BINDING},
|
|
{"dialogs.html", IDS_DIALOGS},
|
|
{"domaccess.html", IDS_DOMACCESS},
|
|
{"localstorage.html", IDS_LOCALSTORAGE},
|
|
{"logo.png", IDS_LOGO},
|
|
{"osr_test.html", IDS_OSRTEST},
|
|
{"other_tests.html", IDS_OTHER_TESTS},
|
|
{"performance.html", IDS_PERFORMANCE},
|
|
{"performance2.html", IDS_PERFORMANCE2},
|
|
{"transparency.html", IDS_TRANSPARENCY},
|
|
{"window.html", IDS_WINDOW},
|
|
{"xmlhttprequest.html", IDS_XMLHTTPREQUEST},
|
|
};
|
|
|
|
for (int i = 0; i < sizeof(resource_map)/sizeof(_resource_map); ++i) {
|
|
if (!strcmp(resource_map[i].name, resource_name))
|
|
return resource_map[i].id;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
bool LoadBinaryResource(const char* resource_name, std::string& resource_data) {
|
|
int resource_id = GetResourceId(resource_name);
|
|
if (resource_id == 0)
|
|
return false;
|
|
|
|
DWORD dwSize;
|
|
LPBYTE pBytes;
|
|
|
|
if (LoadBinaryResource(resource_id, dwSize, pBytes)) {
|
|
resource_data = std::string(reinterpret_cast<char*>(pBytes), dwSize);
|
|
return true;
|
|
}
|
|
|
|
ASSERT(FALSE); // The resource should be found.
|
|
return false;
|
|
}
|
|
|
|
CefRefPtr<CefStreamReader> GetBinaryResourceReader(const char* resource_name) {
|
|
int resource_id = GetResourceId(resource_name);
|
|
if (resource_id == 0)
|
|
return NULL;
|
|
|
|
DWORD dwSize;
|
|
LPBYTE pBytes;
|
|
|
|
if (LoadBinaryResource(resource_id, dwSize, pBytes)) {
|
|
return CefStreamReader::CreateForHandler(
|
|
new CefByteReadHandler(pBytes, dwSize, NULL));
|
|
}
|
|
|
|
ASSERT(FALSE); // The resource should be found.
|
|
return NULL;
|
|
}
|