From 4c0ccb6768c538dd8d2b3e5d713dfc9c3f8a2835 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 18 Oct 2010 15:37:33 +0000 Subject: [PATCH] - Add createGraphicsContext3D() method which is required for WebGL support. - Add debug mode check that CefDownloadHandler objects are being cleaned up properly. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@118 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_webkit_init.h | 5 +++++ libcef_dll/libcef_dll.cc | 2 ++ libcef_dll/wrapper/libcef_dll_wrapper.cc | 2 ++ 3 files changed, 9 insertions(+) diff --git a/libcef/browser_webkit_init.h b/libcef/browser_webkit_init.h index fed57ade7..9432d6c8f 100644 --- a/libcef/browser_webkit_init.h +++ b/libcef/browser_webkit_init.h @@ -17,6 +17,7 @@ #include "webkit/extensions/v8/gears_extension.h" #include "third_party/WebKit/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" @@ -212,6 +213,10 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl { keys_out.swap(keys); } + virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() { + return WebKit::WebGraphicsContext3D::createDefault(); + } + private: webkit_glue::SimpleWebMimeRegistryImpl mime_registry_; webkit_glue::WebClipboardImpl clipboard_; diff --git a/libcef_dll/libcef_dll.cc b/libcef_dll/libcef_dll.cc index 939489bad..3f4e8cf4a 100644 --- a/libcef_dll/libcef_dll.cc +++ b/libcef_dll/libcef_dll.cc @@ -14,6 +14,7 @@ #include "cpptoc/stream_reader_cpptoc.h" #include "cpptoc/stream_writer_cpptoc.h" #include "cpptoc/v8value_cpptoc.h" +#include "ctocpp/download_handler_ctocpp.h" #include "ctocpp/handler_ctocpp.h" #include "ctocpp/read_handler_ctocpp.h" #include "ctocpp/scheme_handler_ctocpp.h" @@ -46,6 +47,7 @@ CEF_EXPORT void cef_shutdown() DCHECK(CefStreamReaderCppToC::DebugObjCt == 0); DCHECK(CefStreamWriterCppToC::DebugObjCt == 0); DCHECK(CefV8ValueCppToC::DebugObjCt == 0); + DCHECK(CefDownloadHandlerCToCpp::DebugObjCt == 0); DCHECK(CefHandlerCToCpp::DebugObjCt == 0); DCHECK(CefReadHandlerCToCpp::DebugObjCt == 0); DCHECK(CefSchemeHandlerCToCpp::DebugObjCt == 0); diff --git a/libcef_dll/wrapper/libcef_dll_wrapper.cc b/libcef_dll/wrapper/libcef_dll_wrapper.cc index f49dbcdd7..0078503d0 100644 --- a/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -6,6 +6,7 @@ #include "include/cef_capi.h" #include "include/cef_nplugin.h" #include "include/cef_nplugin_capi.h" +#include "libcef_dll/cpptoc/download_handler_cpptoc.h" #include "libcef_dll/cpptoc/handler_cpptoc.h" #include "libcef_dll/cpptoc/read_handler_cpptoc.h" #include "libcef_dll/cpptoc/scheme_handler_cpptoc.h" @@ -35,6 +36,7 @@ void CefShutdown() #ifdef _DEBUG // Check that all wrapper objects have been destroyed + DCHECK(CefDownloadHandlerCppToC::DebugObjCt == 0); DCHECK(CefHandlerCppToC::DebugObjCt == 0); DCHECK(CefReadHandlerCppToC::DebugObjCt == 0); DCHECK(CefSchemeHandlerCppToC::DebugObjCt == 0);