Google Git
Sign in
chromium / chromium / src / c105f1574d..a86731ee4f / .
diff --git a/DEPS b/DEPS
index 6334c5a..213efd7 100644
--- a/DEPS
+++ b/DEPS

@@ -96,7 +96,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '0146f4833cb3c65b3792e756676909648961cdaa',
+  'catapult_revision': '4137a086a82579f1191177e1c6ea722e03489b03',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.

diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index ccf7878f..4b9547c2 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc

@@ -89,8 +89,8 @@
     session_params.testing_fixed_https_port =
         reference_params->testing_fixed_https_port;
     session_params.enable_http2 = reference_params->enable_http2;
-    session_params.enable_http2_alternative_service_with_different_host =
-        reference_params->enable_http2_alternative_service_with_different_host;
+    session_params.enable_http2_alternative_service =
+        reference_params->enable_http2_alternative_service;
     session_params.enable_quic_alternative_service_with_different_host =
         reference_params->enable_quic_alternative_service_with_different_host;
   }

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 254e5442..1828d6f 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc

@@ -119,7 +119,7 @@
       enable_http2(true),
       spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize),
       time_func(&base::TimeTicks::Now),
-      enable_http2_alternative_service_with_different_host(false),
+      enable_http2_alternative_service(false),
       enable_quic_alternative_service_with_different_host(true),
       enable_quic(false),
       mark_quic_broken_when_network_blackholes(false),

diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index b6f367f..acd61d32 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h

@@ -111,9 +111,8 @@
     SettingsMap http2_settings;
     // Source of time for SPDY connections.
     SpdySessionPool::TimeFunc time_func;
-    // Whether to enable HTTP/2 Alt-Svc entries with hostname different than
-    // that of the origin.
-    bool enable_http2_alternative_service_with_different_host;
+    // Whether to enable HTTP/2 Alt-Svc entries.
+    bool enable_http2_alternative_service;
     // Whether to enable QUIC Alt-Svc entries with hostname different than that
     // of the origin.
     bool enable_quic_alternative_service_with_different_host;

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index e95ab37..226b77ef 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc

@@ -398,7 +398,7 @@
             HttpNetworkSession::NORMAL_SOCKET_POOL)),
         old_max_pool_sockets_(ClientSocketPoolManager::max_sockets_per_pool(
             HttpNetworkSession::NORMAL_SOCKET_POOL)) {
-    session_deps_.enable_http2_alternative_service_with_different_host = true;
+    session_deps_.enable_http2_alternative_service = true;
   }
 
   struct SimpleGetHelperResult {
@@ -10162,12 +10162,11 @@
   EXPECT_TRUE(alternative_service_vector.empty());
 }
 
-// HTTP/2 Alternative Services should be disabled if alternative service
-// hostname is different from that of origin.
+// HTTP/2 Alternative Services should be disabled by default.
 // TODO(bnc): Remove when https://crbug.com/615413 is fixed.
 TEST_F(HttpNetworkTransactionTest,
        DisableHTTP2AlternativeServicesWithDifferentHost) {
-  session_deps_.enable_http2_alternative_service_with_different_host = false;
+  session_deps_.enable_http2_alternative_service = false;
 
   HttpRequestInfo request;
   request.method = "GET";

diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
index 0bbca3c..440bf4ac 100644
--- a/net/http/http_stream_factory_impl_job_controller.cc
+++ b/net/http/http_stream_factory_impl_job_controller.cc

@@ -995,7 +995,6 @@
       continue;
     }
 
-
     // Some shared unix systems may have user home directories (like
     // http://foo.com/~mike) which allow users to emit headers.  This is a bad
     // idea already, but with Alternate-Protocol, it provides the ability for a
@@ -1009,11 +1008,8 @@
       continue;
 
     if (alternative_service.protocol == kProtoHTTP2) {
-      if (origin.host() != alternative_service.host &&
-          !session_->params()
-               .enable_http2_alternative_service_with_different_host) {
+      if (!session_->params().enable_http2_alternative_service)
         continue;
-      }
 
       // Cache this entry if we don't have a non-broken Alt-Svc yet.
       if (first_alternative_service.protocol == kProtoUnknown)

diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 6cb1d0c..d45a74e4 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc

@@ -347,7 +347,7 @@
       enable_server_push_cancellation(false),
       session_max_recv_window_size(kDefaultInitialWindowSize),
       time_func(&base::TimeTicks::Now),
-      enable_http2_alternative_service_with_different_host(false),
+      enable_http2_alternative_service(false),
       net_log(nullptr),
       http_09_on_non_default_ports_enabled(false),
       restrict_to_one_preconnect_for_proxies(false),
@@ -413,8 +413,8 @@
   params.http2_settings = session_deps->http2_settings;
   params.time_func = session_deps->time_func;
   params.proxy_delegate = session_deps->proxy_delegate.get();
-  params.enable_http2_alternative_service_with_different_host =
-      session_deps->enable_http2_alternative_service_with_different_host;
+  params.enable_http2_alternative_service =
+      session_deps->enable_http2_alternative_service;
   params.net_log = session_deps->net_log;
   params.http_09_on_non_default_ports_enabled =
       session_deps->http_09_on_non_default_ports_enabled;

diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index 2f104755..450167746 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h

@@ -213,7 +213,7 @@
   SettingsMap http2_settings;
   SpdySession::TimeFunc time_func;
   std::unique_ptr<ProxyDelegate> proxy_delegate;
-  bool enable_http2_alternative_service_with_different_host;
+  bool enable_http2_alternative_service;
   NetLog* net_log;
   bool http_09_on_non_default_ports_enabled;
   bool restrict_to_one_preconnect_for_proxies;

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 367e000..b66c4ed 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h

@@ -220,6 +220,10 @@
 #define SK_DISABLE_DEFERRED_PROXIES
 #endif
 
+#ifndef SK_SUPPORT_LEGACY_CANVAS_READPIXELS
+#define SK_SUPPORT_LEGACY_CANVAS_READPIXELS
+#endif
+
 #ifndef SK_LEGACY_SWEEP_GRADIENT
 #define SK_LEGACY_SWEEP_GRADIENT
 #endif

diff --git a/third_party/WebKit/Source/core/core_idl_files.gni b/third_party/WebKit/Source/core/core_idl_files.gni
index 1e40bed..66206dfe 100644
--- a/third_party/WebKit/Source/core/core_idl_files.gni
+++ b/third_party/WebKit/Source/core/core_idl_files.gni

@@ -474,7 +474,7 @@
                     "events/EventListener.idl",
                     "events/NavigatorEvents.idl",
                     "fileapi/URLFileAPI.idl",
-                    "frame/NavigatorCPU.idl",
+                    "frame/NavigatorConcurrentHardware.idl",
                     "frame/NavigatorCookies.idl",
                     "frame/NavigatorID.idl",
                     "frame/NavigatorLanguage.idl",

diff --git a/third_party/WebKit/Source/core/frame/BUILD.gn b/third_party/WebKit/Source/core/frame/BUILD.gn
index 053758e..c723c11 100644
--- a/third_party/WebKit/Source/core/frame/BUILD.gn
+++ b/third_party/WebKit/Source/core/frame/BUILD.gn

@@ -66,8 +66,8 @@
     "Location.h",
     "Navigator.cpp",
     "Navigator.h",
-    "NavigatorCPU.cpp",
-    "NavigatorCPU.h",
+    "NavigatorConcurrentHardware.cpp",
+    "NavigatorConcurrentHardware.h",
     "NavigatorID.cpp",
     "NavigatorID.h",
     "NavigatorLanguage.cpp",

diff --git a/third_party/WebKit/Source/core/frame/Navigator.h b/third_party/WebKit/Source/core/frame/Navigator.h
index 7a9b9c7e..e34774c 100644
--- a/third_party/WebKit/Source/core/frame/Navigator.h
+++ b/third_party/WebKit/Source/core/frame/Navigator.h

@@ -23,7 +23,7 @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/dom/ContextLifecycleObserver.h"
-#include "core/frame/NavigatorCPU.h"
+#include "core/frame/NavigatorConcurrentHardware.h"
 #include "core/frame/NavigatorID.h"
 #include "core/frame/NavigatorLanguage.h"
 #include "core/frame/NavigatorOnLine.h"
@@ -36,7 +36,7 @@
 class LocalFrame;
 
 class CORE_EXPORT Navigator final : public GarbageCollected<Navigator>,
-                                    public NavigatorCPU,
+                                    public NavigatorConcurrentHardware,
                                     public NavigatorID,
                                     public NavigatorLanguage,
                                     public NavigatorOnLine,

diff --git a/third_party/WebKit/Source/core/frame/Navigator.idl b/third_party/WebKit/Source/core/frame/Navigator.idl
index a229722..3b00236 100644
--- a/third_party/WebKit/Source/core/frame/Navigator.idl
+++ b/third_party/WebKit/Source/core/frame/Navigator.idl

@@ -32,7 +32,7 @@
     [MeasureAs=NavigatorVendor] readonly attribute DOMString vendor;
 };
 
-Navigator implements NavigatorCPU;
+Navigator implements NavigatorConcurrentHardware;
 Navigator implements NavigatorCookies;
 Navigator implements NavigatorID;
 Navigator implements NavigatorLanguage;

diff --git a/third_party/WebKit/Source/core/frame/NavigatorCPU.idl b/third_party/WebKit/Source/core/frame/NavigatorCPU.idl
deleted file mode 100644
index a951a1d..0000000
--- a/third_party/WebKit/Source/core/frame/NavigatorCPU.idl
+++ /dev/null

@@ -1,12 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// https://wiki.whatwg.org/wiki/Navigator_HW_Concurrency
-
-[
-    NoInterfaceObject,
-    Exposed=(Window,Worker),
-] interface NavigatorCPU {
-    readonly attribute unsigned long hardwareConcurrency;
-};

diff --git a/third_party/WebKit/Source/core/frame/NavigatorCPU.cpp b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.cpp
similarity index 71%
rename from third_party/WebKit/Source/core/frame/NavigatorCPU.cpp
rename to third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.cpp
index 5829cba..bf18f3a 100644
--- a/third_party/WebKit/Source/core/frame/NavigatorCPU.cpp
+++ b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.cpp

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/frame/NavigatorCPU.h"
+#include "core/frame/NavigatorConcurrentHardware.h"
 
 #include "public/platform/Platform.h"
 
 namespace blink {
 
-unsigned NavigatorCPU::hardwareConcurrency() const {
+unsigned NavigatorConcurrentHardware::hardwareConcurrency() const {
   return Platform::Current()->NumberOfProcessors();
 }
 

diff --git a/third_party/WebKit/Source/core/frame/NavigatorCPU.h b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.h
similarity index 63%
rename from third_party/WebKit/Source/core/frame/NavigatorCPU.h
rename to third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.h
index 7fc4db40..5aded30 100644
--- a/third_party/WebKit/Source/core/frame/NavigatorCPU.h
+++ b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NavigatorCPU_h
-#define NavigatorCPU_h
+#ifndef NavigatorConcurrentHardware_h
+#define NavigatorConcurrentHardware_h
 
 #include "core/CoreExport.h"
 
 namespace blink {
 
-class CORE_EXPORT NavigatorCPU {
+class CORE_EXPORT NavigatorConcurrentHardware {
  public:
   unsigned hardwareConcurrency() const;
 };
 
 }  // namespace blink
 
-#endif  // NavigatorCPU_h
+#endif  // NavigatorConcurrentHardware_h

diff --git a/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.idl b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.idl
new file mode 100644
index 0000000..5dfc5a9
--- /dev/null
+++ b/third_party/WebKit/Source/core/frame/NavigatorConcurrentHardware.idl

@@ -0,0 +1,12 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// https://html.spec.whatwg.org/multipage/workers.html#navigator.hardwareconcurrency
+
+[
+    NoInterfaceObject,
+    Exposed=(Window,Worker),
+] interface NavigatorConcurrentHardware {
+    readonly attribute unsigned long long hardwareConcurrency;
+};

diff --git a/third_party/WebKit/Source/core/workers/WorkerNavigator.h b/third_party/WebKit/Source/core/workers/WorkerNavigator.h
index 6bdd104..c5f23ac 100644
--- a/third_party/WebKit/Source/core/workers/WorkerNavigator.h
+++ b/third_party/WebKit/Source/core/workers/WorkerNavigator.h

@@ -28,7 +28,7 @@
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
-#include "core/frame/NavigatorCPU.h"
+#include "core/frame/NavigatorConcurrentHardware.h"
 #include "core/frame/NavigatorID.h"
 #include "core/frame/NavigatorOnLine.h"
 #include "platform/Supplementable.h"
@@ -40,7 +40,7 @@
 class CORE_EXPORT WorkerNavigator final
     : public GarbageCollectedFinalized<WorkerNavigator>,
       public ScriptWrappable,
-      public NavigatorCPU,
+      public NavigatorConcurrentHardware,
       public NavigatorID,
       public NavigatorOnLine,
       public Supplementable<WorkerNavigator> {

diff --git a/third_party/WebKit/Source/core/workers/WorkerNavigator.idl b/third_party/WebKit/Source/core/workers/WorkerNavigator.idl
index d73eec48..a9e33e9 100644
--- a/third_party/WebKit/Source/core/workers/WorkerNavigator.idl
+++ b/third_party/WebKit/Source/core/workers/WorkerNavigator.idl

@@ -33,7 +33,7 @@
 ] interface WorkerNavigator {
 };
 
-WorkerNavigator implements NavigatorCPU;
+WorkerNavigator implements NavigatorConcurrentHardware;
 WorkerNavigator implements NavigatorID;
 // TODO(foolip): WorkerNavigator implements NavigatorLanguage;
 WorkerNavigator implements NavigatorOnLine;