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 251746.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1628 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-02-19 16:27:54 +00:00
parent 4b75a68f9b
commit 5b6086ffb3
26 changed files with 105 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcef/renderer/content_renderer_client.cc
View File

@@ -51,6 +51,7 @@ MSVC_POP_WARNING();
#include "third_party/WebKit/public/platform/WebWorkerRunLoop.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebPluginParams.h"
#include "third_party/WebKit/public/web/WebPrerendererClient.h"
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
@@ -586,7 +587,7 @@ void CefContentRendererClient::DidCreateScriptContext(
CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame);
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame);
v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope(
@@ -618,7 +619,7 @@ void CefContentRendererClient::WillReleaseScriptContext(
if (browserPtr.get()) {
CefRefPtr<CefFrameImpl> framePtr = browserPtr->GetWebFrameImpl(frame);
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame);
v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate);
v8::Context::Scope scope(context);
WebCore::V8RecursionScope recursion_scope(

5
libcef/renderer/frame_impl.cc
View File

@@ -18,6 +18,7 @@
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebScriptSource.h"
@@ -238,9 +239,9 @@ CefRefPtr<CefV8Context> CefFrameImpl::GetV8Context() {
CEF_REQUIRE_RT_RETURN(NULL);
if (frame_) {
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame_);
v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate);
return new CefV8ContextImpl(isolate, webkit_glue::GetV8Context(frame_));
return new CefV8ContextImpl(isolate, frame_->mainWorldScriptContext());
} else {
return NULL;
}

6
libcef/renderer/render_urlrequest_impl.cc
View File

@@ -56,7 +56,8 @@ class CefWebURLLoaderClient : public blink::WebURLLoaderClient {
const char* data,
int dataLength) OVERRIDE;
virtual void didFinishLoading(WebURLLoader* loader,
double finishTime) OVERRIDE;
double finishTime,
int64_t totalEncodedDataLength) OVERRIDE;
virtual void didFail(WebURLLoader* loader,
const WebURLError& error) OVERRIDE;
@@ -299,7 +300,8 @@ void CefWebURLLoaderClient::didReceiveCachedMetadata(WebURLLoader* loader,
}
void CefWebURLLoaderClient::didFinishLoading(WebURLLoader* loader,
double finishTime) {
double finishTime,
int64_t totalEncodedDataLength) {
context_->OnComplete();
}

14
libcef/renderer/webkit_glue.cc
View File

@@ -16,7 +16,6 @@
#include "libcef/renderer/webkit_glue.h"
#include "base/compiler_specific.h"
#include "v8/include/v8.h"
#include "config.h"
MSVC_PUSH_WARNING_LEVEL(0);
@@ -26,12 +25,9 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/public/web/WebViewClient.h"
#include "bindings/v8/V8Binding.h"
#include "bindings/v8/ScriptController.h"
#include "third_party/WebKit/Source/core/dom/Node.h"
#include "third_party/WebKit/Source/web/WebFrameImpl.h"
#include "third_party/WebKit/Source/web/WebViewImpl.h"
#include "third_party/WebKit/Source/wtf/PassRefPtr.h"
MSVC_POP_WARNING();
#undef LOG
@@ -67,16 +63,6 @@ void GoForward(blink::WebView* view) {
impl->client()->navigateBackForwardSoon(1);
}
v8::Isolate* GetV8Isolate(blink::WebFrame* frame) {
blink::WebFrameImpl* impl = static_cast<blink::WebFrameImpl*>(frame);
return WebCore::toIsolate(impl->frame());
}
v8::Handle<v8::Context> GetV8Context(blink::WebFrame* frame) {
blink::WebFrameImpl* impl = static_cast<blink::WebFrameImpl*>(frame);
return WebCore::ScriptController::mainWorldContext(impl->frame());
}
std::string DumpDocumentText(blink::WebFrame* frame) {
// We use the document element's text instead of the body text here because
// not all documents have a body, such as XML documents.

6
libcef/renderer/webkit_glue.h
View File

@@ -28,12 +28,6 @@ bool CanGoForward(blink::WebView* view);
void GoBack(blink::WebView* view);
void GoForward(blink::WebView* view);
// Retrieve the V8 isolate associated with the frame.
v8::Isolate* GetV8Isolate(blink::WebFrame* frame);
// Retrieve the V8 context associated with the frame.
v8::Handle<v8::Context> GetV8Context(blink::WebFrame* frame);
// Returns the text of the document element.
std::string DumpDocumentText(blink::WebFrame* frame);