mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Add WebKit-based printing support. - Add re-sizable text area support. - In release build, only log error messages and above. - Modify cef.sln to point at new file locations for dynamically generated project files. - More webkit_glue and webkit_init reorganization. - Movement towards using Web* basic types. - Include WebKit headers using the full path. - Add app cache support in ResourceLoaderBridge. - Method/member changes in WebViewDelegate. - Simplify code in PrintSettings. - Remove the WM_DESTROY and WM_NCDESTROY cases in WebWidgetHost::WndProc() to avoid a crash when closing a browser window via a DestroyWindow() call on a parent window. libcef_dll: - Add webkit_resources.rc and webkit_strings_en-US.rc to the project in order to support localized strings. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@23 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -9,8 +9,14 @@
|
||||
#include "request_impl.h"
|
||||
|
||||
#include "base/string_util.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
|
||||
#include "webkit/glue/webframe.h"
|
||||
#include "webkit/glue/webscriptsource.h"
|
||||
|
||||
using WebKit::WebScriptSource;
|
||||
using WebKit::WebString;
|
||||
using WebKit::WebURL;
|
||||
|
||||
|
||||
CefBrowserImpl::CefBrowserImpl(CefWindowInfo& windowInfo, bool popup,
|
||||
@ -22,20 +28,12 @@ CefBrowserImpl::CefBrowserImpl(CefWindowInfo& windowInfo, bool popup,
|
||||
{
|
||||
delegate_ = new BrowserWebViewDelegate(this);
|
||||
nav_controller_.reset(new BrowserNavigationController(this));
|
||||
|
||||
#if defined(OS_WIN)
|
||||
webview_bitmap_size_.cx = webview_bitmap_size_.cy = 0;
|
||||
webview_bitmap_ = NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
CefBrowserImpl::~CefBrowserImpl()
|
||||
{
|
||||
#if defined(OS_WIN)
|
||||
if(webview_bitmap_ != NULL)
|
||||
DeleteObject(webview_bitmap_);
|
||||
#endif
|
||||
RemoveAllJSHandlers();
|
||||
UIT_GetWebView()->SetDelegate(NULL);
|
||||
}
|
||||
|
||||
void CefBrowserImpl::GoBack()
|
||||
@ -454,8 +452,8 @@ void CefBrowserImpl::UIT_ExecuteJavaScript(const std::wstring& js_code,
|
||||
frame = UIT_GetWebView()->GetMainFrame();
|
||||
|
||||
frame->ExecuteScript(
|
||||
webkit_glue::WebScriptSource(WideToUTF8(js_code), GURL(script_url),
|
||||
start_line));
|
||||
WebScriptSource(WebString(js_code), WebURL(GURL(script_url)),
|
||||
start_line));
|
||||
}
|
||||
|
||||
void CefBrowserImpl::UIT_GoBackOrForward(int offset)
|
||||
|
Reference in New Issue
Block a user