Skip to content

Commit

Permalink
Merge branch 'master' of https://chromium.googlesource.com/chromium/src…
Browse files Browse the repository at this point in the history 
… into master.lion
  • Loading branch information
bluebox authored and bluebox committed Jan 21, 2021
2 parents 76c64c1 + 401eec6 commit d2322b1
Show file tree
Hide file tree
Showing 1,255 changed files with 16,998 additions and 12,679 deletions.
22 changes: 11 additions & 11 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,27 +199,27 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': 'dd069a9188cc3700d56cabf54e032351340a23b1',
'skia_revision': '87a055b02027f07e86fae81798c8274c31584c2d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
'v8_revision': 'f9759b6f3a4521d370e66aec8240fcc731cd8fdd',
'v8_revision': '099b043d6e4380fa1e8167b30fc5be827bbb0762',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
'swarming_revision': '1a072711d4388c62e02480fabc26c68c24494be9',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ANGLE
# and whatever else without interference from each other.
'angle_revision': 'bb3adfa42822d73420ca6a8e96863dcb6a35fc65',
'angle_revision': 'f28a06ba7281d8456d8ba0b8de4054d55e3b77f5',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling SwiftShader
# and whatever else without interference from each other.
'swiftshader_revision': '1d5174b9dc3be500d63daf227b163b5e86bbc7b5',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other.
'pdfium_revision': '7acbae90a490507ec9b9d966cf58de45b7ec3298',
'pdfium_revision': '561f5af9ef1e208c3c6170f8ec1907856593dc3a',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
Expand Down Expand Up @@ -278,7 +278,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling devtools-frontend
# and whatever else without interference from each other.
'devtools_frontend_revision': '3195d3ea0758fa04ca6cbad72de0dad1e526409d',
'devtools_frontend_revision': 'f9033fa039cd83621e98074ebb390a36bfbfbc6a',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libprotobuf-mutator
# and whatever else without interference from each other.
Expand Down Expand Up @@ -318,7 +318,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'dawn_revision': '762814bd922932d3d9da9b220463b6ce5f167d76',
'dawn_revision': 'ef869c2d01d5241ba8d16e6863e8595bc1fac9fd',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
Expand Down Expand Up @@ -892,12 +892,12 @@ deps = {

# For Linux and Chromium OS.
'src/third_party/cros_system_api': {
'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'adce67ac57ed882a52d04d4838677834b337ee56',
'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '1ee85a708f6a96e4123fe7825d283dbae5c50c47',
'condition': 'checkout_linux',
},

'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '13ea7423612a0766371b1920b15c2273c9c22880',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'af0dca3dc983cc8e3b4506c7a5e563fab3169475',

'src/third_party/devtools-frontend/src':
Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
Expand Down Expand Up @@ -1273,7 +1273,7 @@ deps = {
},

'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '477bd92472cc77f4579076921ec180b2cea594b2',
Var('android_git') + '/platform/external/perfetto.git' + '@' + '3b349f3ea9c0d6f865e46e42e9949ac261f26518',

'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
Expand Down Expand Up @@ -1515,7 +1515,7 @@ deps = {
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '3c2fe3888658d82b47ca831d59a2e07579619c2d',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '0be1846477949c472a7a2bf42134a7bb08570ac4',
Var('webrtc_git') + '/src.git' + '@' + 'a7e34d33fe70363acdabd41fe14f91469cdc1619',

'src/third_party/libgifcodec':
Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'),
Expand Down Expand Up @@ -1587,7 +1587,7 @@ deps = {
Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'),

'src-internal': {
'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@ec4d81245d2c688f7ea9fed56962dc90be87e68a',
'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@d5c88e60cff4a2c5197925a727ee03f7beb76f00',
'condition': 'checkout_src_internal',
},

Expand Down
3 changes: 1 addition & 2 deletions WATCHLISTS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2570,8 +2570,7 @@
'ios_flags': ['[email protected]'],
'ios_showcase': ['[email protected]',
'[email protected]'],
'ios_web': ['[email protected]',
'[email protected]'],
'ios_web': ['[email protected]'],
'ios_widget_kit': ['[email protected]'],
'language': ['[email protected]'],
'libaom': ['[email protected]',
Expand Down
9 changes: 7 additions & 2 deletions android_webview/browser/aw_content_browser_client.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "base/path_service.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool/thread_pool_instance.h"
#include "build/build_config.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
#include "components/cdm/browser/cdm_message_filter_android.h"
Expand Down Expand Up @@ -765,8 +766,12 @@ bool AwContentBrowserClient::ShouldOverrideUrlLoading(
url, has_user_gesture, is_redirect, is_main_frame, ignore_navigation);
}

bool AwContentBrowserClient::ShouldCreateThreadPool() {
return g_should_create_thread_pool;
bool AwContentBrowserClient::CreateThreadPool(base::StringPiece name) {
if (g_should_create_thread_pool) {
base::ThreadPoolInstance::Create(name);
return true;
}
return false;
}

std::unique_ptr<content::LoginDelegate>
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/aw_content_browser_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
bool is_main_frame,
ui::PageTransition transition,
bool* ignore_navigation) override;
bool ShouldCreateThreadPool() override;
bool CreateThreadPool(base::StringPiece name) override;
std::unique_ptr<content::LoginDelegate> CreateLoginDelegate(
const net::AuthChallengeInfo& auth_info,
content::WebContents* web_contents,
Expand Down
17 changes: 13 additions & 4 deletions android_webview/browser/aw_content_browser_client_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "android_webview/browser/aw_content_browser_client.h"

#include "android_webview/browser/aw_feature_list_creator.h"
#include "base/task/thread_pool/thread_pool_instance.h"
#include "base/test/task_environment.h"
#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand All @@ -16,17 +17,25 @@ class AwContentBrowserClientTest : public testing::Test {
void SetUp() override {
mojo::core::Init();
}

base::test::TaskEnvironment task_environment_;
};

TEST_F(AwContentBrowserClientTest, DisableCreatingThreadPool) {
AwFeatureListCreator aw_feature_list_creator;
AwContentBrowserClient client(&aw_feature_list_creator);
EXPECT_TRUE(client.ShouldCreateThreadPool());
EXPECT_TRUE(client.CreateThreadPool("Hello"));
EXPECT_TRUE(base::ThreadPoolInstance::Get());

// Have to start the threed pool to shut it down, have to shut it down to
// destroy it.
base::ThreadPoolInstance::Get()->Start(
base::ThreadPoolInstance::InitParams(1));
base::ThreadPoolInstance::Get()->Shutdown();
base::ThreadPoolInstance::Get()->JoinForTesting();
base::ThreadPoolInstance::Set(nullptr);

AwContentBrowserClient::DisableCreatingThreadPool();
EXPECT_FALSE(client.ShouldCreateThreadPool());
EXPECT_FALSE(client.CreateThreadPool("Hello"));
EXPECT_FALSE(base::ThreadPoolInstance::Get());
}

} // namespace android_webview
7 changes: 5 additions & 2 deletions android_webview/browser/safe_browsing/aw_safe_browsing_blocking_page.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "components/safe_browsing/content/browser/threat_details.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/common/safebrowsing_constants.h"
#include "components/safe_browsing/core/common/utils.h"
#include "components/safe_browsing/core/features.h"
#include "components/safe_browsing/core/triggers/trigger_manager.h"
#include "components/security_interstitials/content/security_interstitial_controller_client.h"
Expand Down Expand Up @@ -94,8 +95,10 @@ AwSafeBrowsingBlockingPage* AwSafeBrowsingBlockingPage::CreateBlockingPage(
const UnsafeResource& unsafe_resource,
std::unique_ptr<AwWebResourceRequest> resource_request) {
// Log the resource type that triggers the safe browsing blocking page.
UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.BlockingPage.ResourceType",
unsafe_resource.resource_type);
UMA_HISTOGRAM_ENUMERATION(
"SafeBrowsing.BlockingPage.ResourceType",
safe_browsing::GetResourceTypeFromRequestDestination(
unsafe_resource.request_destination));
const UnsafeResourceList unsafe_resources{unsafe_resource};
AwBrowserContext* browser_context =
AwBrowserContext::FromWebContents(web_contents);
Expand Down
5 changes: 5 additions & 0 deletions ash/shortcut_viewer/strings/shortcut_viewer_strings_bn.xtb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<translation id="169515659049020177">Shift</translation>
<translation id="1732295673545939435"><ph name="MODIFIER1" /><ph name="SEPARATOR1" /><ph name="MODIFIER2" /><ph name="SEPARATOR2" /><ph name="KEY" /></translation>
<translation id="1733525068429116555">অ্যাড্রেস বারে আপনার ইনপুটে www. এবং .com যোগ করে পৃষ্ঠা খুলুন</translation>
<translation id="1768987374400973299">স্ক্রিনশন নিন/রেকর্ডিং করুন</translation>
<translation id="1872219238824176091">বর্তমান ডেস্কটি সরিয়ে দিন</translation>
<translation id="1920446759863417809"><ph name="SHIFT1" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" />, তারপর <ph name="SHIFT2" /><ph name="SEPARATOR3" /><ph name="TAB" /> অথবা <ph name="LEFT" /></translation>
<translation id="1996162290124031907">পরের ট্যাবে যান</translation>
Expand Down Expand Up @@ -110,6 +111,7 @@
<translation id="4801989101741319327">পরের শব্দের শেষে নিয়ে যান</translation>
<translation id="4866066940972151697">ডানদিকের ডেস্কটি চালু করুন</translation>
<translation id="4916163929714267752">একটি নতুন উইন্ডোতে লিঙ্কটি খুলুন</translation>
<translation id="492453977506755176">'ক্যাপচার মোড' কী</translation>
<translation id="5030659775136592441">বুকমার্ক পরিচালক দেখান</translation>
<translation id="5034421018520995080">পৃষ্ঠার উপরে যান</translation>
<translation id="5042305953558921026">এক নজরে দেখার বোতাম</translation>
Expand All @@ -132,6 +134,7 @@
<translation id="5899919361772749550">ডেভেলপার টুল কনসোল দেখান অথবা লুকান</translation>
<translation id="5919628958418675842">গোপনীয়তা স্ক্রিন চালু বা বন্ধ করুন</translation>
<translation id="5921745308587794300">উইন্ডো ঘোরান</translation>
<translation id="5926306472221400972">ফুল স্ক্রিনের স্ক্রিনশট নিন</translation>
<translation id="6022924867608035986">সার্চ বক্সের টেক্সট সাফ করুন</translation>
<translation id="6045998054441862242">উচ্চ কনট্রাস্ট মোড চালু করুন</translation>
<translation id="6052614013050385269">একটি লিঙ্কে রাইট ক্লিক করুন</translation>
Expand All @@ -149,6 +152,7 @@
<translation id="6445033640292336367">ট্যাবটিকে তার আসল অবস্থানে ফেরত নিয়ে যান</translation>
<translation id="6474744297082284761">জুম কমান (যখন ডক করা থাকে বা ফুলস্ক্রিন ম্যাগনিফায়ার চালু থাকে)</translation>
<translation id="649811797655257835">ফাইল বেছে নিয়ে <ph name="SPACE" /> টিপুন</translation>
<translation id="6551886416582667425">আংশিক স্ক্রিনশট/রেকর্ডিং নিন</translation>
<translation id="6556040137485212400">যে উইন্ডোটি সবথেকে বেশিক্ষণ ব্যবহার করা হয়নি সেটিতে যান</translation>
<translation id="666343722268997814">হাইলাইট করা আইটেমের জন্য রাইট ক্লিক মেনু খুলুন</translation>
<translation id="6671538777808758331">আপনার সার্চের জন্য পরের ম্যাচে যান</translation>
Expand All @@ -175,6 +179,7 @@
<translation id="7611271430932669992">পপআপ এবং ডায়ালগগুলিতে ফোকাস সরান</translation>
<translation id="7635348532214572995">অ্যাপ গ্রিডে একটি অ্যাপ আইকন সরান</translation>
<translation id="766326951329901120">ক্লিপবোর্ড থেকে সাধারণ টেক্সট হিসেবে কন্টেন্ট পেস্ট করুন</translation>
<translation id="7673453620027697230">উইন্ডো স্ক্রিনশট নিন/উইন্ডো রেকর্ডিং করুন</translation>
<translation id="7703010453515335249">বাঁদিকের ব্র্যাকেট দেওয়ার বোতাম</translation>
<translation id="7724603315864178912">কাটুন</translation>
<translation id="7730490981846175479"><ph name="SHIFT" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" />, তারপর <ph name="SPACE" /> অথবা <ph name="ENTER" /></translation>
Expand Down
5 changes: 5 additions & 0 deletions ash/shortcut_viewer/strings/shortcut_viewer_strings_es.xtb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<translation id="169515659049020177">Mayús</translation>
<translation id="1732295673545939435"><ph name="MODIFIER1" /><ph name="SEPARATOR1" /><ph name="MODIFIER2" /><ph name="SEPARATOR2" /><ph name="KEY" /></translation>
<translation id="1733525068429116555">Añadir www. y .com al texto introducido en la barra de direcciones y abrir la página</translation>
<translation id="1768987374400973299">Hacer una captura/grabación de pantalla</translation>
<translation id="1872219238824176091">Quitar el escritorio actual</translation>
<translation id="1920446759863417809"><ph name="SHIFT1" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> y <ph name="SHIFT2" /><ph name="SEPARATOR3" /><ph name="TAB" /> o <ph name="LEFT" /></translation>
<translation id="1996162290124031907">Ir a la siguiente pestaña</translation>
Expand Down Expand Up @@ -110,6 +111,7 @@
<translation id="4801989101741319327">Desplazarse al final de la siguiente palabra</translation>
<translation id="4866066940972151697">Activar el escritorio de la derecha</translation>
<translation id="4916163929714267752">Abrir el enlace en una ventana nueva</translation>
<translation id="492453977506755176">Tecla de modo de captura</translation>
<translation id="5030659775136592441">Mostrar administrador de marcadores</translation>
<translation id="5034421018520995080">Ir a la parte superior de la página</translation>
<translation id="5042305953558921026">Tecla del modo de vista general</translation>
Expand All @@ -132,6 +134,7 @@
<translation id="5899919361772749550">Mostrar u ocultar la consola de herramientas para desarrolladores</translation>
<translation id="5919628958418675842">Activar o desactivar la pantalla de privacidad</translation>
<translation id="5921745308587794300">Girar la ventana</translation>
<translation id="5926306472221400972">Hacer captura de pantalla completa</translation>
<translation id="6022924867608035986">Borrar el texto del cuadro de búsqueda</translation>
<translation id="6045998054441862242">Activar el modo de contraste alto</translation>
<translation id="6052614013050385269">Hacer clic con el botón derecho en un enlace</translation>
Expand All @@ -149,6 +152,7 @@
<translation id="6445033640292336367">Volver a colocar la pestaña en su posición original</translation>
<translation id="6474744297082284761">Reducir (si la lupa fijada o la lupa de pantalla completa están habilitadas)</translation>
<translation id="649811797655257835">Selecciona el archivo y pulsa <ph name="SPACE" /></translation>
<translation id="6551886416582667425">Hacer una captura/grabación de pantalla parcial</translation>
<translation id="6556040137485212400">Abrir la ventana que lleva más tiempo sin usarse</translation>
<translation id="666343722268997814">Abrir el menú del botón derecho del elemento destacado</translation>
<translation id="6671538777808758331">Ir al siguiente resultado de búsqueda</translation>
Expand All @@ -175,6 +179,7 @@
<translation id="7611271430932669992">Mover el enfoque a ventanas emergentes y cuadros de diálogo</translation>
<translation id="7635348532214572995">Mover un icono de aplicación dentro de la cuadrícula de aplicaciones</translation>
<translation id="766326951329901120">Pegar el contenido del portapapeles como texto sin formato</translation>
<translation id="7673453620027697230">Hacer una captura/grabación de una ventana</translation>
<translation id="7703010453515335249">corchete izquierdo</translation>
<translation id="7724603315864178912">Cortar</translation>
<translation id="7730490981846175479"><ph name="SHIFT" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> y <ph name="SPACE" /> o <ph name="ENTER" /></translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/shortcut_viewer/strings/shortcut_viewer_strings_fr-CA.xtb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<translation id="6445033640292336367">Retourner un onglet à sa position d'origine</translation>
<translation id="6474744297082284761">Zoom arrière (lorsque l'appareil est installé sur la station d'accueil OU lorsque la loupe en mode plein écran est activée)</translation>
<translation id="649811797655257835">Sélectionnez le fichier, puis appuyez sur <ph name="SPACE" /></translation>
<translation id="6551886416582667425">Prendre une capture ou un enregistrement partiel</translation>
<translation id="6551886416582667425">Faire une capture ou un enregistrement partiel</translation>
<translation id="6556040137485212400">Ouvrir la fenêtre qui est restée inutilisée le plus longtemps</translation>
<translation id="666343722268997814">Ouvrir le menu contextuel pour l'élément en évidence</translation>
<translation id="6671538777808758331">Passer au prochain résultat de la recherche</translation>
Expand Down
Loading

0 comments on commit d2322b1

Please sign in to comment.