mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Fix problem displaying select lists due to ordering of focus events in WebWidgetHost::MouseEvent() (issue #17). - Add new BrowserWebKitInit class and related webkit_glue changes. - Add webkit_glue::InitializeTextEncoding() function called from the main thread in CefContext::Initialize() to avoid an assert in third_party\WebKit\WebCore\platform\text\TextEncodingRegistry.cpp buildBaseTextCodecMaps(). - V8NPObject::v8_object member renamed to V8NPObject::v8Object. - Add WebKit project dependency. libcef_dll: - Fix crash when creating a popup window due to not duplicating the m_windowName member in cpptoc\handler_cpptoc.cc handler_handle_before_created(). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@17 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "webkit_version.h"
|
||||
MSVC_PUSH_WARNING_LEVEL(0);
|
||||
#include "Markup.h"
|
||||
#include "TextEncoding.h"
|
||||
#include "webkit/glue/webframe_impl.h"
|
||||
MSVC_POP_WARNING();
|
||||
|
||||
@@ -22,11 +23,12 @@ MSVC_POP_WARNING();
|
||||
#include "base/win_util.h"
|
||||
#include "net/base/mime_util.h"
|
||||
#include "webkit/glue/glue_util.h"
|
||||
#include "webkit/glue/screen_info.h"
|
||||
#include "webkit/glue/webframe.h"
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
|
||||
// Generated by GRIT
|
||||
#include "webkit_resources.h"
|
||||
#include "grit/webkit_resources.h"
|
||||
|
||||
namespace webkit_glue {
|
||||
|
||||
@@ -34,28 +36,12 @@ bool IsMediaPlayerAvailable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void PrefetchDns(const std::string& hostname) {}
|
||||
|
||||
void PrecacheUrl(const char16* url, int url_length) {}
|
||||
|
||||
void AppendToLog(const char* file, int line, const char* msg) {
|
||||
logging::LogMessage(file, line).stream() << msg;
|
||||
}
|
||||
|
||||
bool GetMimeTypeFromExtension(const std::wstring &ext, std::string *mime_type) {
|
||||
return net::GetMimeTypeFromExtension(ext, mime_type);
|
||||
}
|
||||
|
||||
bool GetMimeTypeFromFile(const std::wstring &file_path,
|
||||
std::string *mime_type) {
|
||||
return net::GetMimeTypeFromFile(file_path, mime_type);
|
||||
}
|
||||
|
||||
bool GetPreferredExtensionForMimeType(const std::string& mime_type,
|
||||
std::wstring* ext) {
|
||||
return net::GetPreferredExtensionForMimeType(mime_type, ext);
|
||||
}
|
||||
|
||||
std::string GetDataResource(int resource_id) {
|
||||
if (resource_id == IDR_BROKENIMAGE) {
|
||||
// Use webkit's broken image icon (16x16)
|
||||
@@ -176,4 +162,8 @@ ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
|
||||
return GetScreenInfoHelper(gfx::NativeViewFromId(window));
|
||||
}
|
||||
|
||||
void InitializeTextEncoding() {
|
||||
WebCore::UTF8Encoding();
|
||||
}
|
||||
|
||||
} // namespace webkit_glue
|
||||
|
Reference in New Issue
Block a user