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:
@@ -9,7 +9,6 @@
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "net/base/upload_data.h"
|
||||
#include "webkit/glue/webhistoryitem.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// BrowserNavigationEntry
|
||||
@@ -38,24 +37,9 @@ BrowserNavigationEntry::~BrowserNavigationEntry() {
|
||||
}
|
||||
|
||||
void BrowserNavigationEntry::SetContentState(const std::string& state) {
|
||||
cached_history_item_ = NULL; // invalidate our cached item
|
||||
state_ = state;
|
||||
}
|
||||
|
||||
WebHistoryItem* BrowserNavigationEntry::GetHistoryItem() const {
|
||||
// TODO(port): temporary hack to get a basic test shell executable going.
|
||||
#if !defined(OS_LINUX)
|
||||
if (!cached_history_item_) {
|
||||
BrowserExtraRequestData* extra_data =
|
||||
new BrowserExtraRequestData(GetPageID());
|
||||
cached_history_item_ =
|
||||
WebHistoryItem::Create(GetURL(), GetTitle(), GetContentState(),
|
||||
extra_data);
|
||||
}
|
||||
#endif
|
||||
return cached_history_item_;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// BrowserNavigationController
|
||||
|
||||
@@ -141,9 +125,8 @@ int BrowserNavigationController::GetCurrentEntryIndex() const {
|
||||
}
|
||||
|
||||
|
||||
BrowserNavigationEntry* BrowserNavigationController::GetEntryAtOffset(
|
||||
int offset) const {
|
||||
int index = last_committed_entry_index_ + offset;
|
||||
BrowserNavigationEntry* BrowserNavigationController::GetEntryAtIndex(
|
||||
int index) const {
|
||||
if (index < 0 || index >= GetEntryCount())
|
||||
return NULL;
|
||||
|
||||
|
Reference in New Issue
Block a user