Tom Callaway
7 years ago
parent
b899d5f427
commit
5479a8c69a
@ -0,0 +1,33 @@
|
||||
diff -up chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h.gcc-full-decl chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h
|
||||
--- chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h.gcc-full-decl 2018-04-25 16:29:52.372692179 -0400
|
||||
+++ chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h 2018-04-25 16:31:15.698058409 -0400
|
||||
@@ -21,9 +21,9 @@
|
||||
#include "services/preferences/public/mojom/preferences.mojom.h"
|
||||
#include "services/preferences/tracked/hash_store_contents.h"
|
||||
#include "services/preferences/tracked/interceptable_pref_filter.h"
|
||||
+#include "services/preferences/tracked/pref_hash_store.h"
|
||||
#include "services/preferences/tracked/tracked_preference.h"
|
||||
|
||||
-class PrefHashStore;
|
||||
class PrefService;
|
||||
|
||||
namespace base {
|
||||
diff -up chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.gcc-full-decl chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h
|
||||
--- chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.gcc-full-decl 2018-04-17 21:05:12.000000000 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h 2018-04-25 16:29:52.373692159 -0400
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include "modules/webdatabase/DatabaseBasicTypes.h"
|
||||
+#include "modules/webdatabase/SQLError.h"
|
||||
#include "modules/webdatabase/SQLStatement.h"
|
||||
#include "modules/webdatabase/SQLStatementBackend.h"
|
||||
#include "modules/webdatabase/SQLTransactionStateMachine.h"
|
||||
@@ -41,7 +42,6 @@
|
||||
namespace blink {
|
||||
|
||||
class Database;
|
||||
-class SQLErrorData;
|
||||
class SQLiteTransaction;
|
||||
class SQLTransaction;
|
||||
class SQLTransactionBackend;
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc.flatsetfix chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
||||
--- chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc.flatsetfix 2018-04-30 14:22:23.997461566 -0400
|
||||
+++ chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-04-30 14:22:51.867920383 -0400
|
||||
@@ -368,7 +368,7 @@ SupervisedUserURLFilter::GetFilteringBeh
|
||||
|
||||
// Allow navigations to whitelisted origins (currently families.google.com).
|
||||
static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins(
|
||||
- {GURL(kFamiliesUrl).GetOrigin()});
|
||||
+ base::flat_set<GURL>({GURL(kFamiliesUrl).GetOrigin()}));
|
||||
if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin()))
|
||||
return ALLOW;
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
diff -up chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h
|
||||
--- chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider 2018-04-25 16:33:40.872222779 -0400
|
||||
+++ chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h 2018-04-25 16:37:23.175883637 -0400
|
||||
@@ -11,13 +11,13 @@
|
||||
#include "base/callback_forward.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/policy/core/browser/configuration_policy_handler_list.h"
|
||||
+#include "components/policy/core/common/configuration_policy_provider.h"
|
||||
#include "components/policy/core/common/schema.h"
|
||||
#include "components/policy/core/common/schema_registry.h"
|
||||
#include "components/policy/policy_export.h"
|
||||
|
||||
namespace policy {
|
||||
|
||||
-class ConfigurationPolicyProvider;
|
||||
class PolicyService;
|
||||
class PolicyServiceImpl;
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider.cc.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider.cc
|
||||
--- chromium-66.0.3359.117/cc/raster/playback_image_provider.cc.copycon 2018-04-23 13:22:43.109126071 -0400
|
||||
+++ chromium-66.0.3359.117/cc/raster/playback_image_provider.cc 2018-04-23 13:23:55.761704938 -0400
|
||||
@@ -20,7 +20,7 @@ void UnrefImageFromCache(DrawImage draw_
|
||||
PlaybackImageProvider::PlaybackImageProvider(
|
||||
ImageDecodeCache* cache,
|
||||
const gfx::ColorSpace& target_color_space,
|
||||
- base::Optional<Settings> settings)
|
||||
+ base::Optional<Settings>&& settings)
|
||||
: cache_(cache),
|
||||
target_color_space_(target_color_space),
|
||||
settings_(std::move(settings)) {
|
||||
@@ -70,7 +70,10 @@ PlaybackImageProvider::GetDecodedDrawIma
|
||||
}
|
||||
|
||||
PlaybackImageProvider::Settings::Settings() = default;
|
||||
-PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
|
||||
+PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) =
|
||||
+ default;
|
||||
PlaybackImageProvider::Settings::~Settings() = default;
|
||||
+PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=(
|
||||
+ PlaybackImageProvider::Settings&&) = default;
|
||||
|
||||
} // namespace cc
|
||||
diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider.h.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider.h
|
||||
--- chromium-66.0.3359.117/cc/raster/playback_image_provider.h.copycon 2018-04-23 13:24:07.699471148 -0400
|
||||
+++ chromium-66.0.3359.117/cc/raster/playback_image_provider.h 2018-04-23 13:24:57.080506348 -0400
|
||||
@@ -20,8 +20,10 @@ class CC_EXPORT PlaybackImageProvider :
|
||||
public:
|
||||
struct CC_EXPORT Settings {
|
||||
Settings();
|
||||
- Settings(const Settings& other);
|
||||
+ Settings(const Settings&) = delete;
|
||||
+ Settings(Settings&&);
|
||||
~Settings();
|
||||
+ Settings& operator=(Settings&&);
|
||||
|
||||
// The set of image ids to skip during raster.
|
||||
PaintImageIdFlatSet images_to_skip;
|
||||
@@ -34,7 +36,7 @@ class CC_EXPORT PlaybackImageProvider :
|
||||
// If no settings are provided, all images are skipped during rasterization.
|
||||
PlaybackImageProvider(ImageDecodeCache* cache,
|
||||
const gfx::ColorSpace& target_color_space,
|
||||
- base::Optional<Settings> settings);
|
||||
+ base::Optional<Settings>&& settings);
|
||||
~PlaybackImageProvider() override;
|
||||
|
||||
PlaybackImageProvider(PlaybackImageProvider&& other);
|
||||
diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider_unittest.cc.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider_unittest.cc
|
||||
@ -0,0 +1,45 @@
|
||||
diff -up chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc.gccomove chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc
|
||||
--- chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc.gccomove 2018-04-23 12:53:32.419477463 -0400
|
||||
+++ chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc 2018-04-23 12:54:02.497887258 -0400
|
||||
@@ -639,7 +639,7 @@ AppCacheRequestHandler::MaybeCreateSubre
|
||||
|
||||
SubresourceLoaderParams params;
|
||||
params.loader_factory_info = factory_ptr.PassInterface();
|
||||
- return params;
|
||||
+ return base::Optional<SubresourceLoaderParams>(std::move(params));
|
||||
}
|
||||
|
||||
void AppCacheRequestHandler::MaybeCreateSubresourceLoader(
|
||||
diff -up chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc.gccomove chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc
|
||||
--- chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc.gccomove 2018-04-23 12:54:16.614610083 -0400
|
||||
+++ chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-04-23 12:54:38.401182827 -0400
|
||||
@@ -271,7 +271,7 @@ ServiceWorkerControlleeRequestHandler::M
|
||||
controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle(
|
||||
provider_host_->controller());
|
||||
params.controller_service_worker_info = std::move(controller_info);
|
||||
- return params;
|
||||
+ return base::Optional<SubresourceLoaderParams>(std::move(params));
|
||||
}
|
||||
|
||||
void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
|
||||
diff -up chromium-66.0.3359.117/device/fido/device_response_converter.cc.gccomove chromium-66.0.3359.117/device/fido/device_response_converter.cc
|
||||
--- chromium-66.0.3359.117/device/fido/device_response_converter.cc.gccomove 2018-04-23 12:54:51.452926482 -0400
|
||||
+++ chromium-66.0.3359.117/device/fido/device_response_converter.cc 2018-04-23 12:55:24.248283058 -0400
|
||||
@@ -121,7 +121,7 @@ base::Optional<AuthenticatorGetAssertion
|
||||
response.SetNumCredentials(it->second.GetUnsigned());
|
||||
}
|
||||
|
||||
- return response;
|
||||
+ return base::Optional<AuthenticatorGetAssertionResponse>(std::move(response));
|
||||
}
|
||||
|
||||
base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse(
|
||||
@@ -241,7 +241,7 @@ base::Optional<AuthenticatorGetInfoRespo
|
||||
response.SetPinProtocols(std::move(supported_pin_protocols));
|
||||
}
|
||||
|
||||
- return response;
|
||||
+ return base::Optional<AuthenticatorGetInfoResponse>(std::move(response));
|
||||
}
|
||||
|
||||
} // namespace device
|
||||
@ -0,0 +1,53 @@
|
||||
diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS
|
||||
--- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS.944404 2018-04-23 14:18:43.702116916 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS 2018-04-23 14:19:05.854680223 -0400
|
||||
@@ -16,6 +16,7 @@ include_rules = [
|
||||
"+base/process/process_metrics.h",
|
||||
"+base/rand_util.h",
|
||||
"+base/strings",
|
||||
+ "+base/template_util.h",
|
||||
"+base/threading/thread_checker.h",
|
||||
"+base/time/time.h",
|
||||
"+base/tuple.h",
|
||||
diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h
|
||||
--- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h.944404 2018-04-23 14:20:05.718499685 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h 2018-04-23 14:20:18.165253615 -0400
|
||||
@@ -6,6 +6,7 @@
|
||||
#define Optional_h
|
||||
|
||||
#include "base/optional.h"
|
||||
+#include "platform/wtf/TemplateUtil.h"
|
||||
|
||||
namespace WTF {
|
||||
|
||||
diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h
|
||||
--- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.944404 2018-04-23 14:20:31.660987877 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h 2018-04-23 14:21:40.276637297 -0400
|
||||
@@ -0,0 +1,27 @@
|
||||
+// Copyright 2018 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.
|
||||
+
|
||||
+#ifndef TemplateUtil_h
|
||||
+#define TemplateUtil_h
|
||||
+
|
||||
+#include "base/template_util.h"
|
||||
+#include "platform/wtf/Vector.h"
|
||||
+
|
||||
+namespace base {
|
||||
+
|
||||
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7
|
||||
+// Workaround for g++7 and earlier family.
|
||||
+// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this
|
||||
+// Optional<WTF::Vector<T>> where T is non-copyable causes a compile error.
|
||||
+// As we know it is not trivially copy constructible, explicitly declare so.
|
||||
+//
|
||||
+// It completes the declaration in base/template_util.h that was provided
|
||||
+// for std::vector
|
||||
+template <typename T>
|
||||
+struct is_trivially_copy_constructible<WTF::Vector<T>> : std::false_type {};
|
||||
+#endif
|
||||
+
|
||||
+} // namespace base
|
||||
+
|
||||
+#endif // TemplateUtil_h
|
||||
@ -0,0 +1,272 @@
|
||||
diff -up chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/__init__.py.missing chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/__init__.py
|
||||
--- chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/__init__.py.missing 2018-04-19 09:51:46.165723235 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/__init__.py 2018-04-19 09:51:46.171723115 -0400
|
||||
@@ -0,0 +1,3 @@
|
||||
+# Copyright 2017 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.
|
||||
diff -up chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter.py.missing chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter.py
|
||||
--- chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter.py.missing 2018-04-19 09:51:46.171723115 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter.py 2018-04-19 09:51:46.172723095 -0400
|
||||
@@ -0,0 +1,110 @@
|
||||
+# Copyright 2017 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.
|
||||
+# pylint: disable=import-error,print-statement,relative-import
|
||||
+import re
|
||||
+SPECIAL_TOKENS = [
|
||||
+ # This list should be sorted by length.
|
||||
+ 'CString',
|
||||
+ 'Float32',
|
||||
+ 'Float64',
|
||||
+ 'Base64',
|
||||
+ 'IFrame',
|
||||
+ 'Latin1',
|
||||
+ 'PlugIn',
|
||||
+ 'SQLite',
|
||||
+ 'Uint16',
|
||||
+ 'Uint32',
|
||||
+ 'WebGL2',
|
||||
+ 'ASCII',
|
||||
+ 'CType',
|
||||
+ 'DList',
|
||||
+ 'Int16',
|
||||
+ 'Int32',
|
||||
+ 'MPath',
|
||||
+ 'OList',
|
||||
+ 'TSpan',
|
||||
+ 'UList',
|
||||
+ 'UTF16',
|
||||
+ 'Uint8',
|
||||
+ 'WebGL',
|
||||
+ 'XPath',
|
||||
+ 'ETC1',
|
||||
+ 'HTML',
|
||||
+ 'Int8',
|
||||
+ 'S3TC',
|
||||
+ 'SPv2',
|
||||
+ 'UTF8',
|
||||
+ 'API',
|
||||
+ 'CSS',
|
||||
+ 'DOM',
|
||||
+ 'EXT',
|
||||
+ 'RTC',
|
||||
+ 'SVG',
|
||||
+ '2D',
|
||||
+ 'AX',
|
||||
+ 'V0',
|
||||
+ 'V8',
|
||||
+]
|
||||
+MATCHING_EXPRESSION = '((?:[A-Z][a-z]+)|[0-9]D?$)'
|
||||
+class SmartTokenizer(object):
|
||||
+ """Detects special cases that are not easily discernible without additional
|
||||
+ knowledge, such as recognizing that in SVGSVGElement, the first two SVGs
|
||||
+ are separate tokens, but WebGL is one token."""
|
||||
+ def __init__(self, name):
|
||||
+ self.remaining = name
|
||||
+ def tokenize(self):
|
||||
+ name = self.remaining
|
||||
+ tokens = []
|
||||
+ while len(name) > 0:
|
||||
+ matched_token = None
|
||||
+ for token in SPECIAL_TOKENS:
|
||||
+ if name.startswith(token):
|
||||
+ matched_token = token
|
||||
+ break
|
||||
+ if not matched_token:
|
||||
+ match = re.search(MATCHING_EXPRESSION, name)
|
||||
+ if not match:
|
||||
+ matched_token = name
|
||||
+ elif match.start(0) != 0:
|
||||
+ matched_token = name[:match.start(0)]
|
||||
+ else:
|
||||
+ matched_token = match.group(0)
|
||||
+ tokens.append(name[:len(matched_token)])
|
||||
+ name = name[len(matched_token):]
|
||||
+ return tokens
|
||||
+class NameStyleConverter(object):
|
||||
+ """Converts names from camelCase to various other styles.
|
||||
+ """
|
||||
+ def __init__(self, name):
|
||||
+ self.tokens = self.tokenize(name)
|
||||
+ def tokenize(self, name):
|
||||
+ tokenizer = SmartTokenizer(name)
|
||||
+ return tokenizer.tokenize()
|
||||
+ def to_snake_case(self):
|
||||
+ """Snake case is the file and variable name style per Google C++ Style
|
||||
+ Guide:
|
||||
+ https://google.github.io/styleguide/cppguide.html#Variable_Names
|
||||
+ Also known as the hacker case.
|
||||
+ https://en.wikipedia.org/wiki/Snake_case
|
||||
+ """
|
||||
+ return '_'.join([token.lower() for token in self.tokens])
|
||||
+ def to_upper_camel_case(self):
|
||||
+ """Upper-camel case is the class and function name style per
|
||||
+ Google C++ Style Guide:
|
||||
+ https://google.github.io/styleguide/cppguide.html#Function_Names
|
||||
+ Also known as the PascalCase.
|
||||
+ https://en.wikipedia.org/wiki/Camel_case.
|
||||
+ """
|
||||
+ return ''.join([token[0].upper() + token[1:] for token in self.tokens])
|
||||
+ def to_macro_case(self):
|
||||
+ """Macro case is the macro name style per Google C++ Style Guide:
|
||||
+ https://google.github.io/styleguide/cppguide.html#Macro_Names
|
||||
+ """
|
||||
+ return '_'.join([token.upper() for token in self.tokens])
|
||||
+ def to_all_cases(self):
|
||||
+ return {
|
||||
+ 'snake_case': self.to_snake_case(),
|
||||
+ 'upper_camel_case': self.to_upper_camel_case(),
|
||||
+ 'macro_case': self.to_macro_case(),
|
||||
+ }
|
||||
diff -up chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter_test.py.missing chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter_test.py
|
||||
--- chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter_test.py.missing 2018-04-19 09:51:46.172723095 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/blink/tools/blinkpy/common/name_style_converter_test.py 2018-04-19 09:51:46.173723075 -0400
|
||||
@@ -0,0 +1,140 @@
|
||||
+# Copyright 2017 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.
|
||||
+# pylint: disable=import-error,print-statement,relative-import,protected-access
|
||||
+"""Unit tests for name_style_converter.py."""
|
||||
+import unittest
|
||||
+from name_style_converter import NameStyleConverter
|
||||
+from name_style_converter import SmartTokenizer
|
||||
+class SmartTokenizerTest(unittest.TestCase):
|
||||
+ def test_simple_cases(self):
|
||||
+ tokenizer = SmartTokenizer('foo')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['foo'])
|
||||
+ tokenizer = SmartTokenizer('fooBar')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['foo', 'Bar'])
|
||||
+ tokenizer = SmartTokenizer('fooBarBaz')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['foo', 'Bar', 'Baz'])
|
||||
+ tokenizer = SmartTokenizer('Baz')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Baz'])
|
||||
+ tokenizer = SmartTokenizer('')
|
||||
+ self.assertEqual(tokenizer.tokenize(), [])
|
||||
+ tokenizer = SmartTokenizer('FOO')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['FOO'])
|
||||
+ tokenizer = SmartTokenizer('foo2')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['foo', '2'])
|
||||
+ def test_tricky_cases(self):
|
||||
+ tokenizer = SmartTokenizer('XMLHttpRequest')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['XML', 'Http', 'Request'])
|
||||
+ tokenizer = SmartTokenizer('HTMLElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('WebGLRenderingContext')
|
||||
+ self.assertEqual(tokenizer.tokenize(),
|
||||
+ ['WebGL', 'Rendering', 'Context'])
|
||||
+ tokenizer = SmartTokenizer('CanvasRenderingContext2D')
|
||||
+ self.assertEqual(tokenizer.tokenize(),
|
||||
+ ['Canvas', 'Rendering', 'Context', '2D'])
|
||||
+ tokenizer = SmartTokenizer('CanvasRenderingContext2DAPITest')
|
||||
+ self.assertEqual(tokenizer.tokenize(),
|
||||
+ ['Canvas', 'Rendering', 'Context', '2D', 'API', 'Test'])
|
||||
+ tokenizer = SmartTokenizer('SVGSVGElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SVG', 'SVG', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('CanvasRenderingContext2D')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Canvas', 'Rendering', 'Context', '2D'])
|
||||
+ tokenizer = SmartTokenizer('CSSURLImageValue')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['CSS', 'URL', 'Image', 'Value'])
|
||||
+ tokenizer = SmartTokenizer('CSSPropertyAPID')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['CSS', 'Property', 'API', 'D'])
|
||||
+ tokenizer = SmartTokenizer('AXARIAGridCell')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['AX', 'ARIA', 'Grid', 'Cell'])
|
||||
+ tokenizer = SmartTokenizer('CDATASection')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['CDATA', 'Section'])
|
||||
+ tokenizer = SmartTokenizer('ASCIICType')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['ASCII', 'CType'])
|
||||
+ tokenizer = SmartTokenizer('CString')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['CString'])
|
||||
+ tokenizer = SmartTokenizer('HTMLDListElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'DList', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('HTMLOListElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'OList', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('HTMLIFrameElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'IFrame', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('HTMLPlugInElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'PlugIn', 'Element'])
|
||||
+ # No special handling for OptGroup, FieldSet, and TextArea.
|
||||
+ tokenizer = SmartTokenizer('HTMLOptGroupElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'Opt', 'Group', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('HTMLFieldSetElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'Field', 'Set', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('HTMLTextAreaElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['HTML', 'Text', 'Area', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('Path2D')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Path', '2D'])
|
||||
+ tokenizer = SmartTokenizer('Point2D')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Point', '2D'])
|
||||
+ tokenizer = SmartTokenizer('CanvasRenderingContext2DState')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Canvas', 'Rendering', 'Context', '2D', 'State'])
|
||||
+ tokenizer = SmartTokenizer('RTCDTMFSender')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['RTC', 'DTMF', 'Sender'])
|
||||
+ tokenizer = SmartTokenizer('WebGLCompressedTextureS3TCsRGB')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['WebGL', 'Compressed', 'Texture', 'S3TC', 'sRGB'])
|
||||
+ tokenizer = SmartTokenizer('WebGL2CompressedTextureETC1')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['WebGL2', 'Compressed', 'Texture', 'ETC1'])
|
||||
+ tokenizer = SmartTokenizer('EXTsRGB')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['EXT', 'sRGB'])
|
||||
+ tokenizer = SmartTokenizer('SVGFEBlendElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SVG', 'FE', 'Blend', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('SVGMPathElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SVG', 'MPath', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('SVGTSpanElement')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SVG', 'TSpan', 'Element'])
|
||||
+ tokenizer = SmartTokenizer('SVGURIReference')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SVG', 'URI', 'Reference'])
|
||||
+ tokenizer = SmartTokenizer('UTF16TextIterator')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['UTF16', 'Text', 'Iterator'])
|
||||
+ tokenizer = SmartTokenizer('UTF8Decoder')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['UTF8', 'Decoder'])
|
||||
+ tokenizer = SmartTokenizer('Uint8Array')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Uint8', 'Array'])
|
||||
+ tokenizer = SmartTokenizer('DOMWindowBase64')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['DOM', 'Window', 'Base64'])
|
||||
+ tokenizer = SmartTokenizer('TextCodecLatin1')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Text', 'Codec', 'Latin1'])
|
||||
+ tokenizer = SmartTokenizer('V8BindingForCore')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['V8', 'Binding', 'For', 'Core'])
|
||||
+ tokenizer = SmartTokenizer('V8DOMRect')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['V8', 'DOM', 'Rect'])
|
||||
+ tokenizer = SmartTokenizer('V0InsertionPoint')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['V0', 'Insertion', 'Point'])
|
||||
+ tokenizer = SmartTokenizer('ShadowDOMV0Test')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Shadow', 'DOM', 'V0', 'Test'])
|
||||
+ tokenizer = SmartTokenizer('ElementShadowV0')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Element', 'Shadow', 'V0'])
|
||||
+ tokenizer = SmartTokenizer('StubChromeClientForSPv2')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Stub', 'Chrome', 'Client', 'For', 'SPv2'])
|
||||
+ tokenizer = SmartTokenizer('SQLiteAuthorizer')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['SQLite', 'Authorizer'])
|
||||
+ tokenizer = SmartTokenizer('XPathEvaluator')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['XPath', 'Evaluator'])
|
||||
+ tokenizer = SmartTokenizer('IsXHTMLDocument')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Is', 'XHTML', 'Document'])
|
||||
+ tokenizer = SmartTokenizer('Animation.idl')
|
||||
+ self.assertEqual(tokenizer.tokenize(), ['Animation', '.idl'])
|
||||
+class NameStyleConverterTest(unittest.TestCase):
|
||||
+ def test_snake_case(self):
|
||||
+ converter = NameStyleConverter('HTMLElement')
|
||||
+ self.assertEqual(converter.to_snake_case(), 'html_element')
|
||||
+ def test_upper_camel_case(self):
|
||||
+ converter = NameStyleConverter('someSuperThing')
|
||||
+ self.assertEqual(converter.to_upper_camel_case(), 'SomeSuperThing')
|
||||
+ converter = NameStyleConverter('SVGElement')
|
||||
+ self.assertEqual(converter.to_upper_camel_case(), 'SVGElement')
|
||||
+ def test_macro_case(self):
|
||||
+ converter = NameStyleConverter('WebGLBaz2D')
|
||||
+ self.assertEqual(converter.to_macro_case(), 'WEBGL_BAZ_2D')
|
||||
+ def test_all_cases(self):
|
||||
+ converter = NameStyleConverter('SVGScriptElement')
|
||||
+ self.assertEqual(converter.to_all_cases(), {
|
||||
+ 'snake_case': 'svg_script_element',
|
||||
+ 'upper_camel_case': 'SVGScriptElement',
|
||||
+ 'macro_case': 'SVG_SCRIPT_ELEMENT',
|
||||
+ })
|
||||
diff -up chromium-66.0.3359.117/third_party/blink/tools/blinkpy/__init__.py.missing chromium-66.0.3359.117/third_party/blink/tools/blinkpy/__init__.py
|
||||
--- chromium-66.0.3359.117/third_party/blink/tools/blinkpy/__init__.py.missing 2018-04-19 11:34:40.621293007 -0400
|
||||
+++ chromium-66.0.3359.117/third_party/blink/tools/blinkpy/__init__.py 2018-04-19 11:34:34.440413163 -0400
|
||||
@@ -0,0 +1,3 @@
|
||||
+# Copyright 2017 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.
|
||||
@ -0,0 +1,16 @@
|
||||
diff -up chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn.nounrar chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn
|
||||
--- chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn.nounrar 2018-04-25 12:17:13.858139109 -0400
|
||||
+++ chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn 2018-04-25 12:19:53.639532053 -0400
|
||||
@@ -27,9 +27,9 @@ source_set("cpp") {
|
||||
}
|
||||
|
||||
#TODO(crbug/750327): This dependency is here temporarily.
|
||||
- deps = [
|
||||
- "//third_party/unrar:unrar",
|
||||
- ]
|
||||
+ # deps = [
|
||||
+ # "//third_party/unrar:unrar",
|
||||
+ # ]
|
||||
|
||||
public_deps += [ "//chrome/common/safe_browsing" ]
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang chromium-66.0.3359.117/build/config/clang/clang.gni
|
||||
--- chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang 2018-04-18 12:08:45.658190297 -0400
|
||||
+++ chromium-66.0.3359.117/build/config/clang/clang.gni 2018-04-18 12:09:37.612032982 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import("//build/toolchain/toolchain.gni")
|
||||
|
||||
-default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
|
||||
+default_clang_base_path = "/usr"
|
||||
|
||||
declare_args() {
|
||||
# Indicates if the build should use the Chrome-specific plugins for enforcing
|
||||
@ -1,2 +1,3 @@
|
||||
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
|
||||
SHA512 (chromium-65.0.3325.181-clean.tar.xz) = 12a0bb9e367c628c0db80503f6b0570b5ba95fc766c7a782dc7a98290d3b6c13aa5a3f91c4874e98287ca2fafb41af5db34fb951d06594b369baf29c98ed2846
|
||||
SHA512 (chromium-66.0.3359.139-clean.tar.xz) = 580ec80e3300d356e83407e3d663d0a1f4d5963c6ef6baa7870883bfa3340c3684dfa7bf3cc25e1ab95afb4084b15f7cc08ce555cbb5298422fa4ae790d06735
|
||||
|
||||
Loading…
Reference in new issue