mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef:
- Fix ASSERT in CefBrowserImpl::UIT_GetPagesCount() when no default printer is configured (Issue #20). - Remove non-existent WebFrame objects while iterating over the bound object list in CefJSContainer::BindToJavascript(). WebFrame objects are destroyed when navigating from a page with more frames to a page with less frames. If we don't remove the non-existent frames they will remain in the list until the browser window is destroyed. - Don't call UIT_* functions from class destructors as destruction may occur on a different thread. libcef: Update due to underlying chromium changes. - Header file locations changed from third_party/WebKit/WebKit to webkit/api as a result of WebKit unforking. - Project file locations changed due to GYP now being used for WebKit builds. - Add simple_clipboard_impl.cc in the libcef directory because it has been moved from webkit/glue to test_shell. - Changes related to navigation. - New parameters added to WebViewDelegate methods. libcef_dll: Update due to underlying chromium changes. - webkit_resources.rc and webkit_strings_en-US.rc moved from grit_derived_sources to obj/global_intermediate/webkit. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@24 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -13,8 +13,8 @@
|
||||
#include "base/string_util.h"
|
||||
#include "base/win_util.h"
|
||||
#include "skia/ext/vector_canvas.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
|
||||
#include "webkit/api/public/WebRect.h"
|
||||
#include "webkit/api/public/WebSize.h"
|
||||
#include "webkit/glue/webframe.h"
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
|
||||
@@ -55,6 +55,7 @@ LRESULT CALLBACK CefBrowserImpl::WndProc(HWND hwnd, UINT message,
|
||||
// Notify the handler that the window is about to be closed
|
||||
handler->HandleBeforeWindowClose(browser);
|
||||
}
|
||||
RevokeDragDrop(browser->UIT_GetWebViewWndHandle());
|
||||
// Remove the browser from the list maintained by the context
|
||||
_Context->RemoveBrowser(browser);
|
||||
}
|
||||
@@ -632,6 +633,10 @@ int CefBrowserImpl::UIT_GetPagesCount(WebFrame* frame)
|
||||
|
||||
settings.RenderParams(¶ms);
|
||||
|
||||
// The dbi will be 0 if no default printer is configured.
|
||||
if(params.dpi == 0)
|
||||
return 0;
|
||||
|
||||
int page_count = 0;
|
||||
gfx::Size canvas_size;
|
||||
|
||||
|
Reference in New Issue
Block a user