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 d7d5682a (#367535)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-01-06 14:20:54 -05:00
parent 12f19e3a33
commit d2372c3d11
131 changed files with 1914 additions and 575 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 8971b07f..f37aa2a 100644
index 6d4a181..952a058 100644
--- render_widget_host_view_guest.cc
+++ render_widget_host_view_guest.cc
@@ -191,6 +191,9 @@ void RenderWidgetHostViewGuest::Destroy() {
@@ -218,6 +218,9 @@ void RenderWidgetHostViewGuest::Destroy() {
}
gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {

8
patch/patches/browser_plugin_guest_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git browser/browser_plugin/browser_plugin_guest.cc browser/browser_plugin/browser_plugin_guest.cc
index 61dbe6c..59d1673 100644
index 33262a8..5da1220 100644
--- browser/browser_plugin/browser_plugin_guest.cc
+++ browser/browser_plugin/browser_plugin_guest.cc
@@ -23,7 +23,7 @@
@@ -27,7 +27,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -11,7 +11,7 @@ index 61dbe6c..59d1673 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"
@@ -290,20 +290,19 @@ void BrowserPluginGuest::InitInternal(
@@ -294,20 +294,19 @@ void BrowserPluginGuest::InitInternal(
guest_window_rect_ = params.view_rect;
if (owner_web_contents_ != owner_web_contents) {
@@ -36,7 +36,7 @@ index 61dbe6c..59d1673 100644
}
RendererPreferences* renderer_prefs =
@@ -787,11 +786,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
@@ -791,11 +790,10 @@ void BrowserPluginGuest::OnWillAttachComplete(
static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost())
->GetWidget()
->Init();

65
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 18589f1..85f57e4 100644
index 88f58a7..9e454db 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1383,30 +1383,38 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1366,32 +1366,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
main_frame_widget_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
@@ -12,54 +12,57 @@ index 18589f1..85f57e4 100644
+ 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()) {
+ 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(),
- mus::Window* mus_window = aura::GetMusWindow(params.context);
- if (mus_window) {
- view_.reset(new WebContentsViewMus(mus_window, this, delegate,
- &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(),
+ mus::Window* mus_window = aura::GetMusWindow(params.context);
+ if (mus_window) {
+ view_.reset(new WebContentsViewMus(mus_window, this, delegate,
+ &render_view_host_delegate_view_));
+ }
}
- }
#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 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());
@@ -1810,11 +1818,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -1806,11 +1814,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -75,7 +78,7 @@ index 18589f1..85f57e4 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
@@ -1839,6 +1850,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1831,6 +1842,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;

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index 6b2cb0a..2bc614d 100644
index 577a95c..4c1cbfe 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@

8
patch/patches/chrome_browser_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index c633924..b93d698 100644
index 1f41d7c..7ebcc2d 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1677,7 +1677,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1708,7 +1708,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index c633924..b93d698 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(
diff --git ui/browser.h ui/browser.h
index 1511788..23ffe53 100644
index e3f6b883..1861b68 100644
--- ui/browser.h
+++ ui/browser.h
@@ -591,7 +591,9 @@ class Browser : public TabStripModelObserver,
@@ -598,7 +598,9 @@ class Browser : public TabStripModelObserver,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

4
patch/patches/chrome_pepper_flash_1586.patch
View File

@@ -1,8 +1,8 @@
diff --git pepper_flash.cc pepper_flash.cc
index 16b4328..63b21c1 100644
index 3b6cbd9..d4ba7ed 100644
--- pepper_flash.cc
+++ pepper_flash.cc
@@ -119,8 +119,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
@@ -121,8 +121,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
std::string arch;
manifest.GetStringASCII("x-ppapi-arch", &arch);

14
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 1ae2b11..2379d27 100644
index 51099ca..af38404 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -136,6 +136,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
@@ -138,6 +138,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
scoped_ptr<cc::SoftwareOutputDevice>
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
@@ -17,10 +17,10 @@ index 1ae2b11..2379d27 100644
if (IsRunningInMojoShell()) {
return scoped_ptr<cc::SoftwareOutputDevice>(
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index 1602d30..3dd3e3e 100644
index 5222b41..04856b6 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -14,6 +14,7 @@
@@ -17,6 +17,7 @@
#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
#include "cc/output/begin_frame_args.h"
@@ -28,7 +28,7 @@ index 1602d30..3dd3e3e 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"
@@ -148,6 +149,17 @@ class COMPOSITOR_EXPORT CompositorBeginFrameObserver {
@@ -152,6 +153,17 @@ class COMPOSITOR_EXPORT CompositorBeginFrameObserver {
virtual void OnSendBeginFrame(const cc::BeginFrameArgs& args) = 0;
};
@@ -46,7 +46,7 @@ index 1602d30..3dd3e3e 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
@@ -168,6 +180,9 @@ class COMPOSITOR_EXPORT Compositor
@@ -172,6 +184,9 @@ class COMPOSITOR_EXPORT Compositor
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -56,7 +56,7 @@ index 1602d30..3dd3e3e 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
@@ -338,6 +353,8 @@ class COMPOSITOR_EXPORT Compositor
@@ -344,6 +359,8 @@ class COMPOSITOR_EXPORT Compositor
ui::ContextFactory* context_factory_;

10
patch/patches/content_nav_1129.patch
View File

@@ -22,10 +22,10 @@ index 32004d1..ccd1f58 100644
const GURL& url,
const std::string& http_method,
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index 59d448c..ef15ff1 100644
index fd2f3af..40cca1d 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -16,6 +16,8 @@
@@ -18,6 +18,8 @@
#include "base/strings/string16.h"
#include "content/public/common/content_client.h"
#include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
@@ -34,7 +34,7 @@ index 59d448c..ef15ff1 100644
#include "ui/base/page_transition_types.h"
#include "v8/include/v8.h"
@@ -189,6 +191,17 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -191,6 +193,17 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
@@ -53,10 +53,10 @@ index 59d448c..ef15ff1 100644
// 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 314fe7b..c519785 100644
index 9ea32c4..adb478d 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4440,6 +4440,14 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4609,6 +4609,14 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());

4
patch/patches/content_pepper_flash_1586.patch
View File

@@ -1,8 +1,8 @@
diff --git pepper_flash_file_message_filter.cc pepper_flash_file_message_filter.cc
index 48da55d..2bbb939 100644
index 3059dd7..b327be5 100644
--- pepper_flash_file_message_filter.cc
+++ pepper_flash_file_message_filter.cc
@@ -53,7 +53,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(
@@ -55,7 +55,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(
// will construct a bad path and could provide access to the wrong files.
// In this case, |plugin_data_directory_| will remain unset and
// |ValidateAndConvertPepperFilePath| will fail.

8
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 5806540..6d1a8a7 100644
index f594ade..f71e7ed 100644
--- browser/guest_view/extension_options/extension_options_guest.cc
+++ browser/guest_view/extension_options/extension_options_guest.cc
@@ -200,7 +200,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
@@ -202,7 +202,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index 5806540..6d1a8a7 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 922d670..cb19e4e 100644
index b81fe41..41e3e2a 100644
--- browser/guest_view/extension_options/extension_options_guest.h
+++ browser/guest_view/extension_options/extension_options_guest.h
@@ -54,7 +54,9 @@ class ExtensionOptionsGuest
@@ -56,7 +56,9 @@ class ExtensionOptionsGuest
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

4
patch/patches/font_family_cache_1501.patch
View File

@@ -1,8 +1,8 @@
diff --git font_family_cache.h font_family_cache.h
index d5ff699..71fa27b 100644
index 306cbf0..6ca443c 100644
--- font_family_cache.h
+++ font_family_cache.h
@@ -19,6 +19,8 @@ class Profile;
@@ -20,6 +20,8 @@ class Profile;
FORWARD_DECLARE_TEST(FontFamilyCacheTest, Caching);

2
patch/patches/gritsettings.patch
View File

@@ -1,5 +1,5 @@
diff --git resource_ids resource_ids
index 6f53f31..21b5454 100644
index 93949e3..5552faf 100644
--- resource_ids
+++ resource_ids
@@ -14,6 +14,12 @@

18
patch/patches/gyp_331.patch
View File

@@ -1,5 +1,5 @@
diff --git gyp/generator/ninja.py gyp/generator/ninja.py
index 907542b..4d77af4 100644
index d8a45c7..3dd5518 100644
--- gyp/generator/ninja.py
+++ gyp/generator/ninja.py
@@ -745,7 +745,16 @@ class NinjaWriter(object):
@@ -20,19 +20,3 @@ index 907542b..4d77af4 100644
src = self.GypPathToNinja(path, env)
dst = self.GypPathToNinja(os.path.join(copy['destination'], basename),
env)
diff --git gyp/msvs_emulation.py gyp/msvs_emulation.py
index ca67b12..a3fd903 100644
--- gyp/msvs_emulation.py
+++ gyp/msvs_emulation.py
@@ -1027,8 +1027,10 @@ def GenerateEnvironmentFiles(toplevel_build_dir, generator_flags,
args = vs.SetupScript(arch)
args.extend(('&&', 'set'))
popen = subprocess.Popen(
- args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ args, shell=True, stdout=subprocess.PIPE)
variables, _ = popen.communicate()
+ if popen.returncode != 0:
+ raise Exception('Error invoking setup script: ' + repr(args))
env = _ExtractImportantEnvironment(variables)
# Inject system includes from gyp files into INCLUDE.

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 b5bd8a8..997c4da 100644
index 86ed8f8..8fb17b5 100644
--- hwnd_message_handler.cc
+++ hwnd_message_handler.cc
@@ -2381,8 +2381,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2382,8 +2382,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/ime_1610.patch
View File

@@ -1,8 +1,8 @@
diff --git input_method_win.cc input_method_win.cc
index ef500a7..5454067 100644
index 56bbac1..3265c64 100644
--- input_method_win.cc
+++ input_method_win.cc
@@ -586,8 +586,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
@@ -588,8 +588,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 a0c5f61..a3033dc 100644
index cfa86d9..6775c3d 100644
--- message_loop.cc
+++ message_loop.cc
@@ -136,12 +136,6 @@ MessageLoop::~MessageLoop() {
@@ -137,12 +137,6 @@ MessageLoop::~MessageLoop() {
// bound to a thread.
DCHECK(current() == this || !current());

10
patch/patches/mime_handler_view_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git mime_handler_view_guest.cc mime_handler_view_guest.cc
index 1f9ebfb..37c2217 100644
index d704b9f..00d3c3f 100644
--- mime_handler_view_guest.cc
+++ mime_handler_view_guest.cc
@@ -132,6 +132,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -134,6 +134,8 @@ void MimeHandlerViewGuest::CreateWebContents(
WebContents::CreateParams params(browser_context(),
guest_site_instance.get());
params.guest_delegate = this;
@@ -11,7 +11,7 @@ index 1f9ebfb..37c2217 100644
callback.Run(WebContents::Create(params));
}
@@ -156,6 +158,30 @@ bool MimeHandlerViewGuest::ZoomPropagatesFromEmbedderToGuest() const {
@@ -158,6 +160,30 @@ bool MimeHandlerViewGuest::ZoomPropagatesFromEmbedderToGuest() const {
return false;
}
@@ -43,10 +43,10 @@ index 1f9ebfb..37c2217 100644
WebContents* source,
const content::OpenURLParams& params) {
diff --git mime_handler_view_guest.h mime_handler_view_guest.h
index a876f6a..4808aa3 100644
index 4618d9f..84a621b 100644
--- mime_handler_view_guest.h
+++ mime_handler_view_guest.h
@@ -74,6 +74,15 @@ class MimeHandlerViewGuest :
@@ -75,6 +75,15 @@ class MimeHandlerViewGuest :
bool ShouldHandleFindRequestsForEmbedder() const final;
bool ZoomPropagatesFromEmbedderToGuest() const final;

14
patch/patches/net_filter_515.patch
View File

@@ -1,5 +1,5 @@
diff --git base/network_delegate.h base/network_delegate.h
index 979d3ec..0ccfd16 100644
index 0737137..60cfcd717 100644
--- base/network_delegate.h
+++ base/network_delegate.h
@@ -35,6 +35,7 @@ namespace net {
@@ -25,10 +25,10 @@ index 979d3ec..0ccfd16 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 1904a8c..8d5f1ec 100644
index e9df3db..768b7fc 100644
--- filter/filter.h
+++ filter/filter.h
@@ -57,6 +57,7 @@
@@ -59,6 +59,7 @@
#include "net/base/net_export.h"
#include "net/base/sdch_manager.h"
@@ -36,19 +36,19 @@ index 1904a8c..8d5f1ec 100644
class GURL;
namespace net {
@@ -231,6 +232,7 @@ class NET_EXPORT_PRIVATE Filter {
@@ -234,6 +235,7 @@ class NET_EXPORT_PRIVATE Filter {
std::string OrderedFilterList() const;
protected:
+ friend class ::CefNetworkDelegate;
friend class BrotliUnitTest;
friend class GZipUnitTest;
friend class SdchFilterChainingTest;
FRIEND_TEST_ALL_PREFIXES(FilterTest, ThreeFilterChain);
diff --git url_request/url_request_job.cc url_request/url_request_job.cc
index fc9f4a9..4f6dbcc 100644
index 55a4f51..937f163 100644
--- url_request/url_request_job.cc
+++ url_request/url_request_job.cc
@@ -472,6 +472,9 @@ void URLRequestJob::NotifyHeadersComplete() {
@@ -447,6 +447,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 33b2859..44cca91 100644
index ea6a54d..2c98007 100644
--- url_request.h
+++ url_request.h
@@ -653,10 +653,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
@@ -652,10 +652,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
// or after the response headers are received.
void GetConnectionAttempts(ConnectionAttempts* out) const;

8
patch/patches/pdfium_print_549365.patch
View File

@@ -1,16 +1,16 @@
diff --git fpdfsdk/src/fpdfview.cpp fpdfsdk/src/fpdfview.cpp
index fcb6731..0c92fe5 100644
index 041adda..407cbba 100644
--- fpdfsdk/src/fpdfview.cpp
+++ fpdfsdk/src/fpdfview.cpp
@@ -12,6 +12,7 @@
@@ -14,6 +14,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(
#include "third_party/base/numerics/safe_conversions_impl.h"
@@ -116,6 +117,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 f71d867..c9d82fd 100644
index e836e1b..f261e0d 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -191,6 +191,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -193,6 +193,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 f71d867..c9d82fd 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 a86de33..6129690 100644
index c887f9a8..873ed91 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -170,6 +170,7 @@ WebPreferences::WebPreferences()
@@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
pinch_overlay_scrollbar_thickness(0),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
@@ -23,10 +23,10 @@ index a86de33..6129690 100644
slimming_paint_v2_enabled(false),
cookie_enabled(true),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index eb8f77e..6616a39 100644
index fc1ee14..5094abb 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -168,6 +168,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -172,6 +172,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 eb8f77e..6616a39 100644
bool slimming_paint_v2_enabled;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index a5aa817..e02557b 100644
index 00c278e..4435b20 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -941,6 +941,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -939,6 +939,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setCookieEnabled(prefs.cookie_enabled);
settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);

14
patch/patches/prefs_tab_helper_1680.patch
View File

@@ -1,17 +1,17 @@
diff --git prefs_tab_helper.cc prefs_tab_helper.cc
index 1eb1268..aa4b840 100644
index ee406db..fc86170 100644
--- prefs_tab_helper.cc
+++ prefs_tab_helper.cc
@@ -7,7 +7,7 @@
#include <set>
#include <string>
@@ -12,7 +12,7 @@
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/singleton.h"
+#include "base/lazy_instance.h"
#include "base/metrics/field_trial.h"
#include "base/prefs/overlay_user_pref_store.h"
#include "base/prefs/pref_change_registrar.h"
#include "base/prefs/pref_service.h"
@@ -415,12 +415,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
@@ -431,12 +431,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
GetInstance()->GetServiceForBrowserContext(profile, true));
}
@@ -26,7 +26,7 @@ index 1eb1268..aa4b840 100644
PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
"PrefWatcher",
@@ -441,6 +439,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
@@ -457,6 +455,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
}
};

44
patch/patches/print_header_footer_1478_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git printing/renderer/print_web_view_helper.cc printing/renderer/print_web_view_helper.cc
index f2dc502..c0049d0 100644
index c09ad6a..2a92296 100644
--- printing/renderer/print_web_view_helper.cc
+++ printing/renderer/print_web_view_helper.cc
@@ -74,6 +74,9 @@ const double kMinDpi = 1.0;
@@ -79,6 +79,9 @@ const double kMinDpi = 1.0;
#if defined(ENABLE_PRINT_PREVIEW)
bool g_is_preview_enabled = true;
@@ -12,7 +12,7 @@ index f2dc502..c0049d0 100644
const char kPageLoadScriptFormat[] =
"document.open(); document.write(%s); document.close();";
@@ -88,9 +91,6 @@ void ExecuteScript(blink::WebFrame* frame,
@@ -93,9 +96,6 @@ void ExecuteScript(blink::WebFrame* frame,
std::string script = base::StringPrintf(script_format, json.c_str());
frame->executeScript(blink::WebString(base::UTF8ToUTF16(script)));
}
@@ -22,7 +22,7 @@ index f2dc502..c0049d0 100644
int GetDPI(const PrintMsg_Print_Params* print_params) {
#if defined(OS_MACOSX)
@@ -481,7 +481,6 @@ blink::WebView* FrameReference::view() {
@@ -486,7 +486,6 @@ blink::WebView* FrameReference::view() {
return view_;
}
@@ -30,7 +30,7 @@ index f2dc502..c0049d0 100644
// static - Not anonymous so that platform implementations can use it.
void PrintWebViewHelper::PrintHeaderAndFooter(
blink::WebCanvas* canvas,
@@ -537,7 +536,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
@@ -542,7 +541,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
web_view->close();
frame->close();
}
@@ -38,15 +38,15 @@ index f2dc502..c0049d0 100644
// static - Not anonymous so that platform implementations can use it.
float PrintWebViewHelper::RenderPageContent(blink::WebFrame* frame,
@@ -810,6 +808,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view,
@@ -815,6 +813,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view,
print_for_preview_(false),
delegate_(delegate.Pass()),
delegate_(std::move(delegate)),
print_node_in_progress_(false),
+ force_print_preview_(false),
is_loading_(false),
is_scripted_preview_delayed_(false),
ipc_nesting_level_(0),
@@ -1249,7 +1248,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
@@ -1254,7 +1253,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) {
// that instead.
auto plugin = delegate_->GetPdfElement(frame);
if (!plugin.isNull()) {
@@ -56,7 +56,7 @@ index f2dc502..c0049d0 100644
return;
}
print_preview_context_.InitWithFrame(frame);
@@ -1282,7 +1283,7 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
@@ -1287,7 +1288,7 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
// Make a copy of the node, in case RenderView::OnContextMenuClosed resets
// its |context_menu_node_|.
@@ -66,18 +66,18 @@ index f2dc502..c0049d0 100644
Print(duplicate_node.document().frame(), duplicate_node, false);
} else {
diff --git printing/renderer/print_web_view_helper.h printing/renderer/print_web_view_helper.h
index d9ea441..dce6b9e 100644
index 0de51e5..da084d0 100644
--- printing/renderer/print_web_view_helper.h
+++ printing/renderer/print_web_view_helper.h
@@ -309,7 +309,6 @@ class PrintWebViewHelper
double* scale_factor,
PageSizeMargins* page_layout_in_points);
@@ -317,7 +317,6 @@ class PrintWebViewHelper
const PrintMsg_PrintPages_Params& params,
int page_count);
-#if defined(ENABLE_PRINT_PREVIEW)
// Given the |device| and |canvas| to draw on, prints the appropriate headers
// and footers using strings from |header_footer_info| on to the canvas.
static void PrintHeaderAndFooter(blink::WebCanvas* canvas,
@@ -319,7 +318,6 @@ class PrintWebViewHelper
@@ -327,7 +326,6 @@ class PrintWebViewHelper
float webkit_scale_factor,
const PageSizeMargins& page_layout_in_points,
const PrintMsg_Print_Params& params);
@@ -85,7 +85,7 @@ index d9ea441..dce6b9e 100644
bool GetPrintFrame(blink::WebLocalFrame** frame);
@@ -498,6 +496,7 @@ class PrintWebViewHelper
@@ -506,6 +504,7 @@ class PrintWebViewHelper
ScriptingThrottler scripting_throttler_;
bool print_node_in_progress_;
@@ -94,10 +94,10 @@ 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 3e4033d..7a8b61f 100644
index acc72ed..545178d 100644
--- printing/renderer/print_web_view_helper_linux.cc
+++ printing/renderer/print_web_view_helper_linux.cc
@@ -152,7 +152,6 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -141,7 +141,6 @@ void PrintWebViewHelper::PrintPageInternal(
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
@@ -105,7 +105,7 @@ index 3e4033d..7a8b61f 100644
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?
@@ -161,7 +160,6 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -150,7 +149,6 @@ void PrintWebViewHelper::PrintPageInternal(
scale_factor / 1.25, page_layout_in_points,
params.params);
}
@@ -114,10 +114,10 @@ index 3e4033d..7a8b61f 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 293f567..601fee6 100644
index e682fa3..3a3aa8e 100644
--- printing/renderer/print_web_view_helper_mac.mm
+++ printing/renderer/print_web_view_helper_mac.mm
@@ -125,14 +125,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
@@ -143,14 +143,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsPreviewMetafile(*canvas, is_preview);
@@ -133,10 +133,10 @@ index 293f567..601fee6 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 13ad735..fffce71 100644
index 11401bf..2ed0668 100644
--- printing/renderer/print_web_view_helper_pdf_win.cc
+++ printing/renderer/print_web_view_helper_pdf_win.cc
@@ -160,14 +160,12 @@ void PrintWebViewHelper::PrintPageInternal(
@@ -151,14 +151,12 @@ void PrintWebViewHelper::PrintPageInternal(
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);

4
patch/patches/process_title_1639.patch
View File

@@ -1,8 +1,8 @@
diff --git set_process_title.cc set_process_title.cc
index d74af96..5c7ebd2 100644
index 2118598..8f85c70 100644
--- set_process_title.cc
+++ set_process_title.cc
@@ -42,7 +42,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
@@ -44,7 +44,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
bool have_argv0 = false;
#if defined(OS_LINUX)

16
patch/patches/public_browser_1257.patch
View File

@@ -14,10 +14,10 @@ index 1b6d8a6..b606a30 100644
WebContents::CreateParams::~CreateParams() {
}
diff --git web_contents.h web_contents.h
index c9fa8a01..e075a76 100644
index 6f68c96..2ba25d7 100644
--- web_contents.h
+++ web_contents.h
@@ -52,9 +52,11 @@ class PageState;
@@ -54,9 +54,11 @@ class PageState;
class RenderFrameHost;
class RenderProcessHost;
class RenderViewHost;
@@ -29,7 +29,7 @@ index c9fa8a01..e075a76 100644
struct CustomContextMenuContext;
struct DropData;
struct Manifest;
@@ -144,6 +146,10 @@ class WebContents : public PageNavigator,
@@ -146,6 +148,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;
@@ -41,10 +41,10 @@ index c9fa8a01..e075a76 100644
// Creates a new WebContents.
diff --git web_contents_delegate.cc web_contents_delegate.cc
index 70a1f06..b9673d2 100644
index e247f5b..45968ce 100644
--- web_contents_delegate.cc
+++ web_contents_delegate.cc
@@ -165,7 +165,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -170,7 +170,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -56,10 +56,10 @@ index 70a1f06..b9673d2 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index f6a04a5..f41ec5b 100644
index 6379fe4..d8e8844 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -39,9 +39,11 @@ class DownloadItem;
@@ -41,9 +41,11 @@ class DownloadItem;
class JavaScriptDialogManager;
class PageState;
class RenderViewHost;
@@ -71,7 +71,7 @@ index f6a04a5..f41ec5b 100644
struct ColorSuggestion;
struct ContextMenuParams;
struct DropData;
@@ -296,7 +298,9 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -303,7 +305,9 @@ class CONTENT_EXPORT WebContentsDelegate {
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

2
patch/patches/render_widget_host_1070383005.patch
View File

@@ -1,5 +1,5 @@
diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
index ccf0de2..c4b758e 100644
index 8a8f916..200c7b6 100644
--- render_widget_host_view_mac.mm
+++ render_widget_host_view_mac.mm
@@ -530,9 +530,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,

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 89b7d77..9996edf 100644
index a6498fc..4bf2cf91 100644
--- renderer_preferences_util.cc
+++ renderer_preferences_util.cc
@@ -26,7 +26,8 @@
@@ -27,7 +27,8 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@@ -12,7 +12,7 @@ index 89b7d77..9996edf 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -94,7 +95,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -95,7 +96,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif

4
patch/patches/spellcheck_137.patch
View File

@@ -26,13 +26,13 @@ index 87b5b9e..8e6dfff 100644
SpellcheckServiceFactory::SpellcheckServiceFactory()
diff --git spellcheck_factory.h spellcheck_factory.h
index 7cdf471..d52b881 100644
index e8eb9f7..48126000 100644
--- spellcheck_factory.h
+++ spellcheck_factory.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/singleton.h"
+#include "base/lazy_instance.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"

4
patch/patches/supports_user_data_1710.patch
View File

@@ -1,8 +1,8 @@
diff --git supports_user_data.h supports_user_data.h
index 711ee7d..cf38fc0 100644
index 5c1c7e9..77c9253 100644
--- supports_user_data.h
+++ supports_user_data.h
@@ -32,9 +32,9 @@ class BASE_EXPORT SupportsUserData {
@@ -33,9 +33,9 @@ class BASE_EXPORT SupportsUserData {
// Multiple user data values can be stored under different keys.
// This object will TAKE OWNERSHIP of the given data pointer, and will
// delete the object if it is changed or the object is destroyed.

4
patch/patches/ui_webview_1257.patch
View File

@@ -14,10 +14,10 @@ index c5a2b03..0594c4a 100644
return delegate_->HandleShouldCreateWebContents();
return true;
diff --git web_dialog_view.h web_dialog_view.h
index d897dbf..92bb481 100644
index a978921c..5f3fd33 100644
--- web_dialog_view.h
+++ web_dialog_view.h
@@ -120,7 +120,9 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
@@ -123,7 +123,9 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

52
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 edb45db..0dfcfb2 100644
index 6968dfc..ecb9129 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -772,6 +772,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
@@ -774,6 +774,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
::SetFocus(host->GetAcceleratedWidget());
}
#endif
@@ -17,10 +17,10 @@ index edb45db..0dfcfb2 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 1c07d7d..47c1911 100644
index a2a0884..c6eef9d 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()
@@ -375,6 +375,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
current_device_scale_factor_(0),
current_display_rotation_(gfx::Display::ROTATE_0),
pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
@@ -28,7 +28,7 @@ index 1c07d7d..47c1911 100644
renderer_frame_number_(0),
weak_factory_(this) {
}
@@ -568,6 +569,10 @@ void RenderWidgetHostViewBase::EndFrameSubscription() {
@@ -569,6 +570,10 @@ void RenderWidgetHostViewBase::EndFrameSubscription() {
NOTREACHED();
}
@@ -36,14 +36,14 @@ index 1c07d7d..47c1911 100644
+ has_external_parent_ = val;
+}
+
uint32 RenderWidgetHostViewBase::RendererFrameNumber() {
uint32_t RenderWidgetHostViewBase::RendererFrameNumber() {
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 1f1e43c..22b5593 100644
index d714137..9d17d2f 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,
@@ -87,6 +87,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
void BeginFrameSubscription(
scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
void EndFrameSubscription() override;
@@ -51,7 +51,7 @@ index 1f1e43c..22b5593 100644
// IPC::Listener implementation:
bool OnMessageReceived(const IPC::Message& msg) override;
@@ -434,6 +435,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
@@ -438,6 +439,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
// renderer.
bool pinch_zoom_enabled_;
@@ -63,7 +63,7 @@ index 1f1e43c..22b5593 100644
void FlushInput();
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index d503fa9..5a7ea6c 100644
index 9b48ddb..0314569 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -146,6 +146,10 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -135,10 +135,10 @@ index 48368f9..6a566ba 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 363c019..97ada1d 100644
index bee915a..23f93e2 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -242,6 +242,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -243,6 +243,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// Init time, before the Widget has created the NonClientView.
bool has_non_client_view_;
@@ -150,7 +150,7 @@ 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 656769c..0e5d460 100644
index d3aafd9..8bbfd6a 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -168,6 +168,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -237,12 +237,12 @@ index 656769c..0e5d460 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 c6d9257..0a36f28 100644
index 1036152..7b2b426 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -96,6 +96,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -98,6 +98,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// there is no dialog on the host window.
const XID GetModalDialog();
XID GetModalDialog();
+ void set_screen_bounds(const gfx::Rect& bounds) { screen_bounds_ = bounds; }
+
@@ -253,7 +253,7 @@ index c6d9257..0a36f28 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -272,6 +278,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -274,6 +280,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@@ -263,7 +263,7 @@ index c6d9257..0a36f28 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
@@ -308,6 +317,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -310,6 +319,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Whether we used an ARGB visual for our window.
bool use_argb_visual_;
@@ -274,7 +274,7 @@ index c6d9257..0a36f28 100644
DesktopDragDropClientAuraX11* drag_drop_client_;
scoped_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -364,6 +377,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -366,6 +379,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
@@ -346,10 +346,10 @@ index 9b20295..20b1aec 100644
x_active_window_ = None;
}
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 6873cde..770e2a9 100644
index aaa9320..c9e17a0 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -125,6 +125,7 @@ Widget::InitParams::InitParams()
@@ -126,6 +126,7 @@ Widget::InitParams::InitParams()
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(nullptr),
@@ -357,7 +357,7 @@ index 6873cde..770e2a9 100644
native_widget(nullptr),
native_theme(nullptr),
desktop_window_tree_host(nullptr),
@@ -150,6 +151,7 @@ Widget::InitParams::InitParams(Type type)
@@ -151,6 +152,7 @@ Widget::InitParams::InitParams(Type type)
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(nullptr),
@@ -365,7 +365,7 @@ index 6873cde..770e2a9 100644
native_widget(nullptr),
native_theme(nullptr),
desktop_window_tree_host(nullptr),
@@ -327,7 +329,7 @@ void Widget::Init(const InitParams& in_params) {
@@ -328,7 +330,7 @@ void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -374,7 +374,7 @@ index 6873cde..770e2a9 100644
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
@@ -390,7 +392,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -391,7 +393,12 @@ void Widget::Init(const InitParams& in_params) {
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
@@ -389,10 +389,10 @@ index 6873cde..770e2a9 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 b53bb48..f79ce8f 100644
index 4ad8c2b..abf716c 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -232,6 +232,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -234,6 +234,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// Whether the widget should be maximized or minimized.
ui::WindowShowState show_state;
gfx::NativeView parent;

31
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 5488a95..18c184f 100644
index 8a40549..3011ab4 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -821,7 +821,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -829,7 +829,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@@ -12,10 +12,10 @@ index 5488a95..18c184f 100644
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 3efbcdf..18f0c9e3 100644
index a065625..bbd9093 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -414,6 +414,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -476,6 +476,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_enableFakePageScaleAnimationForTesting(false)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
@@ -23,7 +23,20 @@ index 3efbcdf..18f0c9e3 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4050,9 +4051,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -2272,12 +2273,6 @@ void WebViewImpl::mouseCaptureLost()
void WebViewImpl::setFocus(bool enable)
{
- // On Windows, unnecessary setFocus(false) is called if a popup is shown and
- // the hotdog menu is clicked.
- // TODO(tkent): This should be fixed in Chromium.
- if (!enable && m_pagePopup)
- return;
-
m_page->focusController().setFocused(enable);
if (enable) {
m_page->focusController().setActive(true);
@@ -4151,9 +4146,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,10 +53,10 @@ index 3efbcdf..18f0c9e3 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index c4453c1..bb6ee4e 100644
index 9288a7f..18b0067 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -395,7 +395,8 @@ public:
@@ -396,7 +396,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 +66,7 @@ index c4453c1..bb6ee4e 100644
bool shouldAutoResize() const
{
@@ -678,6 +679,8 @@ private:
@@ -691,6 +692,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@@ -63,7 +76,7 @@ index c4453c1..bb6ee4e 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index 843f633..f922327 100644
index e21137b..e435d73 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -411,6 +411,7 @@ public: