Merge from Chromium at DEPS revision 39.0.2171.38

This commit was generated by merge_to_master.py.

Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e

4 files changed, 19 insertions, 1 deletions

diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_cast_off.png
index 050022d2fe..e16f58e57a 100644
--- a/content/app/resources/default_100_percent/mediaplayer_cast_off.png
+++ b/content/app/resources/default_100_percent/mediaplayer_cast_off.png
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index c311dfd234..2fa4b469a9 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -18,6 +18,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/iat_patch_function.h"
+#include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
@@ -603,6 +604,20 @@ bool ShouldUseDirectWrite() {
     return true;
 #endif
 
+  // We have logic in renderer_font_platform_win.cc for falling back to safe
+  // font list if machine has more than 1750 fonts installed. Users have
+  // complained about this as safe font list is usually not sufficient.
+  // We now disable direct write (gdi) if we encounter more number
+  // of fonts than a threshold (currently 1750).
+  // Refer: crbug.com/421305
+  const wchar_t kWindowsFontsRegistryKey[] =
+      L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
+  base::win::RegistryValueIterator reg_iterator(HKEY_LOCAL_MACHINE,
+                                                kWindowsFontsRegistryKey);
+  const DWORD kMaxAllowedFontsBeforeFallbackToGDI = 1750;
+  if (reg_iterator.ValueCount() >= kMaxAllowedFontsBeforeFallbackToGDI)
+    return false;
+
   // Otherwise, check the field trial.
   const std::string group_name =
       base::FieldTrialList::FindFullName("DirectWrite");
diff --git a/content/public/android/java/res/drawable-xxxhdpi/pageinfo_warning_major.png b/content/public/android/java/res/drawable-xxxhdpi/pageinfo_warning_major.png
new file mode 100644
index 0000000000..4429ad5505
--- /dev/null
+++ b/content/public/android/java/res/drawable-xxxhdpi/pageinfo_warning_major.png
diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc
index 9f86e6b514..28c9cde651 100644
--- a/content/renderer/pepper/ppb_var_deprecated_impl.cc
+++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc
@@ -290,7 +290,10 @@ bool IsInstanceOfDeprecated(PP_Var var,
     return false;  // Not an object at all.
 
   v8::HandleScope handle_scope(object->instance()->GetIsolate());
-  v8::Context::Scope context_scope(object->instance()->GetMainWorldContext());
+  v8::Handle<v8::Context> context = object->instance()->GetMainWorldContext();
+  if (context.IsEmpty())
+    return false;
+  v8::Context::Scope context_scope(context);
   PluginObject* plugin_object = PluginObject::FromV8Object(
       object->instance()->GetIsolate(), object->GetHandle());
   if (plugin_object && plugin_object->ppp_class() == ppp_class) {