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 2b3ae3b8 (#394939)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patch/patches/browser_frame_host_guest_1687.patch
View File

@@ -1,8 +1,8 @@
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
index 41e31c0..509ebd8 100644
index 54d6c4c..4a5268d 100644
--- render_widget_host_view_guest.cc
+++ render_widget_host_view_guest.cc
@@ -191,6 +191,9 @@ void RenderWidgetHostViewGuest::Destroy() {
@@ -212,6 +212,9 @@ void RenderWidgetHostViewGuest::Destroy() {
}
gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {

6
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 ad4474f..d0318065 100644
index 71e2857..73d4e45 100644
--- browser/browser_plugin/browser_plugin_guest.cc
+++ browser/browser_plugin/browser_plugin_guest.cc
@@ -28,7 +28,7 @@
@@ -11,7 +11,7 @@ index ad4474f..d0318065 100644
#include "content/common/browser_plugin/browser_plugin_constants.h"
#include "content/common/browser_plugin/browser_plugin_messages.h"
#include "content/common/content_constants_internal.h"
@@ -286,20 +286,19 @@ void BrowserPluginGuest::InitInternal(
@@ -287,20 +287,19 @@ void BrowserPluginGuest::InitInternal(
guest_window_rect_ = params.view_rect;
if (owner_web_contents_ != owner_web_contents) {
@@ -36,7 +36,7 @@ index ad4474f..d0318065 100644
}
RendererPreferences* renderer_prefs =
@@ -749,11 +748,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
@@ -750,11 +749,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
->GetWidget()
->Init();
GetWebContents()->GetMainFrame()->Init();

53
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,18 +1,19 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 61d8bf3..0cee4d7 100644
index 5621f82..3124d00 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1412,32 +1412,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1510,39 +1510,47 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
// frame - let's do the same thing here.
std::string unique_name = params.main_frame_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
- WebContentsViewDelegate* delegate =
- GetContentClient()->browser()->GetWebContentsViewDelegate(this);
+
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
+ render_view_host_delegate_view_ = params.delegate_view;
+ }
+
- WebContentsViewDelegate* delegate =
- GetContentClient()->browser()->GetWebContentsViewDelegate(this);
+ if (!view_) {
+ WebContentsViewDelegate* delegate =
+ GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -38,31 +39,41 @@ index 61d8bf3..0cee4d7 100644
#endif
- if (!view_) {
- view_.reset(CreateWebContentsView(this, delegate,
- &render_view_host_delegate_view_));
- }
+ if (!view_) {
+ view_.reset(CreateWebContentsView(this, delegate,
+ &render_view_host_delegate_view_));
+ if (browser_plugin_guest_ &&
+ BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ view_.reset(new WebContentsViewChildFrame(
+ this, delegate, &render_view_host_delegate_view_));
+ } else {
+ view_.reset(CreateWebContentsView(this, delegate,
+ &render_view_host_delegate_view_));
+ }
+ }
+
if (browser_plugin_guest_ &&
- BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- view_.reset(new WebContentsViewChildFrame(
- this, delegate, &render_view_host_delegate_view_));
- } else {
- view_.reset(CreateWebContentsView(this, delegate,
- &render_view_host_delegate_view_));
+ !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
+ std::move(view_),
+ &render_view_host_delegate_view_));
}
}
- if (browser_plugin_guest_ &&
- !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
- std::move(view_),
- &render_view_host_delegate_view_));
+ if (browser_plugin_guest_ &&
+ !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
+ std::move(view_),
+ &render_view_host_delegate_view_));
+ }
}
+
- }
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1867,11 +1875,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -1974,11 +1982,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -78,7 +89,7 @@ index 61d8bf3..0cee4d7 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
@@ -1895,6 +1906,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -2002,6 +2013,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;

4
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index 1aad5054..5bccbed 100644
index 3724f2f..5eb9cde 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@
@@ -12,7 +12,7 @@ index 1aad5054..5bccbed 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
@@ -96,7 +99,10 @@
@@ -90,7 +93,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)

8
patch/patches/chrome_browser_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index b9d1732..7754dd9 100644
index e551474..222b6ad 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1729,7 +1729,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1731,7 +1731,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index b9d1732..7754dd9 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(
diff --git ui/browser.h ui/browser.h
index 3cb7401..e41d498 100644
index 2196898..af9df43 100644
--- ui/browser.h
+++ ui/browser.h
@@ -613,7 +613,9 @@ class Browser : public TabStripModelObserver,
@@ -616,7 +616,9 @@ class Browser : public TabStripModelObserver,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

20
patch/patches/chrome_pepper_flash_1586.patch
View File

@@ -1,20 +0,0 @@
diff --git pepper_flash.cc pepper_flash.cc
index 3b6cbd9..d4ba7ed 100644
--- pepper_flash.cc
+++ pepper_flash.cc
@@ -121,8 +121,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
std::string arch;
manifest.GetStringASCII("x-ppapi-arch", &arch);
+#if defined(OS_MACOSX)
+ // On Mac newer versions of the plugin are a universal binary and use "mac"
+ // as the value.
+ if (arch != kPepperFlashArch && arch != kPepperFlashOperatingSystem)
+ return false;
+#else
if (arch != kPepperFlashArch)
return false;
+#endif
*version_out = version;
return true;

26
patch/patches/compositor_1368.patch
View File

@@ -1,23 +1,23 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 9a4ad65..5a6d428 100644
index ea713fd..e4119f6 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -130,6 +130,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
scoped_ptr<cc::SoftwareOutputDevice>
@@ -188,6 +188,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
std::unique_ptr<cc::SoftwareOutputDevice>
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
+ if (compositor->delegate()) {
+ scoped_ptr<cc::SoftwareOutputDevice> output_device =
+ std::unique_ptr<cc::SoftwareOutputDevice> output_device =
+ compositor->delegate()->CreateSoftwareOutputDevice(compositor);
+ if (output_device.get())
+ if (output_device)
+ return output_device;
+ }
+
#if defined(MOJO_RUNNER_CLIENT)
if (IsRunningInMojoShell()) {
return scoped_ptr<cc::SoftwareOutputDevice>(
return std::unique_ptr<cc::SoftwareOutputDevice>(
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index acae0be..90ff7e1 100644
index a6245da..edfdeb5c 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -17,6 +17,7 @@
@@ -28,15 +28,15 @@ index acae0be..90ff7e1 100644
#include "cc/surfaces/surface_sequence.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -152,6 +153,17 @@ class COMPOSITOR_EXPORT CompositorBeginFrameObserver {
virtual void OnSendBeginFrame(const cc::BeginFrameArgs& args) = 0;
@@ -156,6 +157,17 @@ class COMPOSITOR_EXPORT CompositorLock
DISALLOW_COPY_AND_ASSIGN(CompositorLock);
};
+class COMPOSITOR_EXPORT CompositorDelegate {
+ public:
+ virtual scoped_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
+ virtual std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
+ ui::Compositor* compositor) {
+ return scoped_ptr<cc::SoftwareOutputDevice>();
+ return nullptr;
+ }
+
+ protected:
@@ -46,7 +46,7 @@ index acae0be..90ff7e1 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -172,6 +184,9 @@ class COMPOSITOR_EXPORT Compositor
@@ -176,6 +188,9 @@ class COMPOSITOR_EXPORT Compositor
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -56,7 +56,7 @@ index acae0be..90ff7e1 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -346,6 +361,8 @@ class COMPOSITOR_EXPORT Compositor
@@ -345,6 +360,8 @@ class COMPOSITOR_EXPORT Compositor
ui::ContextFactory* context_factory_;

10
patch/patches/content_nav_1129.patch
View File

@@ -1,5 +1,5 @@
diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc
index a1389fc..6dcaabb 100644
index 4ad49c8..f1fa7ab 100644
--- public/renderer/content_renderer_client.cc
+++ public/renderer/content_renderer_client.cc
@@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -19,7 +19,7 @@ index a1389fc..6dcaabb 100644
return false;
}
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index 0fab037..848a8f7 100644
index d96adc9..348ae16 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -200,7 +200,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -39,10 +39,10 @@ index 0fab037..848a8f7 100644
// built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index af44d57..93a57ff 100644
index 4ff6aaa..4309775 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4697,7 +4697,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4771,7 +4771,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@@ -50,7 +50,7 @@ index af44d57..93a57ff 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -4706,7 +4705,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4780,7 +4779,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

6
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 57eb9c2..275632a 100644
index eb8eb4d..836ce55 100644
--- browser/guest_view/extension_options/extension_options_guest.cc
+++ browser/guest_view/extension_options/extension_options_guest.cc
@@ -202,7 +202,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
@@ -203,7 +203,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,7 +14,7 @@ index 57eb9c2..275632a 100644
// view is used for displaying embedded extension options, we want any
// external links to be opened in a new tab, not in a new guest view.
diff --git browser/guest_view/extension_options/extension_options_guest.h browser/guest_view/extension_options/extension_options_guest.h
index b81fe41..41e3e2a 100644
index e0309f7..f6a3878 100644
--- browser/guest_view/extension_options/extension_options_guest.h
+++ browser/guest_view/extension_options/extension_options_guest.h
@@ -56,7 +56,9 @@ class ExtensionOptionsGuest

2
patch/patches/gritsettings.patch
View File

@@ -1,5 +1,5 @@
diff --git resource_ids resource_ids
index b790c72..fca33586 100644
index 5c46a26..b0babb3 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 edac48d..3bcc3b9 100644
index 9cfc706..932dc86 100644
--- gyp/generator/ninja.py
+++ gyp/generator/ninja.py
@@ -760,7 +760,16 @@ class NinjaWriter(object):

4
patch/patches/ime_1610.patch
View File

@@ -1,8 +1,8 @@
diff --git input_method_win.cc input_method_win.cc
index 47160e5..1de804e 100644
index 4ec5a84..7c99e6c 100644
--- input_method_win.cc
+++ input_method_win.cc
@@ -629,8 +629,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
@@ -635,8 +635,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
// receiving keyboard input as long as it is an active window. This works well
// even when the |attached_window_handle| becomes active but has not received
// WM_FOCUS yet.

4
patch/patches/message_loop_443.patch
View File

@@ -1,8 +1,8 @@
diff --git message_loop.cc message_loop.cc
index 01e7512..e3fcc0d 100644
index 3fef91b..58ddbf3 100644
--- message_loop.cc
+++ message_loop.cc
@@ -140,12 +140,6 @@ MessageLoop::~MessageLoop() {
@@ -142,12 +142,6 @@ MessageLoop::~MessageLoop() {
// may be current.
DCHECK((pump_ && current() == this) || (!pump_ && current() != this));

4
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 27297f3..a7e0f40b 100644
index ec15087..7b4a51f 100644
--- mime_handler_view_guest.cc
+++ mime_handler_view_guest.cc
@@ -134,6 +134,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -43,7 +43,7 @@ index 27297f3..a7e0f40b 100644
WebContents* source,
const content::OpenURLParams& params) {
diff --git mime_handler_view_guest.h mime_handler_view_guest.h
index 4618d9f..84a621b 100644
index ef91c24..f849918 100644
--- mime_handler_view_guest.h
+++ mime_handler_view_guest.h
@@ -75,6 +75,15 @@ class MimeHandlerViewGuest :

10
patch/patches/net_filter_515.patch
View File

@@ -25,7 +25,7 @@ index 81d8190..3405e31 100644
// This is the interface for subclasses of NetworkDelegate to implement. These
// member functions will be called by the respective public notification
diff --git filter/filter.h filter/filter.h
index 31d08d4..1de8e84 100644
index 78b8c34..387bea5 100644
--- filter/filter.h
+++ filter/filter.h
@@ -59,6 +59,7 @@
@@ -36,7 +36,7 @@ index 31d08d4..1de8e84 100644
class GURL;
namespace net {
@@ -239,6 +240,7 @@ class NET_EXPORT_PRIVATE Filter {
@@ -240,6 +241,7 @@ class NET_EXPORT_PRIVATE Filter {
FilterType type() const { return type_id_; }
protected:
@@ -45,12 +45,12 @@ index 31d08d4..1de8e84 100644
friend class GZipUnitTest;
friend class SdchFilterChainingTest;
diff --git url_request/url_request_job.cc url_request/url_request_job.cc
index 239ab4b..03a5be1 100644
index 63edfe3..8ab84cc 100644
--- url_request/url_request_job.cc
+++ url_request/url_request_job.cc
@@ -447,6 +447,9 @@ void URLRequestJob::NotifyHeadersComplete() {
@@ -448,6 +448,9 @@ void URLRequestJob::NotifyHeadersComplete() {
if (request_->status().is_success())
filter_.reset(SetupFilter());
filter_ = SetupFilter();
+ if (network_delegate_)
+ filter_.reset(network_delegate_->SetupFilter(request_, filter_.release()));

4
patch/patches/net_urlrequest_1327.patch
View File

@@ -1,8 +1,8 @@
diff --git url_request.h url_request.h
index fcbc445..e424814 100644
index eb94da8..e4a9370 100644
--- url_request.h
+++ url_request.h
@@ -664,10 +664,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
@@ -659,10 +659,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
// or after the response headers are received.
void GetConnectionAttempts(ConnectionAttempts* out) const;

10
patch/patches/pdfium_print_549365.patch
View File

@@ -1,16 +1,16 @@
diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp
index e5a53da..7e3311a 100644
index 020ff8d..e4c5d9a 100644
--- fpdfsdk/fpdfview.cpp
+++ fpdfsdk/fpdfview.cpp
@@ -18,6 +18,7 @@
#include "fpdfsdk/include/fsdk_define.h"
@@ -19,6 +19,7 @@
#include "fpdfsdk/include/fsdk_mgr.h"
#include "fpdfsdk/include/fsdk_rendercontext.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
#include "fpdfsdk/javascript/ijs_runtime.h"
+#include "fpdfsdk/jsapi/include/fxjs_v8.h"
#include "public/fpdf_ext.h"
#include "public/fpdf_progressive.h"
@@ -266,6 +267,7 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary() {
#include "third_party/base/numerics/safe_conversions_impl.h"
@@ -267,6 +268,7 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary() {
#endif // PDF_ENABLE_XFA
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 ae29c73..2b9c996 100644
index 3a1b8fb..927061c 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -196,6 +196,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -207,6 +207,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 ae29c73..2b9c996 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 c1cdd19..33af607 100644
index a0bc6f1..96d1478 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -156,6 +156,7 @@ WebPreferences::WebPreferences()
@@ -163,6 +163,7 @@ WebPreferences::WebPreferences()
pinch_overlay_scrollbar_thickness(0),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
@@ -23,10 +23,10 @@ index c1cdd19..33af607 100644
inert_visual_viewport(false),
record_whole_document(false),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index 7b72351..7513ce2 100644
index 54b8ed4..160991f 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -176,6 +176,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 7b72351..7513ce2 100644
bool inert_visual_viewport;
bool record_whole_document;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index ae2d8ec..f90fba7 100644
index 71c52a3..cef247f 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -1483,6 +1483,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
@@ -1475,6 +1475,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view,
CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view);

14
patch/patches/print_header_footer_1478_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git printing/common/print_messages.cc printing/common/print_messages.cc
index e1a107a..1601811 100644
index 6798e35..215777f 100644
--- printing/common/print_messages.cc
+++ printing/common/print_messages.cc
@@ -97,7 +97,6 @@ void PrintMsg_PrintPages_Params::Reset() {
@@ -103,7 +103,6 @@ void PrintMsg_PrintPages_Params::Reset() {
pages = std::vector<int>();
}
@@ -10,13 +10,13 @@ index e1a107a..1601811 100644
PrintHostMsg_RequestPrintPreview_Params::
PrintHostMsg_RequestPrintPreview_Params()
: is_modifiable(false),
@@ -119,4 +118,3 @@ PrintHostMsg_SetOptionsFromDocument_Params::
@@ -125,4 +124,3 @@ PrintHostMsg_SetOptionsFromDocument_Params::
PrintHostMsg_SetOptionsFromDocument_Params::
~PrintHostMsg_SetOptionsFromDocument_Params() {
}
-#endif // defined(ENABLE_PRINT_PREVIEW)
diff --git printing/common/print_messages.h printing/common/print_messages.h
index 5cccd00..3a847b7 100644
index 705211b..a524333 100644
--- printing/common/print_messages.h
+++ printing/common/print_messages.h
@@ -71,7 +71,6 @@ struct PrintMsg_PrintPages_Params {
@@ -136,7 +136,7 @@ index 5cccd00..3a847b7 100644
PrintHostMsg_SetOptionsFromDocument_Params /* params */)
-#endif // defined(ENABLE_PRINT_PREVIEW)
diff --git printing/renderer/print_web_view_helper.cc printing/renderer/print_web_view_helper.cc
index 9ee4cd9..719060c 100644
index cfb1c77..33dad1a 100644
--- printing/renderer/print_web_view_helper.cc
+++ printing/renderer/print_web_view_helper.cc
@@ -83,6 +83,9 @@ const float kPrintingMinimumShrinkFactor = 1.333f;
@@ -395,7 +395,7 @@ index 9ee4cd9..719060c 100644
PrintWebViewHelper::PrintPreviewContext::PrintPreviewContext()
: total_page_count_(0),
diff --git printing/renderer/print_web_view_helper.h printing/renderer/print_web_view_helper.h
index 39ef858..3c4f89e 100644
index 7232b22..d2833f8 100644
--- printing/renderer/print_web_view_helper.h
+++ printing/renderer/print_web_view_helper.h
@@ -137,9 +137,7 @@ class PrintWebViewHelper
@@ -492,7 +492,7 @@ index 39ef858..3c4f89e 100644
bool is_loading_;
bool is_scripted_preview_delayed_;
diff --git printing/renderer/print_web_view_helper_mac.mm printing/renderer/print_web_view_helper_mac.mm
index 6552666..8899b6d 100644
index 1d23d5b..e99373b 100644
--- printing/renderer/print_web_view_helper_mac.mm
+++ printing/renderer/print_web_view_helper_mac.mm
@@ -68,7 +68,6 @@ void PrintWebViewHelper::PrintPageInternal(

10
patch/patches/public_browser_1257.patch
View File

@@ -14,7 +14,7 @@ index 69190cf..05d2250 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git web_contents.h web_contents.h
index 7c46c73..1315ac11 100644
index 6aa00e6..41223fa 100644
--- web_contents.h
+++ web_contents.h
@@ -55,8 +55,10 @@ class PageState;
@@ -28,7 +28,7 @@ index 7c46c73..1315ac11 100644
struct CustomContextMenuContext;
struct DropData;
struct Manifest;
@@ -147,6 +149,10 @@ class WebContents : public PageNavigator,
@@ -149,6 +151,10 @@ class WebContents : public PageNavigator,
// RenderFrame, have already been created on the renderer side, and
// WebContents construction should take this into account.
bool renderer_initiated_creation;
@@ -40,7 +40,7 @@ index 7c46c73..1315ac11 100644
// Creates a new WebContents.
diff --git web_contents_delegate.cc web_contents_delegate.cc
index fede931..09e6323 100644
index df97348..8e2168e 100644
--- web_contents_delegate.cc
+++ web_contents_delegate.cc
@@ -144,7 +144,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -55,7 +55,7 @@ index fede931..09e6323 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 074333a..3a8c277 100644
index 74b56e1..b4dcb2a 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -42,9 +42,11 @@ class JavaScriptDialogManager;
@@ -70,7 +70,7 @@ index 074333a..3a8c277 100644
struct ColorSuggestion;
struct ContextMenuParams;
struct DropData;
@@ -311,7 +313,9 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -307,7 +309,9 @@ class CONTENT_EXPORT WebContentsDelegate {
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

2
patch/patches/render_view_host_impl_1392.patch
View File

@@ -1,5 +1,5 @@
diff --git render_view_host_impl.h render_view_host_impl.h
index 4ec87ca..6919986 100644
index d54b2d7..c696c6f 100644
--- render_view_host_impl.h
+++ render_view_host_impl.h
@@ -193,6 +193,7 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,

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 09859f1..0c546e5 100644
index 86481a9..e2e56c0 100644
--- render_widget_host_view_mac.mm
+++ render_widget_host_view_mac.mm
@@ -537,9 +537,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
@@ -572,9 +572,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 2fff3f3..86c7f0c 100644
index 1a1a910..94fe66a 100644
--- renderer_preferences_util.cc
+++ renderer_preferences_util.cc
@@ -27,7 +27,8 @@
@@ -22,7 +22,8 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@@ -12,7 +12,7 @@ index 2fff3f3..86c7f0c 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -95,7 +96,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -72,7 +73,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif

8
patch/patches/stream_context_1710.patch
View File

@@ -1,8 +1,8 @@
diff --git stream_context.cc stream_context.cc
index e338396..150cde5 100644
index 3782205..5d97643 100644
--- stream_context.cc
+++ stream_context.cc
@@ -19,6 +19,10 @@ namespace content {
@@ -21,6 +21,10 @@ namespace content {
StreamContext::StreamContext() {}
@@ -14,10 +14,10 @@ index e338396..150cde5 100644
if (!context->GetUserData(kStreamContextKeyName)) {
scoped_refptr<StreamContext> stream = new StreamContext();
diff --git stream_context.h stream_context.h
index ad8f65c..60310db 100644
index 075ae3e..57fb5fd 100644
--- stream_context.h
+++ stream_context.h
@@ -28,6 +28,7 @@ class StreamContext
@@ -29,6 +29,7 @@ class StreamContext
public:
StreamContext();

4
patch/patches/ui_webview_1257.patch
View File

@@ -1,5 +1,5 @@
diff --git web_dialog_view.cc web_dialog_view.cc
index c5a2b03..0594c4a 100644
index d8afe6e..59259b7 100644
--- web_dialog_view.cc
+++ web_dialog_view.cc
@@ -341,7 +341,9 @@ bool WebDialogView::ShouldCreateWebContents(
@@ -14,7 +14,7 @@ index c5a2b03..0594c4a 100644
return delegate_->HandleShouldCreateWebContents();
return true;
diff --git web_dialog_view.h web_dialog_view.h
index a978921c..5f3fd33 100644
index 65be6d54..7802d6d 100644
--- web_dialog_view.h
+++ web_dialog_view.h
@@ -123,7 +123,9 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,

6
patch/patches/views_1749.patch
View File

@@ -1,5 +1,5 @@
diff --git controls/button/menu_button.cc controls/button/menu_button.cc
index 4d1a1b9..7854bb0 100644
index 3602b45..ec83c86 100644
--- controls/button/menu_button.cc
+++ controls/button/menu_button.cc
@@ -199,7 +199,7 @@ void MenuButton::OnPaint(gfx::Canvas* canvas) {
@@ -56,13 +56,13 @@ index 696a941..ce5abcd 100644
// The time is used for simulating menu behavior for the menu button; that
// is, if the menu is shown and the button is pressed, we need to close the
diff --git view.h view.h
index a85ef3d..42bd451 100644
index 6b45c63..7e52409 100644
--- view.h
+++ view.h
@@ -18,6 +18,7 @@
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "base/supports_user_data.h"
#include "build/build_config.h"
#include "ui/accessibility/ax_enums.h"

116
patch/patches/views_widget_180_1481_1677_1749.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 29e1eef0..2d3408d 100644
index c33e325c..04ad7d9 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -674,6 +674,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
@@ -695,6 +695,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
}
}
#endif
@@ -17,18 +17,18 @@ index 29e1eef0..2d3408d 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index febe516..208bdad 100644
index dd88fae..0aaaf78 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -47,6 +47,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
@@ -40,6 +40,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
current_device_scale_factor_(0),
current_display_rotation_(gfx::Display::ROTATE_0),
current_display_rotation_(display::Display::ROTATE_0),
pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
+ has_external_parent_(false),
renderer_frame_number_(0),
text_input_state_(new TextInputState()),
weak_factory_(this) {}
@@ -300,6 +301,10 @@ void RenderWidgetHostViewBase::EndFrameSubscription() {
@@ -250,6 +251,10 @@ void RenderWidgetHostViewBase::EndFrameSubscription() {
NOTREACHED();
}
@@ -40,18 +40,18 @@ index febe516..208bdad 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 c11775b..535caa2 100644
index 8eb9689..d076b3b 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -97,6 +97,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
void BeginFrameSubscription(
scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
std::unique_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
void EndFrameSubscription() override;
+ void SetHasExternalParent(bool val) override;
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews.
@@ -444,6 +445,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
@@ -423,6 +424,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
// renderer.
bool pinch_zoom_enabled_;
@@ -63,10 +63,10 @@ index c11775b..535caa2 100644
void FlushInput();
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index 99459ad..bc1d7e7 100644
index b902288..932f398 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -159,6 +159,10 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -160,6 +160,10 @@ class CONTENT_EXPORT RenderWidgetHostView {
// deleted after this call.
virtual void EndFrameSubscription() = 0;
@@ -75,13 +75,13 @@ index 99459ad..bc1d7e7 100644
+ virtual void SetHasExternalParent(bool val) = 0;
+
#if defined(OS_MACOSX)
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
// Return the accelerated widget which hosts the CALayers that draw the
// content of the view in GetNativeView. This may be null.
diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
index 4df7b7f..3427925 100644
index f772f64..7d13f9f 100644
--- ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -32,6 +32,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(
@@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(
}
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
@@ -91,10 +91,10 @@ index 4df7b7f..3427925 100644
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index fa9ea48..8e9ec16 100644
index 7591042..ea6b52c 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -84,6 +84,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
@@ -86,6 +86,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
should_animate_window_close_(false),
pending_close_(false),
has_non_client_view_(false),
@@ -102,7 +102,7 @@ index fa9ea48..8e9ec16 100644
tooltip_(NULL) {
}
@@ -134,8 +135,12 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
@@ -136,8 +137,12 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
native_widget_delegate_);
HWND parent_hwnd = NULL;
@@ -116,7 +116,7 @@ index fa9ea48..8e9ec16 100644
remove_standard_frame_ = params.remove_standard_frame;
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
@@ -631,6 +636,10 @@ bool DesktopWindowTreeHostWin::CanActivate() const {
@@ -642,6 +647,10 @@ bool DesktopWindowTreeHostWin::CanActivate() const {
return native_widget_delegate_->CanActivate();
}
@@ -127,7 +127,7 @@ index fa9ea48..8e9ec16 100644
bool DesktopWindowTreeHostWin::WantsMouseEventsWhenInactive() const {
return wants_mouse_events_when_inactive_;
}
@@ -805,11 +814,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -822,11 +831,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@@ -146,10 +146,10 @@ index fa9ea48..8e9ec16 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 3465112..28822c6 100644
index f357a5c..173d64d 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -136,6 +136,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -137,6 +137,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
bool CanMaximize() const override;
bool CanMinimize() const override;
bool CanActivate() const override;
@@ -157,7 +157,7 @@ index 3465112..28822c6 100644
bool WantsMouseEventsWhenInactive() const override;
bool WidgetSizeIsClientSize() const override;
bool IsModal() const override;
@@ -248,6 +249,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -250,6 +251,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// True if the window should have the frame removed.
bool remove_standard_frame_;
@@ -169,10 +169,10 @@ index 3465112..28822c6 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 cecae1e..b9e80b6 100644
index f792797..417d965 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -167,6 +167,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -170,6 +170,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
use_native_frame_(false),
should_maximize_after_map_(false),
use_argb_visual_(false),
@@ -180,7 +180,7 @@ index cecae1e..b9e80b6 100644
drag_drop_client_(NULL),
native_widget_delegate_(native_widget_delegate),
desktop_native_widget_aura_(desktop_native_widget_aura),
@@ -175,7 +176,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -178,7 +179,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
custom_window_shape_(false),
urgency_hint_set_(false),
activatable_(true),
@@ -190,7 +190,7 @@ index cecae1e..b9e80b6 100644
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -386,7 +388,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -389,7 +391,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -200,7 +200,7 @@ index cecae1e..b9e80b6 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -535,6 +538,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
@@ -538,6 +541,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
}
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@@ -209,7 +209,7 @@ index cecae1e..b9e80b6 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -972,6 +977,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
@@ -982,6 +987,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
}
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@@ -218,7 +218,7 @@ index cecae1e..b9e80b6 100644
return bounds_in_pixels_;
}
@@ -1029,6 +1036,8 @@ void DesktopWindowTreeHostX11::SetBounds(
@@ -1039,6 +1046,8 @@ void DesktopWindowTreeHostX11::SetBounds(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -227,7 +227,7 @@ index cecae1e..b9e80b6 100644
return bounds_in_pixels_.origin();
}
@@ -1137,9 +1146,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1147,9 +1156,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
use_argb_visual_ = true;
}
@@ -244,7 +244,7 @@ index cecae1e..b9e80b6 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1767,6 +1782,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1771,6 +1786,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@@ -256,7 +256,7 @@ index cecae1e..b9e80b6 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 7e842fe..bc5376f 100644
index 6a963f8..6cf5c02 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -86,6 +86,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -272,7 +272,7 @@ index 7e842fe..bc5376f 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -262,6 +268,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -263,6 +269,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@@ -282,7 +282,7 @@ index 7e842fe..bc5376f 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
@@ -298,6 +307,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -299,6 +308,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Whether we used an ARGB visual for our window.
bool use_argb_visual_;
@@ -292,8 +292,8 @@ index 7e842fe..bc5376f 100644
+
DesktopDragDropClientAuraX11* drag_drop_client_;
scoped_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -350,6 +363,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
std::unique_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -351,6 +364,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
@@ -304,7 +304,7 @@ index 7e842fe..bc5376f 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 8ec4b1e..587e4e3 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;
@@ -351,7 +351,7 @@ index 5ab84f9..c4095fa 100644
DCHECK_EQ(gfx::GetXDisplay(), xdisplay_);
// If the window is not already active, send a hint to activate it
@@ -175,8 +203,10 @@ uint32_t X11DesktopHandler::DispatchEvent(const ui::PlatformEvent& event) {
@@ -191,8 +219,10 @@ uint32_t X11DesktopHandler::DispatchEvent(const ui::PlatformEvent& event) {
::Window window;
if (ui::GetXIDProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &window) &&
window) {
@@ -365,7 +365,7 @@ index 5ab84f9..c4095fa 100644
x_active_window_ = None;
}
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index ffafd0d..e4a12ba 100644
index a86fe48..8ec377d 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -126,9 +126,11 @@ Widget::InitParams::InitParams(Type type)
@@ -380,7 +380,7 @@ index ffafd0d..e4a12ba 100644
native_widget(nullptr),
desktop_window_tree_host(nullptr),
layer_type(ui::LAYER_TEXTURED),
@@ -166,6 +168,7 @@ Widget::Widget()
@@ -165,6 +167,7 @@ Widget::Widget()
auto_release_capture_(true),
root_layers_dirty_(false),
movement_disabled_(false),
@@ -388,8 +388,8 @@ index ffafd0d..e4a12ba 100644
observer_manager_(this) {
}
@@ -291,7 +294,8 @@ void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
@@ -296,7 +299,8 @@ void Widget::Init(const InitParams& in_params) {
params.name = params.delegate->GetContentsView()->GetClassName();
params.child |= (params.type == InitParams::TYPE_CONTROL);
- is_top_level_ = !params.child;
@@ -398,8 +398,8 @@ index ffafd0d..e4a12ba 100644
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
@@ -353,7 +357,12 @@ void Widget::Init(const InitParams& in_params) {
Minimize();
@@ -360,7 +364,12 @@ void Widget::Init(const InitParams& in_params) {
}
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
- SetInitialBoundsForFramelessWindow(params.bounds);
@@ -413,10 +413,10 @@ index ffafd0d..e4a12ba 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 0ceaf82..7faed82 100644
index e52c7ff..57e466c 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -230,12 +230,17 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -238,12 +238,17 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// rendered, and that the client area should be equivalent to the window
// area. Only used on some platforms (Windows and Linux).
bool remove_standard_frame;
@@ -431,10 +431,10 @@ index 0ceaf82..7faed82 100644
ui::WindowShowState show_state;
gfx::NativeView parent;
+ gfx::AcceleratedWidget parent_widget;
// Used only by mus and is necessitated by mus not being a NativeView.
mus::Window* parent_mus = nullptr;
// Specifies the initial bounds of the Widget. Default is empty, which means
// the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not
@@ -735,6 +740,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -754,6 +759,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
bool movement_disabled() const { return movement_disabled_; }
void set_movement_disabled(bool disabled) { movement_disabled_ = disabled; }
@@ -445,7 +445,7 @@ index 0ceaf82..7faed82 100644
// Returns the work area bounds of the screen the Widget belongs to.
gfx::Rect GetWorkAreaBoundsInScreen() const;
@@ -949,6 +958,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -972,6 +981,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// disabled.
bool movement_disabled_;
@@ -457,10 +457,10 @@ index 0ceaf82..7faed82 100644
DISALLOW_COPY_AND_ASSIGN(Widget);
diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
index ca561b6..7940b5a 100644
index b843416..8b81a51 100644
--- ui/views/widget/widget_hwnd_utils.cc
+++ ui/views/widget/widget_hwnd_utils.cc
@@ -117,6 +117,11 @@ void CalculateWindowStylesFromInitParams(
@@ -114,6 +114,11 @@ void CalculateWindowStylesFromInitParams(
// See layered window comment above.
if (*ex_style & WS_EX_COMPOSITED)
*style &= ~(WS_THICKFRAME | WS_CAPTION);
@@ -473,10 +473,10 @@ index ca561b6..7940b5a 100644
}
case Widget::InitParams::TYPE_CONTROL:
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 74d5cd6..19d208e 100644
index 921b838..954d426 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -838,6 +838,8 @@ void HWNDMessageHandler::SizeConstraintsChanged() {
@@ -852,6 +852,8 @@ void HWNDMessageHandler::SizeConstraintsChanged() {
} else {
style &= ~WS_MINIMIZEBOX;
}
@@ -485,7 +485,7 @@ index 74d5cd6..19d208e 100644
SetWindowLong(hwnd(), GWL_STYLE, style);
}
@@ -2433,8 +2435,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2503,8 +2505,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.
@@ -501,7 +501,7 @@ index 74d5cd6..19d208e 100644
// There are cases where the code handling the message destroys the window,
diff --git ui/views/win/hwnd_message_handler_delegate.h ui/views/win/hwnd_message_handler_delegate.h
index 007157a..78fa051 100644
index 631f359..9a59aff 100644
--- ui/views/win/hwnd_message_handler_delegate.h
+++ ui/views/win/hwnd_message_handler_delegate.h
@@ -57,6 +57,10 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {

20
patch/patches/webcursor_1894.patch
View File

@@ -1,20 +0,0 @@
diff --git webcursor_aurawin.cc webcursor_aurawin.cc
index b8b4c57..69fe05e 100644
--- webcursor_aurawin.cc
+++ webcursor_aurawin.cc
@@ -37,6 +37,7 @@ ui::PlatformCursor WebCursor::GetPlatformCursor() {
void WebCursor::InitPlatformData() {
custom_cursor_ = NULL;
+ device_scale_factor_ = 1.0f;
}
bool WebCursor::SerializePlatformData(base::Pickle* pickle) const {
@@ -59,6 +60,7 @@ void WebCursor::CleanupPlatformData() {
}
void WebCursor::CopyPlatformData(const WebCursor& other) {
+ device_scale_factor_ = other.device_scale_factor_;
}
} // namespace content

20
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 821b3de..fa8898f 100644
index ab5b0e7..c977d57 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -879,7 +879,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -880,7 +880,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@@ -12,10 +12,10 @@ index 821b3de..fa8898f 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index e906bb7..40965ed 100644
index 218f70f..24824fd 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -416,6 +416,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -415,6 +415,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_enableFakePageScaleAnimationForTesting(false)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
@@ -23,7 +23,7 @@ index e906bb7..40965ed 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4120,9 +4121,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4072,9 +4073,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,10 +40,10 @@ index e906bb7..40965ed 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 12d658a..354438c 100644
index 3015ed1..0eb5455 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -390,7 +390,8 @@ public:
@@ -383,7 +383,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 12d658a..354438c 100644
bool shouldAutoResize() const
{
@@ -688,6 +689,8 @@ private:
@@ -672,6 +673,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@@ -63,10 +63,10 @@ index 12d658a..354438c 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index a04be6d..258e331 100644
index d25040c..67a9a1a 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -394,6 +394,7 @@ public:
@@ -443,6 +443,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);