Update to Chromium version 66.0.3359.181

This commit is contained in:
Marshall Greenblatt 2018-05-16 19:24:12 +03:00
parent 3e1975534a
commit d49d25f881
6 changed files with 14 additions and 117 deletions

View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/66.0.3359.117',
'chromium_checkout': 'refs/tags/66.0.3359.181',
}

View File

@ -373,10 +373,4 @@ patches = [
# https://bugs.chromium.org/p/chromium/issues/detail?id=837145
'name': 'devtools_837145',
},
{
# Fix problems with Object.value/Object.entries when using defineProperty.
# https://bugs.chromium.org/p/chromium/issues/detail?id=836145
'name': 'v8_836145',
'path': 'v8/',
},
]

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 2e8e68563c3c..54a1834c6055 100644
index deb6c5322b9b..09803293be6c 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -7,6 +7,7 @@

View File

@ -93,10 +93,10 @@ index 2986bf0e340e..6ef8486960ce 100644
}
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index c9f6daa998d5..fe6465668896 100644
index 6416a4690766..e961b32a0306 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -1529,6 +1529,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -1534,6 +1534,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (GetNavigationHandle()) {
GetNavigationHandle()->set_net_error_code(
static_cast<net::Error>(params.error_code));
@ -104,7 +104,7 @@ index c9f6daa998d5..fe6465668896 100644
}
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -3280,9 +3281,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
@@ -3285,9 +3286,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
&QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_));
if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
@ -117,7 +117,7 @@ index c9f6daa998d5..fe6465668896 100644
// TODO(https://crbug.com/813479): Investigate why we need to explicitly
// specify task runner for BrowserThread::IO here.
// Bind calls to the BindRegistry should come on to the IO thread by
@@ -3556,9 +3557,9 @@ void RenderFrameHostImpl::CommitNavigation(
@@ -3561,9 +3562,9 @@ void RenderFrameHostImpl::CommitNavigation(
// however only do this for cross-document navigations, because the
// alternative would be redundant effort.
network::mojom::URLLoaderFactoryPtrInfo default_factory_info;
@ -130,7 +130,7 @@ index c9f6daa998d5..fe6465668896 100644
if (subresource_loader_params &&
subresource_loader_params->loader_factory_info.is_valid()) {
// If the caller has supplied a default URLLoaderFactory override (for
@@ -4173,8 +4174,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
@@ -4178,8 +4179,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
auto* context = GetSiteInstance()->GetBrowserContext();
GetContentClient()->browser()->WillCreateURLLoaderFactory(
this, false /* is_navigation */, &default_factory_request);

View File

@ -1,97 +0,0 @@
diff --git src/builtins/builtins-object-gen.cc src/builtins/builtins-object-gen.cc
index 1ebfbacf38..3fb8d7792d 100644
--- src/builtins/builtins-object-gen.cc
+++ src/builtins/builtins-object-gen.cc
@@ -268,7 +268,7 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
object_enum_length, IntPtrConstant(kInvalidEnumCacheSentinel));
// In case, we found enum_cache in object,
- // we use it as array_length becuase it has same size for
+ // we use it as array_length because it has same size for
// Object.(entries/values) result array object length.
// So object_enum_length use less memory space than
// NumberOfOwnDescriptorsBits value.
@@ -285,7 +285,7 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
INTPTR_PARAMETERS, kAllowLargeObjectAllocation));
// If in case we have enum_cache,
- // we can't detect accessor of object until loop through descritpros.
+ // we can't detect accessor of object until loop through descriptors.
// So if object might have accessor,
// we will remain invalid addresses of FixedArray.
// Because in that case, we need to jump to runtime call.
@@ -299,7 +299,7 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
Variable* vars[] = {&var_descriptor_number, &var_result_index};
// Let desc be ? O.[[GetOwnProperty]](key).
TNode<DescriptorArray> descriptors = LoadMapDescriptors(map);
- Label loop(this, 2, vars), after_loop(this), loop_condition(this);
+ Label loop(this, 2, vars), after_loop(this), next_descriptor(this);
Branch(IntPtrEqual(var_descriptor_number.value(), object_enum_length),
&after_loop, &loop);
@@ -316,7 +316,7 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
Node* next_key = DescriptorArrayGetKey(descriptors, descriptor_index);
// Skip Symbols.
- GotoIf(IsSymbol(next_key), &loop_condition);
+ GotoIf(IsSymbol(next_key), &next_descriptor);
TNode<Uint32T> details = TNode<Uint32T>::UncheckedCast(
DescriptorArrayGetDetails(descriptors, descriptor_index));
@@ -326,8 +326,9 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
GotoIf(IsPropertyKindAccessor(kind), if_call_runtime_with_fast_path);
CSA_ASSERT(this, IsPropertyKindData(kind));
- // If desc is not undefined and desc.[[Enumerable]] is true, then
- GotoIfNot(IsPropertyEnumerable(details), &loop_condition);
+ // If desc is not undefined and desc.[[Enumerable]] is true, then skip to
+ // the next descriptor.
+ GotoIfNot(IsPropertyEnumerable(details), &next_descriptor);
VARIABLE(var_property_value, MachineRepresentation::kTagged,
UndefinedConstant());
@@ -357,12 +358,12 @@ TNode<JSArray> ObjectEntriesValuesBuiltinsAssembler::FastGetOwnValuesOrEntries(
StoreFixedArrayElement(values_or_entries, var_result_index.value(),
value);
Increment(&var_result_index, 1);
- Goto(&loop_condition);
+ Goto(&next_descriptor);
- BIND(&loop_condition);
+ BIND(&next_descriptor);
{
Increment(&var_descriptor_number, 1);
- Branch(IntPtrEqual(var_descriptor_number.value(), object_enum_length),
+ Branch(IntPtrEqual(var_result_index.value(), object_enum_length),
&after_loop, &loop);
}
}
diff --git test/mjsunit/es8/object-entries.js test/mjsunit/es8/object-entries.js
index 1c6358648b..51ce4692e4 100644
--- test/mjsunit/es8/object-entries.js
+++ test/mjsunit/es8/object-entries.js
@@ -210,6 +210,24 @@ function TestPropertyFilter(withWarmup) {
TestPropertyFilter();
TestPropertyFilter(true);
+function TestPropertyFilter2(withWarmup) {
+ var object = { };
+ Object.defineProperty(object, "prop1", { value: 10 });
+ Object.defineProperty(object, "prop2", { value: 20 });
+ object.prop3 = 30;
+
+ if (withWarmup) {
+ for (const key in object) {}
+ }
+
+ values = Object.entries(object);
+ assertEquals(1, values.length);
+ assertEquals([
+ [ "prop3", 30 ],
+ ], values);
+}
+TestPropertyFilter2();
+TestPropertyFilter2(true);
function TestWithProxy(withWarmup) {
var obj1 = {prop1:10};

View File

@ -39,7 +39,7 @@ index 605dc1b17e43..24c385a53289 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index ac61b2db1ff6..7706cd21f1c7 100644
index 3d706df56ee6..f10d816a3f05 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -518,6 +518,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
@ -57,7 +57,7 @@ index ac61b2db1ff6..7706cd21f1c7 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -1472,6 +1480,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -1465,6 +1473,19 @@ void RenderText::OnTextAttributeChanged() {
if (!multiline_ && replace_newline_chars_with_symbols_)
base::ReplaceChars(layout_text_, kNewline, kNewlineSymbol, &layout_text_);
@ -78,7 +78,7 @@ index ac61b2db1ff6..7706cd21f1c7 100644
}
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index b17fadb3b3b9..bf175c1f21d9 100644
index 47fa4c605ce1..f5587fac6b5d 100644
--- ui/gfx/render_text.h
+++ ui/gfx/render_text.h
@@ -295,6 +295,10 @@ class GFX_EXPORT RenderText {
@ -92,7 +92,7 @@ index b17fadb3b3b9..bf175c1f21d9 100644
const Rect& display_rect() const { return display_rect_; }
void SetDisplayRect(const Rect& r);
@@ -868,6 +872,8 @@ class GFX_EXPORT RenderText {
@@ -858,6 +862,8 @@ class GFX_EXPORT RenderText {
// Extra spacing placed between glyphs; used for obscured text styling.
int glyph_spacing_ = 0;
@ -211,7 +211,7 @@ index 8fb11e1cf9cb..bd2951bd948b 100644
// The time is used for simulating menu behavior for the menu button; that
// is, if the menu is shown and the button is pressed, we need to close the
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 9085592b2279..1512a1345171 100644
index 6b6d5f02b8ab..0dc4d1f0f389 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -42,6 +42,20 @@ namespace {
@ -272,7 +272,7 @@ index 9085592b2279..1512a1345171 100644
render_text->SetMaxLines(multi_line() ? max_lines() : 0);
render_text->SetWordWrapBehavior(full_text_->word_wrap_behavior());
diff --git ui/views/controls/label.h ui/views/controls/label.h
index 1d35afeda78f..333f9c0f778d 100644
index 635025a82505..58899c5ec0aa 100644
--- ui/views/controls/label.h
+++ ui/views/controls/label.h
@@ -153,6 +153,10 @@ class VIEWS_EXPORT Label : public View,
@ -286,7 +286,7 @@ index 1d35afeda78f..333f9c0f778d 100644
// Sets the tooltip text. Default behavior for a label (single-line) is to
// show the full text if it is wider than its bounds. Calling this overrides
// the default behavior and lets you set a custom tooltip. To revert to
@@ -370,6 +374,7 @@ class VIEWS_EXPORT Label : public View,
@@ -367,6 +371,7 @@ class VIEWS_EXPORT Label : public View,
bool collapse_when_hidden_;
int fixed_width_;
int max_width_;