Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
patch updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@bridiver
bridiver committed Mar 31, 2017
1 parent 1ccbb15 commit bea705d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 131 deletions.
4 changes: 4 additions & 0 deletions chromium_src/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,10 @@ source_set("tab_manager") {
configs += [ ":chromium_src_config" ]
include_dirs = [ "." ] # force this to appear before the chromium src dir
sources = [
"//chrome/browser/engagement/site_engagement_metrics.cc",
"//chrome/browser/engagement/site_engagement_metrics.h",
"//chrome/browser/engagement/site_engagement_score.cc",
"//chrome/browser/engagement/site_engagement_score.h",
"chrome/browser/engagement/site_engagement_service.cc",
"chrome/browser/lifetime/application_lifetime.cc",
"//chrome/browser/memory/oom_memory_details.cc",
Expand Down
14 changes: 14 additions & 0 deletions chromium_src/chrome/browser/engagement/site_engagement_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

#include "chrome/browser/engagement/site_engagement_service.h"

#include "base/memory/ptr_util.h"
#include "base/time/clock.h"
#include "base/time/default_clock.h"
#include "chrome/browser/engagement/site_engagement_score.h"

// static
bool SiteEngagementService::IsEnabled() {
return false;
Expand All @@ -13,3 +18,12 @@ bool SiteEngagementService::IsEnabled() {
SiteEngagementService* SiteEngagementService::Get(Profile* profile) {
return nullptr;
}

// static
double SiteEngagementService::GetScoreFromSettings(
HostContentSettingsMap* settings,
const GURL& origin) {
auto clock = base::MakeUnique<base::DefaultClock>();
return SiteEngagementScore(clock.get(), origin, settings)
.GetScore();
}
145 changes: 14 additions & 131 deletions patches/master_patch.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ index b77fbdeea3cd28ead065828c3fffb19496f80ab8..86aad8c1312e801ff64a81b11700d3a4
}

diff --git a/chrome/browser/memory/tab_manager.cc b/chrome/browser/memory/tab_manager.cc
index 6c2cf66a1aba3f71310e4e3317e849839d3b0e0b..af107629afbea2e9c13686765cace0e55c70c4f4 100644
index 6c2cf66a1aba3f71310e4e3317e849839d3b0e0b..cd3976a461838a710a72543399351af296435414 100644
--- a/chrome/browser/memory/tab_manager.cc
+++ b/chrome/browser/memory/tab_manager.cc
@@ -786,6 +786,17 @@ void TabManager::PurgeAndSuspendBackgroundedTabs() {
Expand Down Expand Up @@ -196,15 +196,6 @@ index 6c2cf66a1aba3f71310e4e3317e849839d3b0e0b..af107629afbea2e9c13686765cace0e5
// Copy over the state from the navigation controller to preserve the
// back/forward history and to continue to display the correct title/favicon.
null_contents->GetController().CopyStateFrom(old_contents->GetController());
@@ -818,7 +829,7 @@ WebContents* TabManager::DiscardWebContentsAt(int index, TabStripModel* model) {

// Replace the discarded tab with the null version.
model->ReplaceWebContentsAt(index, null_contents);
- // Mark the tab so it will reload when clicked on.
+ // Mark the tab so it will reload when clicked on
GetWebContentsData(null_contents)->SetDiscardState(true);
GetWebContentsData(null_contents)->IncrementDiscardCount();

@@ -826,7 +837,8 @@ WebContents* TabManager::DiscardWebContentsAt(int index, TabStripModel* model) {
// TODO(jamescook): This breaks script connections with other tabs.
// Find a different approach that doesn't do that, perhaps based on navigation
Expand All @@ -216,7 +207,7 @@ index 6c2cf66a1aba3f71310e4e3317e849839d3b0e0b..af107629afbea2e9c13686765cace0e5

return null_contents;
diff --git a/chrome/browser/memory/tab_manager.h b/chrome/browser/memory/tab_manager.h
index 55b6d1d98314f0adcdd087b0c64379b453df24e5..4c72b67644434ed82e94c94dea57f8dffd5cf4a4 100644
index 55b6d1d98314f0adcdd087b0c64379b453df24e5..7ec61a93f6195a5c7cd059ea5662376453fb0934 100644
--- a/chrome/browser/memory/tab_manager.h
+++ b/chrome/browser/memory/tab_manager.h
@@ -181,6 +181,7 @@ class TabManager : public TabStripModelObserver {
Expand All @@ -227,125 +218,18 @@ index 55b6d1d98314f0adcdd087b0c64379b453df24e5..4c72b67644434ed82e94c94dea57f8df

// Called by WebContentsData whenever the discard state of a WebContents
// changes, so that observers can be informed.
@@ -331,6 +332,11 @@ class TabManager : public TabStripModelObserver {
// Returns true if tabs can be discarded only once.
bool CanOnlyDiscardOnce();
@@ -285,6 +286,11 @@ class TabManager : public TabStripModelObserver {
// Purges and suspends renderers in backgrounded tabs.
void PurgeAndSuspendBackgroundedTabs();

+ // MUON(bridiver): override to create/destroy guests webcontents
+ virtual content::WebContents* CreateNullContents(
+ TabStripModel* model, content::WebContents* old_contents);
+ virtual void DestroyOldContents(content::WebContents* old_contents);
+
// Timer to periodically update the stats of the renderers.
base::RepeatingTimer update_timer_;

diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 1783a101aa024a5aa39a7bd7c335427398d47093..ac11311d78e2271f9ca7f6016c79a37de078621c 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -12,7 +12,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/engagement/site_engagement_service.h"
+// #include "chrome/browser/engagement/site_engagement_service.h"
#include "chrome/browser/plugins/flash_temporary_permission_tracker.h"
#include "chrome/browser/plugins/plugin_finder.h"
#include "chrome/browser/plugins/plugin_metadata.h"
@@ -227,20 +227,20 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
settings_map, main_frame_origin, plugin_content_url, &is_managed);
flash_setting = PluginsFieldTrial::EffectiveContentSetting(
settings_map, CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
- double engagement = SiteEngagementService::GetScoreFromSettings(
- settings_map, main_frame_origin.GetURL());
+ // double engagement = SiteEngagementService::GetScoreFromSettings(
+ // settings_map, main_frame_origin.GetURL());

if (flash_setting == CONTENT_SETTING_ALLOW) {
- UMA_HISTOGRAM_COUNTS_100(kEngagementSettingAllowedHistogram, engagement);
+ // UMA_HISTOGRAM_COUNTS_100(kEngagementSettingAllowedHistogram, engagement);
return true;
}

if (flash_setting == CONTENT_SETTING_BLOCK) {
- UMA_HISTOGRAM_COUNTS_100(kEngagementSettingBlockedHistogram, engagement);
+ // UMA_HISTOGRAM_COUNTS_100(kEngagementSettingBlockedHistogram, engagement);
return false;
}

- UMA_HISTOGRAM_COUNTS_100(kEngagementNoSettingHistogram, engagement);
+ // UMA_HISTOGRAM_COUNTS_100(kEngagementNoSettingHistogram, engagement);

// If the content setting is being managed by enterprise policy and is an
// ASK setting, we check to see if it has been temporarily granted.
@@ -253,8 +253,8 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
// check whether the site meets the engagement cutoff for making Flash
// available without a prompt.This should only happen if the setting isn't
// being enforced by an enterprise policy.
- if (engagement < PluginsFieldTrial::GetSiteEngagementThresholdForFlash())
- return false;
+ // if (engagement < PluginsFieldTrial::GetSiteEngagementThresholdForFlash())
+ // return false;
}

return true;
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index 75a6fda631f1af6039c7497e1a373a58c04e412c..b0c991f0383cb7d6d0a1af9c56e159a0dfc9521f 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc
@@ -115,29 +115,29 @@ static void SendPluginAvailabilityUMA(const std::string& mime_type,
void ReportMetrics(const std::string& mime_type,
const GURL& url,
const url::Origin& main_frame_origin) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
- if (chrome::IsIncognitoSessionActive())
- return;
- rappor::RapporServiceImpl* rappor_service =
- g_browser_process->rappor_service();
- if (!rappor_service)
- return;
- if (main_frame_origin.unique())
- return;
-
- if (mime_type == content::kFlashPluginSwfMimeType ||
- mime_type == content::kFlashPluginSplMimeType) {
- rappor_service->RecordSampleString(
- "Plugins.FlashOriginUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
- net::registry_controlled_domains::GetDomainAndRegistry(
- main_frame_origin.GetURL(),
- net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
- rappor_service->RecordSampleString(
- "Plugins.FlashUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
- net::registry_controlled_domains::GetDomainAndRegistry(
- url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
- }
+ // DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+ // if (chrome::IsIncognitoSessionActive())
+ // return;
+ // rappor::RapporServiceImpl* rappor_service =
+ // g_browser_process->rappor_service();
+ // if (!rappor_service)
+ // return;
+ // if (main_frame_origin.unique())
+ // return;
+
+ // if (mime_type == content::kFlashPluginSwfMimeType ||
+ // mime_type == content::kFlashPluginSplMimeType) {
+ // rappor_service->RecordSampleString(
+ // "Plugins.FlashOriginUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
+ // net::registry_controlled_domains::GetDomainAndRegistry(
+ // main_frame_origin.GetURL(),
+ // net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
+ // rappor_service->RecordSampleString(
+ // "Plugins.FlashUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
+ // net::registry_controlled_domains::GetDomainAndRegistry(
+ // url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
+ // }
}

#if BUILDFLAG(ENABLE_EXTENSIONS)
// Does the actual discard by destroying the WebContents in |model| at |index|
// and replacing it by an empty one. Returns the new WebContents or NULL if
// the operation fails (return value used only in testing).
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index 33ada8ce7b315e2bd327883bc682e5527ff0696e..b2381424d5ac18e5d09f77e3f4bcb2487311b494 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
Expand Down Expand Up @@ -2301,17 +2185,17 @@ index 00a8accbe2cdc3c77c6fce3fd28cd697ff0524d5..8a9cf6907b0d27cb5b1a7fd8eed00500
is_elastic_overscroll_enabled_ = false;
#endif
diff --git a/extensions/browser/guest_view/extensions_guest_view_manager_delegate.cc b/extensions/browser/guest_view/extensions_guest_view_manager_delegate.cc
index 061480b5acd6431aa9abb7e02c98ebe5e881d7f9..cb06be194f24f5b7865874101da696b8f168c3ab 100644
index 061480b5acd6431aa9abb7e02c98ebe5e881d7f9..f8288fa42f148651fd729dbce111c6c4151fe2b0 100644
--- a/extensions/browser/guest_view/extensions_guest_view_manager_delegate.cc
+++ b/extensions/browser/guest_view/extensions_guest_view_manager_delegate.cc
@@ -53,8 +53,8 @@ void ExtensionsGuestViewManagerDelegate::DispatchEvent(
@@ -53,8 +53,10 @@ void ExtensionsGuestViewManagerDelegate::DispatchEvent(
// extensions::events::HistogramValue as an argument.
events::HistogramValue histogram_value =
guest_view_events::GetEventHistogramValue(event_name);
- DCHECK_NE(events::UNKNOWN, histogram_value) << "Event " << event_name
- << " must have a histogram value";
+ // DCHECK_NE(events::UNKNOWN, histogram_value) << "Event " << event_name
+ // << " must have a histogram value";
+#ifdef MUON_CHROMIUM_BUILD
DCHECK_NE(events::UNKNOWN, histogram_value) << "Event " << event_name
<< " must have a histogram value";
+#endif

content::WebContents* owner = guest->owner_web_contents();
if (!owner)
Expand All @@ -2334,7 +2218,6 @@ index 57c9a2e6a43558e2325a76b5b147a3c7e2b99fd3..5ee029882c5ecf0104f83ee61e4a0ba7
@@ -510,6 +513,7 @@
"internal": true,
"contexts": ["webui"],
+ // MUON(bridiver): creating new histograms is a pain
"matches": [
+ "chrome://brave/*",
"chrome://chrome-signin/*",
Expand Down

0 comments on commit bea705d

Please sign in to comment.