Commit 8bc55d75 authored by Gustavo Noronha's avatar Gustavo Noronha
Browse files

kov build fixes

parent 5a5b538a
......@@ -160,11 +160,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/1710
'name': 'supports_user_data_1710',
},
{
# Fix background color on Mac.
# https://codereview.chromium.org/1070383005 (reverted)
'name': 'render_widget_host_1070383005',
},
{
# Fix missing check for defined(ENABLE_THEMES) in
# renderer_preferences_util.cc on Linux.
......@@ -306,11 +301,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/2102
'name': 'views_menu_2102',
},
{
# Mac: Fix build error when including openssl/opensslconf.h.
# https://bugs.chromium.org/p/chromium/issues/detail?id=711670
'name': 'mac_build_711670',
},
{
# Linux: Remove DCHECK during GPU feature info detection.
# https://bugs.chromium.org/p/chromium/issues/detail?id=699278
......
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index 47820a5..520ca4cd 100644
index 502b3d3..c37efa9 100644
--- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc
@@ -475,8 +475,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
@@ -476,8 +476,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
content::PluginService* plugin_service =
content::PluginService::GetInstance();
bool plugin_found = plugin_service->GetPluginInfo(
......@@ -38,7 +38,7 @@ index f8b651f..ec39f8d 100644
content::WebPluginInfo* plugin) override;
diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc
index 09b5753..11a5f32 100644
index 29d2d13..5c72963 100644
--- chrome/browser/plugins/plugin_info_message_filter.cc
+++ chrome/browser/plugins/plugin_info_message_filter.cc
@@ -451,8 +451,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
......@@ -66,10 +66,10 @@ index 0ce31db0..58c4633 100644
}
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index c147373..2e7cb5f 100644
index efc5b8b..0f39dc8 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -591,6 +591,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
@@ -586,6 +586,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
content::PluginService::GetInstance()->GetPluginInfo(
-1, // process ID
MSG_ROUTING_NONE, // routing ID
......@@ -78,10 +78,10 @@ index c147373..2e7cb5f 100644
mime_type, false, NULL, &plugin, NULL));
}
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 8dca644..d60c069 100644
index b86f81e..c4d39fb 100644
--- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc
@@ -265,12 +265,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -266,12 +266,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
}
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
......@@ -95,7 +95,7 @@ index 8dca644..d60c069 100644
}
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index ccd8ee7..cc52a93 100644
index 88f071a..58533a7 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -814,10 +814,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
......@@ -109,7 +109,7 @@ index ccd8ee7..cc52a93 100644
IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow)
IPC_END_MESSAGE_MAP()
@@ -1229,6 +1227,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -1242,6 +1240,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (navigation_handle_) {
navigation_handle_->set_net_error_code(
static_cast<net::Error>(params.error_code));
......@@ -117,7 +117,7 @@ index ccd8ee7..cc52a93 100644
}
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -2425,14 +2424,12 @@ void RenderFrameHostImpl::OnHidePopup() {
@@ -2441,14 +2440,12 @@ void RenderFrameHostImpl::OnHidePopup() {
}
#endif
......@@ -133,10 +133,10 @@ index ccd8ee7..cc52a93 100644
void RenderFrameHostImpl::OnShowCreatedWindow(int pending_widget_routing_id,
WindowOpenDisposition disposition,
diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h
index 7d13f01..9b2d494 100644
index c155890..1216213 100644
--- content/browser/frame_host/render_frame_host_impl.h
+++ content/browser/frame_host/render_frame_host_impl.h
@@ -783,8 +783,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -787,8 +787,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params);
void OnHidePopup();
#endif
......@@ -147,10 +147,10 @@ index 7d13f01..9b2d494 100644
mojo::ScopedMessagePipeHandle pipe);
#endif
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
index 5b8f571..958ebfb1 100644
index 35f7afc..280e3ae 100644
--- content/browser/frame_host/render_frame_message_filter.cc
+++ content/browser/frame_host/render_frame_message_filter.cc
@@ -446,6 +446,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
@@ -448,6 +448,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
void RenderFrameMessageFilter::OnGetPlugins(
bool refresh,
......@@ -158,7 +158,7 @@ index 5b8f571..958ebfb1 100644
const url::Origin& main_frame_origin,
IPC::Message* reply_msg) {
// Don't refresh if the specified threshold has not been passed. Note that
@@ -467,18 +468,19 @@ void RenderFrameMessageFilter::OnGetPlugins(
@@ -469,18 +470,19 @@ void RenderFrameMessageFilter::OnGetPlugins(
PluginServiceImpl::GetInstance()->GetPlugins(
base::Bind(&RenderFrameMessageFilter::GetPluginsCallback, this, reply_msg,
......@@ -180,7 +180,7 @@ index 5b8f571..958ebfb1 100644
int routing_id = MSG_ROUTING_NONE;
// In this loop, copy the WebPluginInfo (and do not use a reference) because
// the filter might mutate it.
@@ -487,7 +489,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
@@ -489,7 +491,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
if (!filter ||
filter->IsPluginAvailable(child_process_id, routing_id,
resource_context_, main_frame_origin.GetURL(),
......@@ -189,7 +189,7 @@ index 5b8f571..958ebfb1 100644
plugins.push_back(plugin);
}
}
@@ -499,6 +501,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
@@ -501,6 +503,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
void RenderFrameMessageFilter::OnGetPluginInfo(
int render_frame_id,
const GURL& url,
......@@ -197,7 +197,7 @@ index 5b8f571..958ebfb1 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
bool* found,
@@ -507,8 +510,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
@@ -509,8 +512,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
bool allow_wildcard = true;
*found = plugin_service_->GetPluginInfo(
render_process_id_, render_frame_id, resource_context_, url,
......@@ -279,10 +279,10 @@ index 9e7a5ef..ee721d0 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/common/frame_messages.h content/common/frame_messages.h
index b8be34e..db85a84 100644
index aebe975..19be16a 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -1277,8 +1277,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -1284,8 +1284,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// Used to get the list of plugins. |main_frame_origin| is used to handle
// exceptions for plugin content settings.
......@@ -293,7 +293,7 @@ index b8be34e..db85a84 100644
url::Origin /* main_frame_origin */,
std::vector<content::WebPluginInfo> /* plugins */)
@@ -1286,9 +1287,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
@@ -1293,9 +1294,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
......@@ -305,7 +305,7 @@ index b8be34e..db85a84 100644
url::Origin /* main_frame_origin */,
std::string /* mime_type */,
bool /* found */,
@@ -1648,9 +1650,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply,
@@ -1655,9 +1657,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply,
IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply,
int /* nfr_request_id */,
float /* distance */)
......@@ -317,10 +317,10 @@ index b8be34e..db85a84 100644
// Adding a new message? Stick to the sort order above: first platform
// independent FrameMsg, then ifdefs for platform specific FrameMsg, then
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc
index 6c24359..279edb2 100644
index b13765a..d6ce568 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.cc
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -211,6 +211,7 @@ blink::WebURLLoader* PpapiBlinkPlatformImpl::CreateURLLoader() {
@@ -212,6 +212,7 @@ std::unique_ptr<blink::WebURLLoader> PpapiBlinkPlatformImpl::CreateURLLoader() {
void PpapiBlinkPlatformImpl::GetPluginList(
bool refresh,
......@@ -329,12 +329,12 @@ index 6c24359..279edb2 100644
blink::WebPluginListBuilder* builder) {
NOTREACHED();
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h
index afcf809..1c9af66 100644
index 097b5eb..34e5937 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.h
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -45,6 +45,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebThemeEngine* ThemeEngine() override;
blink::WebURLLoader* CreateURLLoader() override;
std::unique_ptr<blink::WebURLLoader> CreateURLLoader() override;
void GetPluginList(bool refresh,
+ bool isMainFrame,
const blink::WebSecurityOrigin& mainFrameOrigin,
......@@ -365,10 +365,10 @@ index 3b610b1..7c439e0 100644
WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.cc content/public/renderer/content_renderer_client.cc
index d29d85f..6c32ef2 100644
index 5d42160..8e2027e 100644
--- content/public/renderer/content_renderer_client.cc
+++ content/public/renderer/content_renderer_client.cc
@@ -97,7 +97,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() {
return false;
}
......@@ -376,7 +376,7 @@ index d29d85f..6c32ef2 100644
bool ContentRendererClient::HandleNavigation(
RenderFrame* render_frame,
bool is_content_initiated,
@@ -110,6 +109,7 @@ bool ContentRendererClient::HandleNavigation(
@@ -111,6 +110,7 @@ bool ContentRendererClient::HandleNavigation(
return false;
}
......@@ -385,10 +385,10 @@ index d29d85f..6c32ef2 100644
return false;
}
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index d544fb7..260079c 100644
index 097e8c0..2e85b99 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -197,7 +197,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -195,7 +195,6 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
......@@ -396,7 +396,7 @@ index d544fb7..260079c 100644
// TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351
@@ -213,6 +212,7 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -211,6 +210,7 @@ class CONTENT_EXPORT ContentRendererClient {
blink::WebNavigationPolicy default_policy,
bool is_redirect);
......@@ -405,10 +405,10 @@ index d544fb7..260079c 100644
// built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 6922b94..473d148 100644
index f68037c..2b6155e 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -2795,7 +2795,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -2798,7 +2798,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type;
bool found = false;
Send(new FrameHostMsg_GetPluginInfo(
......@@ -418,7 +418,7 @@ index 6922b94..473d148 100644
params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found)
return NULL;
@@ -5364,9 +5365,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -5354,9 +5355,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0]));
......@@ -430,7 +430,7 @@ index 6922b94..473d148 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -5379,7 +5379,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -5369,7 +5369,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
}
return blink::kWebNavigationPolicyIgnore;
}
......@@ -439,10 +439,10 @@ index 6922b94..473d148 100644
Referrer referrer(
RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 4ba0c48..46f2afde 100644
index 4f920ce..4cd548c 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -737,6 +737,7 @@ blink::WebMIDIAccessor* RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -736,6 +736,7 @@ blink::WebMIDIAccessor* RendererBlinkPlatformImpl::CreateMIDIAccessor(
void RendererBlinkPlatformImpl::GetPluginList(
bool refresh,
......@@ -450,7 +450,7 @@ index 4ba0c48..46f2afde 100644
const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) {
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -744,7 +745,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
@@ -743,7 +744,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
if (!plugin_refresh_allowed_)
refresh = false;
RenderThread::Get()->Send(
......@@ -461,10 +461,10 @@ index 4ba0c48..46f2afde 100644
builder->AddPlugin(WebString::FromUTF16(plugin.name),
WebString::FromUTF16(plugin.desc),
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 19306df..a731786 100644
index ff5ee76..f570e2a 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -121,6 +121,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -122,6 +122,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
cc::FrameSinkId GenerateFrameSinkId() override;
void GetPluginList(bool refresh,
......
......@@ -146,28 +146,28 @@ index b64f74f..0c3c22e 100644
struct Data;
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
index 14debac..c25c653 100644
index c769efe..daec6cd 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -78,7 +78,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
@@ -89,7 +89,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! This method may be called from any thread.
void ReportPending();
void ReportPending(const UUID& report_uuid);
- private:
+ protected:
//! \brief The result code from UploadReport().
enum class UploadResult {
//! \brief The crash report was uploaded successfully.
@@ -101,7 +101,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! \brief Obtains all pending reports from the database, and calls
//! ProcessPendingReport() to process each one.
@@ -117,7 +117,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! object was constructed with \a watch_pending_reports, it will also scan
//! the crash report database for other pending reports, and process those as
//! well.
- void ProcessPendingReports();
+ virtual void ProcessPendingReports();
//! \brief Processes a single pending report from the database.
//!
@@ -115,7 +115,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
@@ -131,7 +131,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
//! remain in the “pending” state. If the upload fails and no more retries are
//! desired, or report upload is disabled, it will be marked as “completed” in
//! the database without ever having been uploaded.
......@@ -177,7 +177,7 @@ index 14debac..c25c653 100644
//! \brief Attempts to upload a crash report.
//!
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
index 641bf0f..3a86eb3 100644
index e6d05e2..ef20683 100644
--- third_party/crashpad/crashpad/handler/handler_main.cc
+++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -35,8 +35,10 @@
......@@ -191,7 +191,7 @@ index 641bf0f..3a86eb3 100644
#include "client/crash_report_database.h"
#include "client/crashpad_client.h"
#include "client/crashpad_info.h"
@@ -75,6 +77,10 @@
@@ -76,6 +78,10 @@
#include "util/win/session_end_watcher.h"
#endif // OS_MACOSX
......@@ -202,8 +202,8 @@ index 641bf0f..3a86eb3 100644
namespace crashpad {
namespace {
@@ -144,6 +150,9 @@ struct Options {
bool monitor_self;
@@ -147,6 +153,9 @@ struct Options {
bool periodic_tasks;
bool rate_limit;
bool upload_gzip;
+ int max_uploads;
......@@ -212,7 +212,7 @@ index 641bf0f..3a86eb3 100644
};
// Splits |key_value| on '=' and inserts the resulting key and value into |map|.
@@ -425,6 +434,9 @@ int HandlerMain(int argc,
@@ -430,6 +439,9 @@ int HandlerMain(int argc,
kOptionResetOwnCrashExceptionPortToSystemDefault,
#endif // OS_MACOSX
kOptionURL,
......@@ -222,7 +222,7 @@ index 641bf0f..3a86eb3 100644
// Standard options.
kOptionHelp = -2,
@@ -470,6 +482,9 @@ int HandlerMain(int argc,
@@ -476,6 +488,9 @@ int HandlerMain(int argc,
{"url", required_argument, nullptr, kOptionURL},
{"help", no_argument, nullptr, kOptionHelp},
{"version", no_argument, nullptr, kOptionVersion},
......@@ -232,7 +232,7 @@ index 641bf0f..3a86eb3 100644
{nullptr, 0, nullptr, 0},
};
@@ -564,6 +579,27 @@ int HandlerMain(int argc,
@@ -575,6 +590,27 @@ int HandlerMain(int argc,
options.url = optarg;
break;
}
......@@ -260,7 +260,7 @@ index 641bf0f..3a86eb3 100644
case kOptionHelp: {
Usage(me);
MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly);
@@ -721,12 +757,19 @@ int HandlerMain(int argc,
@@ -734,17 +770,25 @@ int HandlerMain(int argc,
// TODO(scottmg): options.rate_limit should be removed when we have a
// configurable database setting to control upload limiting.
// See https://crashpad.chromium.org/bug/23.
......@@ -269,15 +269,21 @@ index 641bf0f..3a86eb3 100644
+ database.get(), options.url, options.rate_limit, options.upload_gzip,
+ options.max_uploads);
+#else
CrashReportUploadThread upload_thread(
database.get(), options.url, options.rate_limit, options.upload_gzip);
CrashReportUploadThread upload_thread(database.get(),
options.url,
options.periodic_tasks,
options.rate_limit,
options.upload_gzip);
+#endif
upload_thread.Start();
PruneCrashReportThread prune_thread(database.get(),
- PruneCondition::GetDefault());
+ PruneCondition::GetDefault(options.max_database_size,
+ options.max_database_age));
prune_thread.Start();
std::unique_ptr<PruneCrashReportThread> prune_thread;
if (options.periodic_tasks) {
prune_thread.reset(new PruneCrashReportThread(
- database.get(), PruneCondition::GetDefault()));
+ database.get(),
+ PruneCondition::GetDefault(options.max_database_size,
+ options.max_database_age)));
prune_thread->Start();
}
CrashReportExceptionHandler exception_handler(database.get(),
......@@ -14,10 +14,10 @@ index e9ad038..2a10c80 100644
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 3192cd0..39b1518 100644
index 8e3a3d8..3838670 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -73,6 +73,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -75,6 +75,11 @@ class BlobHandleImpl : public BlobHandle {
ChromeBlobStorageContext::ChromeBlobStorageContext() {}
......@@ -30,10 +30,10 @@ index 3192cd0..39b1518 100644
BrowserContext* context) {
if (!context->GetUserData(kBlobStorageContextKeyName)) {
diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
index 4c7cfac..4d5c09c 100644
index ad4a2a2..7c4212c 100644
--- content/browser/blob_storage/chrome_blob_storage_context.h
+++ content/browser/blob_storage/chrome_blob_storage_context.h
@@ -43,6 +43,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -45,6 +45,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
public:
ChromeBlobStorageContext();
......@@ -42,10 +42,10 @@ index 4c7cfac..4d5c09c 100644
BrowserContext* browser_context);
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index b7a99d5..b9f70ea 100644
index c5410b5..873429c 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -114,7 +114,14 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -116,7 +116,14 @@ StoragePartition* GetStoragePartitionFromConfig(
if (browser_context->IsOffTheRecord())
in_memory = true;
......@@ -61,9 +61,9 @@ index b7a99d5..b9f70ea 100644
}
void SaveSessionStateOnIOThread(
@@ -505,6 +512,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
: nullptr;
}
@@ -510,6 +517,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
BrowserContext::BrowserContext()
: media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {}
+// static
+const void* BrowserContext::GetStoragePartitionMapUserDataKey() {
......@@ -91,7 +91,7 @@ index 242d33e..4dfb463 100644
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 9986ff6..0d2abbd 100644
index 1884d92..26697d1 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -661,7 +661,7 @@ void RenderProcessHostImpl::EarlyZygoteLaunch() {
......@@ -166,7 +166,7 @@ index 9986ff6..0d2abbd 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1065,10 +1083,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1064,10 +1082,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
......@@ -179,7 +179,7 @@ index 9986ff6..0d2abbd 100644
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
AddFilter(resource_message_filter_.get());
@@ -1092,10 +1110,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1091,10 +1109,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
AddFilter(new AppCacheDispatcherHost(
......@@ -192,7 +192,7 @@ index 9986ff6..0d2abbd 100644
#if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(
@@ -1135,13 +1153,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1133,13 +1151,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
new CacheStorageDispatcherHost();
......@@ -208,7 +208,7 @@ index 9986ff6..0d2abbd 100644
AddFilter(service_worker_filter.get());
AddFilter(new SharedWorkerMessageFilter(
@@ -1149,12 +1166,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1147,12 +1164,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
WorkerStoragePartition(
storage_partition_impl_->GetURLRequestContext(),
storage_partition_impl_->GetMediaURLRequestContext(),
......@@ -224,7 +224,7 @@ index 9986ff6..0d2abbd 100644
base::Bind(&RenderWidgetHelper::GetNextRoutingID,
base::Unretained(widget_helper_.get()))));
@@ -1170,11 +1187,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1168,11 +1185,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
GetID(), storage_partition_impl_->GetQuotaManager(),
GetContentClient()->browser()->CreateQuotaPermissionContext()));
......@@ -237,7 +237,7 @@ index 9986ff6..0d2abbd 100644
resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get());
@@ -1191,6 +1205,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1189,6 +1203,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
void RenderProcessHostImpl::RegisterMojoInterfaces() {
auto registry = base::MakeUnique<service_manager::BinderRegistry>();
......@@ -249,7 +249,7 @@ index 9986ff6..0d2abbd 100644
channel_->AddAssociatedInterfaceForIOThread(
base::Bind(&IndexedDBDispatcherHost::AddBinding,
base::Unretained(indexed_db_factory_.get())));
@@ -1252,8 +1271,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -1250,8 +1269,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
AddUIThreadInterface(
registry.get(),
base::Bind(&PlatformNotificationContextImpl::CreateService,
......@@ -268,7 +268,7 @@ index 9986ff6..0d2abbd 100644
return;
service_worker_ref_count_ = 0;
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index aa6898d..f19264e 100644
index 72df666..eb1965f 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -75,7 +75,6 @@ class RenderWidgetHost;
......@@ -288,7 +288,7 @@ index aa6898d..f19264e 100644
bool is_for_guests_only);
~RenderProcessHostImpl() override;
@@ -516,10 +515,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -513,10 +512,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;
......@@ -378,19 +378,19 @@ index 075ae3e..57fb5fd 100644
void InitializeOnIOThread();
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 89461da..619996f 100644
index 7bc69b6..785c17e 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -171,6 +171,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
static ServiceManagerConnection* GetServiceManagerConnectionFor(
BrowserContext* browser_context);
@@ -174,6 +174,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext();
+ static const void* GetStoragePartitionMapUserDataKey();
+
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -246,6 +248,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -249,6 +251,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;
......
......@@ -114,10 +114,10 @@ index d114946..30f4283 100644
if (style_ == STYLE_BUTTON && PlatformStyle::kDefaultLabelButtonHasBoldFont) {
// Some text appears wider when rendered normally than when rendered bold.
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 762227f..18a7293 100644
index 182d335..cc32568 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -27,6 +27,7 @@
@@ -26,6 +26,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/text_elider.h"
......@@ -125,10 +125,10 @@ index 762227f..18a7293 100644
#include "ui/native_theme/native_theme.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/background.h"
@@ -36,6 +37,25 @@
#include "ui/views/selection_controller.h"
@@ -44,6 +45,25 @@ gfx::Insets NonBorderInsets(const Label& label) {
}
} // namespace
namespace views {
+
+namespace {
+
......@@ -148,10 +148,10 @@ index 762227f..18a7293 100644
+
+} // namespace
+
// static
const char Label::kViewClassName[] = "Label";
const int Label::kFocusBorderPadding = 1;
@@ -215,6 +235,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
Label::Label() : Label(base::string16()) {
@@ -221,6 +241,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
ResetLayout();
}