Fix API changes of Chrome 38

This commit is contained in:
Cheng Zhao 2014-10-11 19:11:34 +08:00
parent 13e5cf32d5
commit 32dff999a5
12 changed files with 44 additions and 31 deletions

View file

@ -19,6 +19,7 @@
#include "native_mate/callback.h" #include "native_mate/callback.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "net/base/load_flags.h"
#include "net/proxy/proxy_service.h" #include "net/proxy/proxy_service.h"
#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
@ -46,10 +47,10 @@ class ResolveProxyHelper {
// Start the request. // Start the request.
int result = proxy_service->ResolveProxy( int result = proxy_service->ResolveProxy(
url, &proxy_info_, url, net::LOAD_NORMAL, &proxy_info_,
base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted, base::Bind(&ResolveProxyHelper::OnResolveProxyCompleted,
base::Unretained(this)), base::Unretained(this)),
&pac_req_, net::BoundNetLog()); &pac_req_, nullptr, net::BoundNetLog());
// Completed synchronously. // Completed synchronously.
if (result != net::ERR_IO_PENDING) if (result != net::ERR_IO_PENDING)

View file

@ -3,6 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
#include <set> #include <set>
#include <string>
#include "atom/common/native_mate_converters/file_path_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h"
#include "base/bind.h" #include "base/bind.h"
@ -31,17 +32,30 @@ struct Converter<std::set<T> > {
}; };
template<> template<>
struct Converter<TracingController::Options> { struct Converter<base::debug::CategoryFilter> {
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
TracingController::Options* out) { base::debug::CategoryFilter* out) {
if (!val->IsNumber()) std::string filter;
if (!ConvertFromV8(isolate, val, &filter))
return false; return false;
*out = static_cast<TracingController::Options>(val->IntegerValue()); *out = base::debug::CategoryFilter(filter);
return true; return true;
} }
}; };
template<>
struct Converter<base::debug::TraceOptions> {
static bool FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val,
base::debug::TraceOptions* out) {
std::string options;
if (!ConvertFromV8(isolate, val, &options))
return false;
return out->SetFromString(options);
}
};
} // namespace mate } // namespace mate
namespace { namespace {

View file

@ -35,10 +35,10 @@ void WebContents::RenderProcessGone(base::TerminationStatus status) {
Emit("crashed"); Emit("crashed");
} }
void WebContents::DidFinishLoad(int64 frame_id, void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
const GURL& validated_url, const GURL& validated_url) {
bool is_main_frame, bool is_main_frame = !render_frame_host->GetParent();
content::RenderViewHost* render_view_host) {
base::ListValue args; base::ListValue args;
args.AppendBoolean(is_main_frame); args.AppendBoolean(is_main_frame);
Emit("did-frame-finish-load", args); Emit("did-frame-finish-load", args);

View file

@ -52,11 +52,8 @@ class WebContents : public mate::EventEmitter,
// content::WebContentsObserver implementations: // content::WebContentsObserver implementations:
virtual void RenderViewDeleted(content::RenderViewHost*) OVERRIDE; virtual void RenderViewDeleted(content::RenderViewHost*) OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
virtual void DidFinishLoad( virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
int64 frame_id, const GURL& validated_url) OVERRIDE;
const GURL& validated_url,
bool is_main_frame,
content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidStartLoading( virtual void DidStartLoading(
content::RenderViewHost* render_view_host) OVERRIDE; content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidStopLoading( virtual void DidStopLoading(

View file

@ -18,8 +18,8 @@
#include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/browser/site_instance.h" #include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/web_preferences.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "webkit/common/webpreferences.h"
namespace atom { namespace atom {
@ -76,7 +76,7 @@ content::AccessTokenStore* AtomBrowserClient::CreateAccessTokenStore() {
void AtomBrowserClient::OverrideWebkitPrefs( void AtomBrowserClient::OverrideWebkitPrefs(
content::RenderViewHost* render_view_host, content::RenderViewHost* render_view_host,
const GURL& url, const GURL& url,
WebPreferences* prefs) { content::WebPreferences* prefs) {
prefs->javascript_enabled = true; prefs->javascript_enabled = true;
prefs->web_security_enabled = true; prefs->web_security_enabled = true;
prefs->javascript_can_open_windows_automatically = true; prefs->javascript_can_open_windows_automatically = true;

View file

@ -28,7 +28,7 @@ class AtomBrowserClient : public brightray::BrowserClient {
virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE; virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
const GURL& url, const GURL& url,
WebPreferences* prefs) OVERRIDE; content::WebPreferences* prefs) OVERRIDE;
virtual bool ShouldSwapBrowsingInstancesForNavigation( virtual bool ShouldSwapBrowsingInstancesForNavigation(
content::SiteInstance* site_instance, content::SiteInstance* site_instance,
const GURL& current_url, const GURL& current_url,

View file

@ -44,13 +44,13 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/renderer_preferences.h" #include "content/public/common/renderer_preferences.h"
#include "content/public/common/user_agent.h" #include "content/public/common/user_agent.h"
#include "content/public/common/web_preferences.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "ui/gfx/codec/png_codec.h" #include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/point.h" #include "ui/gfx/point.h"
#include "ui/gfx/rect.h" #include "ui/gfx/rect.h"
#include "ui/gfx/size.h" #include "ui/gfx/size.h"
#include "webkit/common/webpreferences.h"
using content::NavigationEntry; using content::NavigationEntry;
@ -248,9 +248,8 @@ bool NativeWindow::IsDevToolsOpened() {
void NativeWindow::InspectElement(int x, int y) { void NativeWindow::InspectElement(int x, int y) {
OpenDevTools(); OpenDevTools();
content::RenderViewHost* rvh = GetWebContents()->GetRenderViewHost();
scoped_refptr<content::DevToolsAgentHost> agent( scoped_refptr<content::DevToolsAgentHost> agent(
content::DevToolsAgentHost::GetOrCreateFor(rvh)); content::DevToolsAgentHost::GetOrCreateFor(GetWebContents()));
agent->InspectElement(x, y); agent->InspectElement(x, y);
} }
@ -287,7 +286,7 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
base::Bind(&NativeWindow::OnCapturePageDone, base::Bind(&NativeWindow::OnCapturePageDone,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),
callback), callback),
SkBitmap::kARGB_8888_Config); kAlpha_8_SkColorType);
} }
void NativeWindow::DestroyWebContents() { void NativeWindow::DestroyWebContents() {
@ -368,7 +367,8 @@ void NativeWindow::AppendExtraCommandLineSwitches(
} }
} }
void NativeWindow::OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs) { void NativeWindow::OverrideWebkitPrefs(const GURL& url,
content::WebPreferences* prefs) {
if (web_preferences_.IsEmpty()) if (web_preferences_.IsEmpty())
return; return;

View file

@ -23,8 +23,6 @@
#include "native_mate/persistent_dictionary.h" #include "native_mate/persistent_dictionary.h"
#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia.h"
struct WebPreferences;
namespace base { namespace base {
class CommandLine; class CommandLine;
} }
@ -32,6 +30,7 @@ class CommandLine;
namespace content { namespace content {
class BrowserContext; class BrowserContext;
class WebContents; class WebContents;
struct WebPreferences;
} }
namespace gfx { namespace gfx {
@ -178,7 +177,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
// Called when renderer process is going to be started. // Called when renderer process is going to be started.
void AppendExtraCommandLineSwitches(base::CommandLine* command_line, void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id); int child_process_id);
void OverrideWebkitPrefs(const GURL& url, WebPreferences* prefs); void OverrideWebkitPrefs(const GURL& url, content::WebPreferences* prefs);
// Public API used by platform-dependent delegates and observers to send UI // Public API used by platform-dependent delegates and observers to send UI
// related notifications. // related notifications.

View file

@ -99,7 +99,7 @@ void URLRequestAsarJob::DidOpen(int result) {
return; return;
} }
int rv = stream_->Seek(net::FROM_BEGIN, int rv = stream_->Seek(base::File::FROM_BEGIN,
file_info_.offset, file_info_.offset,
base::Bind(&URLRequestAsarJob::DidSeek, base::Bind(&URLRequestAsarJob::DidSeek,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));

View file

@ -91,7 +91,7 @@ bool StringToAccelerator(const std::string& description,
LOG(ERROR) << "The accelerator string can only contain ASCII characters"; LOG(ERROR) << "The accelerator string can only contain ASCII characters";
return false; return false;
} }
std::string shortcut(StringToLowerASCII(description)); std::string shortcut(base::StringToLowerASCII(description));
std::vector<std::string> tokens; std::vector<std::string> tokens;
base::SplitString(shortcut, '+', &tokens); base::SplitString(shortcut, '+', &tokens);

View file

@ -9,6 +9,7 @@
#include "base/values.h" #include "base/values.h"
#include "content/public/common/common_param_traits.h" #include "content/public/common/common_param_traits.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "ui/gfx/ipc/gfx_param_traits.h"
// The message starter should be declared in ipc/ipc_message_start.h. Since // The message starter should be declared in ipc/ipc_message_start.h. Since
// we don't want to patch Chromium, we just pretend to be Content Shell. // we don't want to patch Chromium, we just pretend to be Content Shell.

View file

@ -17,10 +17,10 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/common/print_messages.h" #include "chrome/common/print_messages.h"
#include "content/public/common/web_preferences.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "content/public/renderer/web_preferences.h"
#include "net/base/escape.h" #include "net/base/escape.h"
#include "printing/metafile.h" #include "printing/metafile.h"
#include "printing/metafile_impl.h" #include "printing/metafile_impl.h"
@ -42,7 +42,8 @@
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebViewClient.h" #include "third_party/WebKit/public/web/WebViewClient.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "webkit/common/webpreferences.h"
using content::WebPreferences;
namespace printing { namespace printing {
@ -547,7 +548,7 @@ void PrepareFrameAndViewForPrint::CopySelection(
blink::WebView* web_view = blink::WebView::create(this); blink::WebView* web_view = blink::WebView::create(this);
owns_web_view_ = true; owns_web_view_ = true;
content::ApplyWebPreferences(prefs, web_view); content::RenderView::ApplyWebPreferences(prefs, web_view);
web_view->setMainFrame(blink::WebLocalFrame::create(this)); web_view->setMainFrame(blink::WebLocalFrame::create(this));
frame_.Reset(web_view->mainFrame()->toWebLocalFrame()); frame_.Reset(web_view->mainFrame()->toWebLocalFrame());
node_to_print_.reset(); node_to_print_.reset();