bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision cb947c01 (#352221)

Browse Source 
- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle
  instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest
  object passed to OnBeforeBrowse will no longer have an associated request
  identifier.
- Mac: Remove additional helper apps which are no longer required (see
  http://crbug.com/520680)
- Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see
  http://crbug.com/517114)
- Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and
  NPAPI plugins are no longer supported (see http://crbug.com/470301#c11)
- Add CefFormatUrlForSecurityDisplay function in cef_parser.h
- Fix crash when passing `--disable-extensions` command-line flag (issue #1721)
- Linux: Fix NSS handler loading (issue #1727)
This commit is contained in:
Marshall Greenblatt
2015-10-09 11:23:12 -04:00
parent 5780ea8baa
commit 8aac23386e
104 changed files with 938 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser/frame_host_impl.cc
View File

@ -121,7 +121,7 @@ void CefFrameHostImpl::LoadRequest(CefRefPtr<CefRequest> request) {
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser.get())
if (browser.get() && frame_id != kInvalidFrameId)
browser->LoadRequest(frame_id, request);
}
@ -135,7 +135,7 @@ void CefFrameHostImpl::LoadURL(const CefString& url) {
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser.get()) {
if (browser.get() && frame_id != kInvalidFrameId) {
browser->LoadURL(frame_id, url, content::Referrer(),
ui::PAGE_TRANSITION_TYPED, std::string());
}
@ -152,7 +152,7 @@ void CefFrameHostImpl::LoadString(const CefString& string,
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser.get())
if (browser.get() && frame_id != kInvalidFrameId)
browser->LoadString(frame_id, string, url);
}
@ -252,7 +252,7 @@ void CefFrameHostImpl::SendJavaScript(
frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
}
if (browser.get())
if (browser.get() && frame_id != kInvalidFrameId)
browser->SendCode(frame_id, true, jsCode, scriptUrl, startLine, NULL);
}