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 c78c0ad7 (#363565)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-12-09 11:10:16 -05:00
parent 535c4fbc30
commit 5dec0c5f57
62 changed files with 534 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/patches/browser_frame_host_guest_1687.patch
View File

@ -1,5 +1,5 @@
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
index b389e40..c3b5d3e 100644
index 8971b07f..f37aa2a 100644
--- render_widget_host_view_guest.cc
+++ render_widget_host_view_guest.cc
@@ -191,6 +191,9 @@ void RenderWidgetHostViewGuest::Destroy() {

10
patch/patches/browser_plugin_guest_1565.patch
View File

@ -1,5 +1,5 @@
diff --git browser/browser_plugin/browser_plugin_guest.cc browser/browser_plugin/browser_plugin_guest.cc
index cef0842..d79092d 100644
index 61dbe6c..59d1673 100644
--- browser/browser_plugin/browser_plugin_guest.cc
+++ browser/browser_plugin/browser_plugin_guest.cc
@@ -23,7 +23,7 @@
@ -36,10 +36,10 @@ index cef0842..d79092d 100644
}
RendererPreferences* renderer_prefs =
@@ -792,11 +791,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
// This will trigger a callback to RenderViewReady after a round-trip IPC.
static_cast<RenderViewHostImpl*>(
GetWebContents()->GetRenderViewHost())->Init();
@@ -787,11 +786,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost())
->GetWidget()
->Init();
- WebContentsViewGuest* web_contents_view =
- static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {

75
patch/patches/browser_web_contents_1257.patch
View File

@ -1,56 +1,65 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index bf45da9..19ef2c7 100644
index 18589f1..85f57e4 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1351,23 +1351,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1383,30 +1383,38 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
main_frame_widget_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
- WebContentsViewDelegate* delegate =
- GetContentClient()->browser()->GetWebContentsViewDelegate(this);
-
- if (browser_plugin_guest_ &&
- !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
- this, delegate, &render_view_host_delegate_view_));
-
- WebContentsViewGuest* rv = new WebContentsViewGuest(
- this, browser_plugin_guest_.get(), platform_view.Pass(),
- render_view_host_delegate_view_);
- render_view_host_delegate_view_ = rv;
- view_.reset(rv);
- } else {
- // Regular WebContentsView.
- view_.reset(CreateWebContentsView(
- this, delegate, &render_view_host_delegate_view_));
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
+ render_view_host_delegate_view_ = params.delegate_view;
+ }
+
- view_.reset(
- CreateWebContentsView(this, delegate, &render_view_host_delegate_view_));
+ if (!view_) {
+ WebContentsViewDelegate* delegate =
+ GetContentClient()->browser()->GetWebContentsViewDelegate(this);
- if (browser_plugin_guest_ &&
- !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
- view_.Pass(),
- &render_view_host_delegate_view_));
- }
+ view_.reset(
+ CreateWebContentsView(this, delegate,
+ &render_view_host_delegate_view_));
+
+ if (browser_plugin_guest_ &&
+ !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
+ this, delegate, &render_view_host_delegate_view_));
+
+ WebContentsViewGuest* rv = new WebContentsViewGuest(
+ this, browser_plugin_guest_.get(), platform_view.Pass(),
+ render_view_host_delegate_view_);
+ render_view_host_delegate_view_ = rv;
+ view_.reset(rv);
+ } else {
+ // Regular WebContentsView.
+ view_.reset(CreateWebContentsView(
+ this, delegate, &render_view_host_delegate_view_));
+ view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
+ view_.Pass(),
+ &render_view_host_delegate_view_));
+ }
}
#if defined(MOJO_SHELL_CLIENT)
- if (MojoShellConnection::Get() &&
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kUseMusInRenderer)) {
- mus::Window* window = aura::GetMusWindow(params.context);
- if (window) {
- view_.reset(new WebContentsViewMus(this, window, view_.Pass(),
- &render_view_host_delegate_view_));
+ if (MojoShellConnection::Get() &&
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kUseMusInRenderer)) {
+ mus::Window* window = aura::GetMusWindow(params.context);
+ if (window) {
+ view_.reset(new WebContentsViewMus(this, window, view_.Pass(),
+ &render_view_host_delegate_view_));
+ }
}
- }
#endif
+ }
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1719,11 +1726,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -1810,11 +1818,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@ -66,7 +75,7 @@ index bf45da9..19ef2c7 100644
if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to
@@ -1748,6 +1758,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1839,6 +1850,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed;

14
patch/patches/build.patch
View File

@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index 780f43d..409a018 100644
index 6b2cb0a..2bc614d 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@
@ -12,6 +12,18 @@ index 780f43d..409a018 100644
# Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary
@@ -92,7 +95,10 @@
# depending on the packages installed on the local machine. Set this
# to 0 to build against locally installed headers and libraries (e.g.
# if packaging for a linux distro)
- 'use_sysroot%': 1,
+ # Disable use of the sysroot image for CEF because it does not include
+ # the GTK dependency required by cefclient. It would be nice to enable
+ # this functionality in the future. See http://crbug.com/504446.
+ 'use_sysroot%': 0,
# Override buildtype to select the desired build flavor.
# Dev - everyday build for development/testing
diff --git mac/strip_save_dsym mac/strip_save_dsym
index c9cf226..0dedbe3 100755
--- mac/strip_save_dsym

4
patch/patches/chrome_browser_1257.patch
View File

@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index d6a2493..c352fd6a 100644
index c633924..b93d698 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1673,7 +1673,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1677,7 +1677,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

10
patch/patches/compositor_1368.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index b74845f..4ac77c3 100644
index 1ae2b11..2379d27 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -143,6 +143,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
@@ -136,6 +136,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
scoped_ptr<cc::SoftwareOutputDevice>
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
@ -13,9 +13,9 @@ index b74845f..4ac77c3 100644
+ return output_device;
+ }
+
#if defined(OS_WIN)
return scoped_ptr<cc::SoftwareOutputDevice>(
new SoftwareOutputDeviceWin(software_backing_.get(), compositor));
#if defined(MOJO_RUNNER_CLIENT)
if (IsRunningInMojoShell()) {
return scoped_ptr<cc::SoftwareOutputDevice>(
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index 1602d30..3dd3e3e 100644
--- ui/compositor/compositor.h

85
patch/patches/content_nav_1129.patch
View File

@ -1,60 +1,73 @@
diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc
index 3d0316f..ccd1f58 100644
index 32004d1..ccd1f58 100644
--- public/renderer/content_renderer_client.cc
+++ public/renderer/content_renderer_client.cc
@@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -98,6 +98,18 @@ bool ContentRendererClient::AllowPopup() {
return false;
}
-#ifdef OS_ANDROID
bool ContentRendererClient::HandleNavigation(
RenderFrame* render_frame,
bool is_content_initiated,
@@ -110,7 +109,6 @@ bool ContentRendererClient::HandleNavigation(
bool is_redirect) {
return false;
}
-#endif
+bool ContentRendererClient::HandleNavigation(
+ RenderFrame* render_frame,
+ bool is_content_initiated,
+ int opener_id,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationType type,
+ blink::WebNavigationPolicy default_policy,
+ bool is_redirect) {
+ return false;
+}
+
bool ContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index f55c691..0aeb1b24 100644
index 59d448c..ef15ff1 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -192,7 +192,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -16,6 +16,8 @@
#include "base/strings/string16.h"
#include "content/public/common/content_client.h"
#include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
+#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
+#include "third_party/WebKit/public/web/WebNavigationType.h"
#include "ui/base/page_transition_types.h"
#include "v8/include/v8.h"
@@ -189,6 +191,17 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
-#ifdef OS_ANDROID
// TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351
@@ -207,7 +206,6 @@ class CONTENT_EXPORT ContentRendererClient {
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect);
-#endif
+
+ // Returns true if the navigation was handled by the embedder and should be
+ // ignored by WebKit. This method is used by CEF and android_webview.
+ virtual bool HandleNavigation(RenderFrame* render_frame,
+ bool is_content_initiated,
+ int opener_id,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationType type,
+ blink::WebNavigationPolicy default_policy,
+ bool is_redirect);
// Returns true if we should fork a new process for the given navigation.
// If |send_referrer| is set to false (which is the default), no referrer
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 33219e5..f6aac25 100644
index 314fe7b..c519785 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4395,7 +4395,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4440,6 +4440,14 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
-#ifdef OS_ANDROID
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -4405,7 +4404,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}
-#endif
+ if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
+ GetContentClient()->renderer()->HandleNavigation(
+ this, is_content_initiated, render_view_->opener_id_, frame_,
+ info.urlRequest, info.navigationType, info.defaultPolicy,
+ is_redirect)) {
+ return blink::WebNavigationPolicyIgnore;
+ }
+
Referrer referrer(
RenderViewImpl::GetReferrerFromRequest(frame_, info.urlRequest));

4
patch/patches/extensions_1257.patch
View File

@ -1,8 +1,8 @@
diff --git browser/guest_view/extension_options/extension_options_guest.cc browser/guest_view/extension_options/extension_options_guest.cc
index 6a34aa0..1743907 100644
index 5806540..6d1a8a7 100644
--- browser/guest_view/extension_options/extension_options_guest.cc
+++ browser/guest_view/extension_options/extension_options_guest.cc
@@ -197,7 +197,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
@@ -200,7 +200,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

2
patch/patches/gritsettings.patch
View File

@ -1,5 +1,5 @@
diff --git resource_ids resource_ids
index a5bcffe..6b897df 100644
index 6f53f31..21b5454 100644
--- resource_ids
+++ resource_ids
@@ -14,6 +14,12 @@

2
patch/patches/gyp_331.patch
View File

@ -1,5 +1,5 @@
diff --git gyp/generator/ninja.py gyp/generator/ninja.py
index 58be3bf..4dcb2a6 100644
index 907542b..4d77af4 100644
--- gyp/generator/ninja.py
+++ gyp/generator/ninja.py
@@ -745,7 +745,16 @@ class NinjaWriter(object):

4
patch/patches/hwnd_message_handler_1481.patch
View File

@ -1,8 +1,8 @@
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
index 035df76..d1517b4 100644
index b5bd8a8..997c4da 100644
--- hwnd_message_handler.cc
+++ hwnd_message_handler.cc
@@ -2364,8 +2364,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2381,8 +2381,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
active_mouse_tracking_flags_ = 0;
} else if (event.type() == ui::ET_MOUSEWHEEL) {
// Reroute the mouse wheel to the window under the pointer if applicable.

4
patch/patches/message_loop_443.patch
View File

@ -1,8 +1,8 @@
diff --git message_loop.cc message_loop.cc
index a44f468..6e391e9 100644
index a0c5f61..a3033dc 100644
--- message_loop.cc
+++ message_loop.cc
@@ -135,12 +135,6 @@ MessageLoop::~MessageLoop() {
@@ -136,12 +136,6 @@ MessageLoop::~MessageLoop() {
// bound to a thread.
DCHECK(current() == this || !current());

2
patch/patches/mime_handler_view_1565.patch
View File

@ -1,5 +1,5 @@
diff --git mime_handler_view_guest.cc mime_handler_view_guest.cc
index 55b2426..bea8823 100644
index 1f9ebfb..37c2217 100644
--- mime_handler_view_guest.cc
+++ mime_handler_view_guest.cc
@@ -132,6 +132,8 @@ void MimeHandlerViewGuest::CreateWebContents(

8
patch/patches/net_filter_515.patch
View File

@ -1,5 +1,5 @@
diff --git base/network_delegate.h base/network_delegate.h
index e8d82a3..8b536d7 100644
index 979d3ec..0ccfd16 100644
--- base/network_delegate.h
+++ base/network_delegate.h
@@ -35,6 +35,7 @@ namespace net {
@ -10,7 +10,7 @@ index e8d82a3..8b536d7 100644
class HttpRequestHeaders;
class HttpResponseHeaders;
class ProxyInfo;
@@ -118,6 +119,13 @@ class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
@@ -119,6 +120,13 @@ class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
const GURL& target_url,
const GURL& referrer_url) const;
@ -45,10 +45,10 @@ index 1904a8c..8d5f1ec 100644
friend class SdchFilterChainingTest;
FRIEND_TEST_ALL_PREFIXES(FilterTest, ThreeFilterChain);
diff --git url_request/url_request_job.cc url_request/url_request_job.cc
index 641c07b..e613c86 100644
index fc9f4a9..4f6dbcc 100644
--- url_request/url_request_job.cc
+++ url_request/url_request_job.cc
@@ -466,6 +466,9 @@ void URLRequestJob::NotifyHeadersComplete() {
@@ -472,6 +472,9 @@ void URLRequestJob::NotifyHeadersComplete() {
if (request_->status().is_success())
filter_.reset(SetupFilter());

4
patch/patches/net_urlrequest_1327.patch
View File

@ -1,8 +1,8 @@
diff --git url_request.h url_request.h
index f685cf7..d01faaee 100644
index 33b2859..44cca91 100644
--- url_request.h
+++ url_request.h
@@ -645,10 +645,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
@@ -653,10 +653,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
// or after the response headers are received.
void GetConnectionAttempts(ConnectionAttempts* out) const;

103
patch/patches/pdf_print_549365.patch
View File

@ -1,103 +0,0 @@
diff --git pdf.cc pdf.cc
index 1f580e4..9521fdf 100644
--- pdf.cc
+++ pdf.cc
@@ -10,8 +10,6 @@
#include "base/command_line.h"
#include "base/logging.h"
-#include "gin/array_buffer.h"
-#include "gin/public/isolate_holder.h"
#include "pdf/out_of_process_instance.h"
#include "ppapi/c/ppp.h"
#include "ppapi/cpp/private/internal_module.h"
@@ -24,14 +22,6 @@ namespace {
bool g_sdk_initialized_via_pepper = false;
-gin::IsolateHolder* g_isolate_holder = nullptr;
-
-void TearDownV8() {
- g_isolate_holder->isolate()->Exit();
- delete g_isolate_holder;
- g_isolate_holder = nullptr;
-}
-
} // namespace
PDFModule::PDFModule() {
@@ -39,7 +29,6 @@ PDFModule::PDFModule() {
PDFModule::~PDFModule() {
if (g_sdk_initialized_via_pepper) {
- TearDownV8();
chrome_pdf::ShutdownSDK();
g_sdk_initialized_via_pepper = false;
}
@@ -60,15 +49,8 @@ pp::Instance* PDFModule::CreateInstance(PP_Instance instance) {
v8::V8::SetNativesDataBlob(&natives);
v8::V8::SetSnapshotDataBlob(&snapshot);
}
- gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
- gin::ArrayBufferAllocator::SharedInstance());
- g_isolate_holder =
- new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
- g_isolate_holder->isolate()->Enter();
- if (!chrome_pdf::InitializeSDK()) {
- TearDownV8();
+ if (!chrome_pdf::InitializeSDK())
return NULL;
- }
g_sdk_initialized_via_pepper = true;
}
diff --git pdfium/pdfium_engine.cc pdfium/pdfium_engine.cc
index 8631088..d23c141 100644
--- pdfium/pdfium_engine.cc
+++ pdfium/pdfium_engine.cc
@@ -18,7 +18,9 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "gin/array_buffer.h"
#include "gin/public/gin_embedders.h"
+#include "gin/public/isolate_holder.h"
#include "pdf/draw_utils.h"
#include "pdf/pdfium/pdfium_api_string_buffer_adapter.h"
#include "pdf/pdfium/pdfium_mem_buffer_file_read.h"
@@ -449,9 +451,27 @@ std::string GetDocumentMetadata(FPDF_DOCUMENT doc, const std::string& key) {
return base::UTF16ToUTF8(value);
}
+gin::IsolateHolder* g_isolate_holder = nullptr;
+
+void SetUpV8() {
+ gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
+ gin::ArrayBufferAllocator::SharedInstance());
+ g_isolate_holder =
+ new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
+ g_isolate_holder->isolate()->Enter();
+}
+
+void TearDownV8() {
+ g_isolate_holder->isolate()->Exit();
+ delete g_isolate_holder;
+ g_isolate_holder = nullptr;
+}
+
} // namespace
bool InitializeSDK() {
+ SetUpV8();
+
FPDF_LIBRARY_CONFIG config;
config.version = 2;
config.m_pUserFontPaths = nullptr;
@@ -470,6 +490,7 @@ bool InitializeSDK() {
}
void ShutdownSDK() {
+ TearDownV8();
FPDF_DestroyLibrary();
}

20
patch/patches/pdfium_print_549365.patch
View File

@ -1,16 +1,16 @@
diff --git fpdfsdk/src/fpdfview.cpp fpdfsdk/src/fpdfview.cpp
index 97da89e..0484d93 100644
index fcb6731..0c92fe5 100644
--- fpdfsdk/src/fpdfview.cpp
+++ fpdfsdk/src/fpdfview.cpp
@@ -6,6 +6,7 @@
#include "../../core/include/fxcodec/fx_codec.h"
#include "../../core/include/fxcrt/fx_safe_types.h"
+#include "../../fpdfsdk/include/jsapi/fxjs_v8.h"
#include "../../public/fpdf_ext.h"
#include "../../public/fpdf_progressive.h"
#include "../../public/fpdfview.h"
@@ -105,6 +106,7 @@ DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig(
@@ -12,6 +12,7 @@
#include "fpdfsdk/include/fsdk_mgr.h"
#include "fpdfsdk/include/fsdk_rendercontext.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
#include "public/fpdf_ext.h"
#include "public/fpdf_progressive.h"
#include "third_party/base/nonstd_unique_ptr.h"
@@ -117,6 +118,7 @@ DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig(
DLLEXPORT void STDCALL FPDF_DestroyLibrary() {
CPDF_ModuleMgr::Destroy();
CFX_GEModule::Destroy();

16
patch/patches/prefs_content_1161.patch
View File

@ -1,8 +1,8 @@
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
index 48ba994..039d8fe 100644
index f71d867..c9d82fd 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -195,6 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -191,6 +191,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@ -11,10 +11,10 @@ index 48ba994..039d8fe 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
index 6b599c0..d2ff454 100644
index a86de33..6129690 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -176,6 +176,7 @@ WebPreferences::WebPreferences()
@@ -170,6 +170,7 @@ WebPreferences::WebPreferences()
pinch_overlay_scrollbar_thickness(0),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
@ -23,10 +23,10 @@ index 6b599c0..d2ff454 100644
slimming_paint_v2_enabled(false),
cookie_enabled(true),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index 0378cd7..484342b 100644
index eb8f77e..6616a39 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -168,6 +168,7 @@ struct CONTENT_EXPORT WebPreferences {
int pinch_overlay_scrollbar_thickness;
bool use_solid_color_scrollbars;
bool navigate_on_drag_drop;
@ -35,10 +35,10 @@ index 0378cd7..484342b 100644
bool slimming_paint_v2_enabled;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 3fd5464..4bf3639 100644
index a5aa817..e02557b 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -953,6 +953,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -941,6 +941,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setCookieEnabled(prefs.cookie_enabled);
settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);

6
patch/patches/prefs_tab_helper_1680.patch
View File

@ -1,5 +1,5 @@
diff --git prefs_tab_helper.cc prefs_tab_helper.cc
index 5cb2d6e..b0c8689 100644
index 1eb1268..aa4b840 100644
--- prefs_tab_helper.cc
+++ prefs_tab_helper.cc
@@ -7,7 +7,7 @@
@ -11,7 +11,7 @@ index 5cb2d6e..b0c8689 100644
#include "base/prefs/overlay_user_pref_store.h"
#include "base/prefs/pref_change_registrar.h"
#include "base/prefs/pref_service.h"
@@ -413,12 +413,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
@@ -415,12 +415,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
GetInstance()->GetServiceForBrowserContext(profile, true));
}
@ -26,7 +26,7 @@ index 5cb2d6e..b0c8689 100644
PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
"PrefWatcher",
@@ -439,6 +437,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
@@ -441,6 +439,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
}
};

20
patch/patches/print_header_footer_1478_1565.patch
View File

@ -94,18 +94,18 @@ index d9ea441..dce6b9e 100644
bool is_loading_;
bool is_scripted_preview_delayed_;
diff --git printing/renderer/print_web_view_helper_linux.cc printing/renderer/print_web_view_helper_linux.cc
index 52f92ec..85f7adb 100644
index 3e4033d..7a8b61f 100644
--- printing/renderer/print_web_view_helper_linux.cc
+++ printing/renderer/print_web_view_helper_linux.cc
@@ -154,7 +154,6 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -152,7 +152,6 @@ void PrintWebViewHelper::PrintPageInternal(
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
-#if defined(ENABLE_PRINT_PREVIEW)
if (params.params.display_header_footer) {
// |page_number| is 0-based, so 1 is added.
// TODO(vitalybuka) : why does it work only with 1.25?
@@ -163,7 +162,6 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -161,7 +160,6 @@ void PrintWebViewHelper::PrintPageInternal(
scale_factor / 1.25, page_layout_in_points,
params.params);
}
@ -114,12 +114,12 @@ index 52f92ec..85f7adb 100644
RenderPageContent(frame, params.page_number, canvas_area, content_area,
scale_factor, canvas);
diff --git printing/renderer/print_web_view_helper_mac.mm printing/renderer/print_web_view_helper_mac.mm
index f2b94e7..8c5df5e 100644
index 293f567..601fee6 100644
--- printing/renderer/print_web_view_helper_mac.mm
+++ printing/renderer/print_web_view_helper_mac.mm
@@ -126,14 +126,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
@@ -125,14 +125,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
skia::SetIsPreviewMetafile(*canvas, is_preview);
-#if defined(ENABLE_PRINT_PREVIEW)
if (params.display_header_footer) {
@ -133,12 +133,12 @@ index f2b94e7..8c5df5e 100644
scale_factor, static_cast<blink::WebCanvas*>(canvas));
}
diff --git printing/renderer/print_web_view_helper_pdf_win.cc printing/renderer/print_web_view_helper_pdf_win.cc
index 56acc74..ac85bf6 100644
index 13ad735..fffce71 100644
--- printing/renderer/print_web_view_helper_pdf_win.cc
+++ printing/renderer/print_web_view_helper_pdf_win.cc
@@ -162,14 +162,12 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -160,14 +160,12 @@ void PrintWebViewHelper::PrintPageInternal(
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
-#if defined(ENABLE_PRINT_PREVIEW)
if (params.params.display_header_footer) {

8
patch/patches/public_browser_1257.patch
View File

@ -14,7 +14,7 @@ index 1b6d8a6..b606a30 100644
WebContents::CreateParams::~CreateParams() {
}
diff --git web_contents.h web_contents.h
index cda6487..6a84ed1 100644
index c9fa8a01..e075a76 100644
--- web_contents.h
+++ web_contents.h
@@ -52,9 +52,11 @@ class PageState;
@ -41,10 +41,10 @@ index cda6487..6a84ed1 100644
// Creates a new WebContents.
diff --git web_contents_delegate.cc web_contents_delegate.cc
index b39436d..bf257a7 100644
index 70a1f06..b9673d2 100644
--- web_contents_delegate.cc
+++ web_contents_delegate.cc
@@ -139,7 +139,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -165,7 +165,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@ -56,7 +56,7 @@ index b39436d..bf257a7 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 40a4904..e857dee 100644
index f6a04a5..f41ec5b 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -39,9 +39,11 @@ class DownloadItem;

4
patch/patches/render_widget_host_1070383005.patch
View File

@ -1,8 +1,8 @@
diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
index fb89516..6edca6e 100644
index ccf0de2..c4b758e 100644
--- render_widget_host_view_mac.mm
+++ render_widget_host_view_mac.mm
@@ -529,9 +529,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
@@ -530,9 +530,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
// Paint this view host with |background_color_| when there is no content
// ready to draw.
background_layer_.reset([[CALayer alloc] init]);

6
patch/patches/renderer_preferences_util_545103.patch
View File

@ -1,8 +1,8 @@
diff --git renderer_preferences_util.cc renderer_preferences_util.cc
index f7628fe..e2f1451 100644
index 89b7d77..9996edf 100644
--- renderer_preferences_util.cc
+++ renderer_preferences_util.cc
@@ -25,7 +25,8 @@
@@ -26,7 +26,8 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@ -12,7 +12,7 @@ index f7628fe..e2f1451 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -81,7 +82,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -94,7 +95,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif

2
patch/patches/spellcheck_137.patch
View File

@ -1,5 +1,5 @@
diff --git spellcheck_factory.cc spellcheck_factory.cc
index fcf2ce8..9e4f3d1 100644
index 87b5b9e..8e6dfff 100644
--- spellcheck_factory.cc
+++ spellcheck_factory.cc
@@ -16,6 +16,13 @@

76
patch/patches/views_widget_180_1677.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index bbb79c9..bf9a924 100644
index edb45db..0dfcfb2 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -758,6 +758,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
@@ -772,6 +772,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
::SetFocus(host->GetAcceleratedWidget());
}
#endif
@ -17,7 +17,7 @@ index bbb79c9..bf9a924 100644
set_focus_on_mouse_down_ = false;
host_->Focus();
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index 1b40705..52599e5 100644
index 1c07d7d..47c1911 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -374,6 +374,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
@ -40,7 +40,7 @@ index 1b40705..52599e5 100644
return renderer_frame_number_;
}
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index bf3b8e1..351c601 100644
index 1f1e43c..22b5593 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -78,6 +78,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
@ -51,7 +51,7 @@ index bf3b8e1..351c601 100644
// IPC::Listener implementation:
bool OnMessageReceived(const IPC::Message& msg) override;
@@ -414,6 +415,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
@@ -434,6 +435,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
// renderer.
bool pinch_zoom_enabled_;
@ -150,10 +150,10 @@ index 363c019..97ada1d 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 298c92b..393a5dc 100644
index 656769c..0e5d460 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -165,6 +165,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -168,6 +168,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
use_native_frame_(false),
should_maximize_after_map_(false),
use_argb_visual_(false),
@ -161,17 +161,17 @@ index 298c92b..393a5dc 100644
drag_drop_client_(NULL),
native_widget_delegate_(native_widget_delegate),
desktop_native_widget_aura_(desktop_native_widget_aura),
@@ -173,7 +174,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
custom_window_shape_(false),
@@ -177,7 +178,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
urgency_hint_set_(false),
activatable_(true),
modal_dialog_xid_(0),
- close_widget_factory_(this) {
+ close_widget_factory_(this),
+ xwindow_destroyed_(false) {
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -384,7 +386,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -388,7 +390,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@ -181,7 +181,7 @@ index 298c92b..393a5dc 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -533,6 +536,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
@@ -537,6 +540,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
}
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@ -190,7 +190,7 @@ index 298c92b..393a5dc 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -970,6 +975,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
@@ -974,6 +979,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
}
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@ -199,7 +199,7 @@ index 298c92b..393a5dc 100644
return bounds_in_pixels_;
}
@@ -1027,6 +1034,8 @@ void DesktopWindowTreeHostX11::SetBounds(
@@ -1031,6 +1038,8 @@ void DesktopWindowTreeHostX11::SetBounds(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@ -208,8 +208,8 @@ index 298c92b..393a5dc 100644
return bounds_in_pixels_.origin();
}
@@ -1140,9 +1149,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
}
@@ -1135,9 +1144,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
use_argb_visual_ = true;
}
+ gfx::AcceleratedWidget parent_widget = params.parent_widget;
@ -225,7 +225,7 @@ index 298c92b..393a5dc 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1797,6 +1812,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1766,6 +1781,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@ -237,12 +237,12 @@ index 298c92b..393a5dc 100644
if (xev->xfocus.mode != NotifyGrab) {
ReleaseCapture();
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 09b5993..db1b2bc 100644
index c6d9257..0a36f28 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -85,6 +85,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// internal list of open windows.
static void CleanUpWindowList(void (*func)(aura::Window* window));
@@ -96,6 +96,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// there is no dialog on the host window.
const XID GetModalDialog();
+ void set_screen_bounds(const gfx::Rect& bounds) { screen_bounds_ = bounds; }
+
@ -253,7 +253,7 @@ index 09b5993..db1b2bc 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -265,6 +271,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -272,6 +278,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@ -263,7 +263,7 @@ index 09b5993..db1b2bc 100644
// Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -301,6 +310,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -308,6 +317,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Whether we used an ARGB visual for our window.
bool use_argb_visual_;
@ -274,7 +274,7 @@ index 09b5993..db1b2bc 100644
DesktopDragDropClientAuraX11* drag_drop_client_;
scoped_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -353,6 +366,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -364,6 +377,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
@ -285,7 +285,7 @@ index 09b5993..db1b2bc 100644
};
diff --git ui/views/widget/desktop_aura/x11_desktop_handler.cc ui/views/widget/desktop_aura/x11_desktop_handler.cc
index 5ab84f9..c4095fa 100644
index 9b20295..20b1aec 100644
--- ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -31,6 +31,30 @@ views::X11DesktopHandler* g_handler = NULL;
@ -346,26 +346,26 @@ index 5ab84f9..c4095fa 100644
x_active_window_ = None;
}
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 6c0168d..fbcfbfc 100644
index 6873cde..770e2a9 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -124,6 +124,7 @@ Widget::InitParams::InitParams()
@@ -125,6 +125,7 @@ Widget::InitParams::InitParams()
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
parent(nullptr),
+ parent_widget(gfx::kNullAcceleratedWidget),
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(ui::LAYER_TEXTURED),
@@ -148,6 +149,7 @@ Widget::InitParams::InitParams(Type type)
native_widget(nullptr),
native_theme(nullptr),
desktop_window_tree_host(nullptr),
@@ -150,6 +151,7 @@ Widget::InitParams::InitParams(Type type)
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
parent(nullptr),
+ parent_widget(gfx::kNullAcceleratedWidget),
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(ui::LAYER_TEXTURED),
@@ -323,7 +325,7 @@ void Widget::Init(const InitParams& in_params) {
native_widget(nullptr),
native_theme(nullptr),
desktop_window_tree_host(nullptr),
@@ -327,7 +329,7 @@ void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -374,7 +374,7 @@ index 6c0168d..fbcfbfc 100644
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
@@ -386,7 +388,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -390,7 +392,12 @@ void Widget::Init(const InitParams& in_params) {
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
@ -389,7 +389,7 @@ index 6c0168d..fbcfbfc 100644
// This must come after SetContentsView() or it might not be able to find
// the correct NativeTheme (on Linux). See http://crbug.com/384492
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 301c0af..de63108 100644
index b53bb48..f79ce8f 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -232,6 +232,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,

20
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 499991c..b5d6d32 100644
index 5488a95..18c184f 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -809,7 +809,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -821,7 +821,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@ -12,10 +12,10 @@ index 499991c..b5d6d32 100644
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index c97a89c..6d2fb40 100644
index 3efbcdf..18f0c9e3 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -418,6 +418,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -414,6 +414,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_enableFakePageScaleAnimationForTesting(false)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
@ -23,7 +23,7 @@ index c97a89c..6d2fb40 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4018,9 +4019,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4050,9 +4051,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@ -40,10 +40,10 @@ index c97a89c..6d2fb40 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 09b718d..a1bc2ffc 100644
index c4453c1..bb6ee4e 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -389,7 +389,8 @@ public:
@@ -395,7 +395,8 @@ public:
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@ -53,7 +53,7 @@ index 09b718d..a1bc2ffc 100644
bool shouldAutoResize() const
{
@@ -670,6 +671,8 @@ private:
@@ -678,6 +679,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@ -63,10 +63,10 @@ index 09b718d..a1bc2ffc 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index 83d8c13..350bca4 100644
index 843f633..f922327 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -400,6 +400,7 @@ public:
@@ -411,6 +411,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);