Line
Link Here
|
0 |
-- a/src/3rdparty/chromium/third_party/blink/renderer/core/animation/document_animations.cc |
0 |
++ b/src/3rdparty/chromium/third_party/blink/renderer/core/animation/document_animations.cc |
Lines 57-64
void UpdateAnimationTiming(
Link Here
|
57 |
document.GetWorkletAnimationController().UpdateAnimationTimings(reason); |
57 |
document.GetWorkletAnimationController().UpdateAnimationTimings(reason); |
58 |
} |
58 |
} |
59 |
|
59 |
|
60 |
bool CompareAnimations(const Member<Animation>& left, |
60 |
bool CompareAnimationsDocument(const Member<Animation>& left, |
61 |
const Member<Animation>& right) { |
61 |
const Member<Animation>& right) { |
62 |
return Animation::HasLowerCompositeOrdering( |
62 |
return Animation::HasLowerCompositeOrdering( |
63 |
left.Get(), right.Get(), |
63 |
left.Get(), right.Get(), |
64 |
Animation::CompareAnimationsOrdering::kTreeOrder); |
64 |
Animation::CompareAnimationsOrdering::kTreeOrder); |
Lines 157-163
HeapVector<Member<Animation>> DocumentAnimations::getAnimations(
Link Here
|
157 |
else |
157 |
else |
158 |
GetAnimationsTargetingTreeScope(animations, tree_scope); |
158 |
GetAnimationsTargetingTreeScope(animations, tree_scope); |
159 |
|
159 |
|
160 |
std::sort(animations.begin(), animations.end(), CompareAnimations); |
160 |
std::sort(animations.begin(), animations.end(), CompareAnimationsDocument); |
161 |
return animations; |
161 |
return animations; |
162 |
} |
162 |
} |
163 |
|
163 |
|
Lines 203-209
void DocumentAnimations::RemoveReplacedAnimations(
Link Here
|
203 |
|
203 |
|
204 |
// By processing in decreasing order by priority, we can perform a single |
204 |
// By processing in decreasing order by priority, we can perform a single |
205 |
// pass for discovery of replaced properties. |
205 |
// pass for discovery of replaced properties. |
206 |
std::sort(animations->begin(), animations->end(), CompareAnimations); |
206 |
std::sort(animations->begin(), animations->end(), CompareAnimationsDocument); |
207 |
PropertyHandleSet replaced_properties; |
207 |
PropertyHandleSet replaced_properties; |
208 |
for (auto anim_it = animations->rbegin(); anim_it != animations->rend(); |
208 |
for (auto anim_it = animations->rbegin(); anim_it != animations->rend(); |
209 |
anim_it++) { |
209 |
anim_it++) { |
210 |
-- a/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc |
210 |
++ b/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc |
Lines 129-139
void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
Link Here
|
129 |
data); |
129 |
data); |
130 |
|
130 |
|
131 |
data->Append(ChooserResourceLoader::GetPickerCommonStyleSheet()); |
131 |
data->Append(ChooserResourceLoader::GetPickerCommonStyleSheet()); |
132 |
if (!features::IsFormControlsRefreshEnabled()) |
132 |
if (!::features::IsFormControlsRefreshEnabled()) |
133 |
data->Append(ChooserResourceLoader::GetPickerButtonStyleSheet()); |
133 |
data->Append(ChooserResourceLoader::GetPickerButtonStyleSheet()); |
134 |
data->Append(ChooserResourceLoader::GetSuggestionPickerStyleSheet()); |
134 |
data->Append(ChooserResourceLoader::GetSuggestionPickerStyleSheet()); |
135 |
data->Append(ChooserResourceLoader::GetCalendarPickerStyleSheet()); |
135 |
data->Append(ChooserResourceLoader::GetCalendarPickerStyleSheet()); |
136 |
if (features::IsFormControlsRefreshEnabled()) { |
136 |
if (::features::IsFormControlsRefreshEnabled()) { |
137 |
data->Append(ChooserResourceLoader::GetCalendarPickerRefreshStyleSheet()); |
137 |
data->Append(ChooserResourceLoader::GetCalendarPickerRefreshStyleSheet()); |
138 |
if (parameters_->type == input_type_names::kTime || |
138 |
if (parameters_->type == input_type_names::kTime || |
139 |
parameters_->type == input_type_names::kDatetimeLocal) { |
139 |
parameters_->type == input_type_names::kDatetimeLocal) { |
Lines 183-191
void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
Link Here
|
183 |
AddProperty("isLocaleRTL", locale_->IsRTL(), data); |
183 |
AddProperty("isLocaleRTL", locale_->IsRTL(), data); |
184 |
AddProperty("isRTL", parameters_->is_anchor_element_rtl, data); |
184 |
AddProperty("isRTL", parameters_->is_anchor_element_rtl, data); |
185 |
AddProperty("isFormControlsRefreshEnabled", |
185 |
AddProperty("isFormControlsRefreshEnabled", |
186 |
features::IsFormControlsRefreshEnabled(), data); |
186 |
::features::IsFormControlsRefreshEnabled(), data); |
187 |
#if defined(OS_MAC) |
187 |
#if defined(OS_MAC) |
188 |
AddProperty("isBorderTransparent", features::IsFormControlsRefreshEnabled(), |
188 |
AddProperty("isBorderTransparent", ::features::IsFormControlsRefreshEnabled(), |
189 |
data); |
189 |
data); |
190 |
#endif |
190 |
#endif |
191 |
AddProperty("mode", parameters_->type.GetString(), data); |
191 |
AddProperty("mode", parameters_->type.GetString(), data); |
Lines 236-242
void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
Link Here
|
236 |
|
236 |
|
237 |
data->Append(ChooserResourceLoader::GetPickerCommonJS()); |
237 |
data->Append(ChooserResourceLoader::GetPickerCommonJS()); |
238 |
data->Append(ChooserResourceLoader::GetSuggestionPickerJS()); |
238 |
data->Append(ChooserResourceLoader::GetSuggestionPickerJS()); |
239 |
if (features::IsFormControlsRefreshEnabled()) { |
239 |
if (::features::IsFormControlsRefreshEnabled()) { |
240 |
data->Append(ChooserResourceLoader::GetMonthPickerJS()); |
240 |
data->Append(ChooserResourceLoader::GetMonthPickerJS()); |
241 |
if (parameters_->type == input_type_names::kTime) { |
241 |
if (parameters_->type == input_type_names::kTime) { |
242 |
data->Append(ChooserResourceLoader::GetTimePickerJS()); |
242 |
data->Append(ChooserResourceLoader::GetTimePickerJS()); |
243 |
-- a/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc |
243 |
++ b/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc |
Lines 296-302
void MultipleFieldsTemporalInputTypeView::PickerIndicatorChooseValue(
Link Here
|
296 |
if (input_type_->FormControlType() == input_type_names::kTime) { |
296 |
if (input_type_->FormControlType() == input_type_names::kTime) { |
297 |
if (date.ParseTime(value, 0, end) && end == value.length()) |
297 |
if (date.ParseTime(value, 0, end) && end == value.length()) |
298 |
edit->SetOnlyTime(date); |
298 |
edit->SetOnlyTime(date); |
299 |
} else if (features::IsFormControlsRefreshEnabled() && |
299 |
} else if (::features::IsFormControlsRefreshEnabled() && |
300 |
input_type_->FormControlType() == |
300 |
input_type_->FormControlType() == |
301 |
input_type_names::kDatetimeLocal) { |
301 |
input_type_names::kDatetimeLocal) { |
302 |
if (date.ParseDateTimeLocal(value, 0, end) && end == value.length()) |
302 |
if (date.ParseDateTimeLocal(value, 0, end) && end == value.length()) |
Lines 397-403
void MultipleFieldsTemporalInputTypeView::CreateShadowSubtree() {
Link Here
|
397 |
MakeGarbageCollected<DateTimeEditElement, Document&, |
397 |
MakeGarbageCollected<DateTimeEditElement, Document&, |
398 |
DateTimeEditElement::EditControlOwner&>(document, |
398 |
DateTimeEditElement::EditControlOwner&>(document, |
399 |
*this)); |
399 |
*this)); |
400 |
if (!features::IsFormControlsRefreshEnabled()) { |
400 |
if (!::features::IsFormControlsRefreshEnabled()) { |
401 |
GetElement().UpdateView(); |
401 |
GetElement().UpdateView(); |
402 |
container->AppendChild( |
402 |
container->AppendChild( |
403 |
MakeGarbageCollected<ClearButtonElement, Document&, |
403 |
MakeGarbageCollected<ClearButtonElement, Document&, |
Lines 498-504
void MultipleFieldsTemporalInputTypeView::HandleKeydownEvent(
Link Here
|
498 |
if (picker_indicator_is_visible_ && |
498 |
if (picker_indicator_is_visible_ && |
499 |
((event.key() == "ArrowDown" && event.getModifierState("Alt")) || |
499 |
((event.key() == "ArrowDown" && event.getModifierState("Alt")) || |
500 |
(event.key() == "F4") || |
500 |
(event.key() == "F4") || |
501 |
(features::IsFormControlsRefreshEnabled() && event.key() == " "))) { |
501 |
(::features::IsFormControlsRefreshEnabled() && event.key() == " "))) { |
502 |
if (PickerIndicatorElement* element = GetPickerIndicatorElement()) |
502 |
if (PickerIndicatorElement* element = GetPickerIndicatorElement()) |
503 |
element->OpenPopup(); |
503 |
element->OpenPopup(); |
504 |
event.SetDefaultHandled(); |
504 |
event.SetDefaultHandled(); |
505 |
-- a/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/svg_layout_tree_as_text.cc |
505 |
++ b/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/svg_layout_tree_as_text.cc |
Lines 252-260
static void WriteSVGPaintingResource(WTF::TextStream& ts,
Link Here
|
252 |
ts << " [id=\"" << resource.Target()->GetIdAttribute() << "\"]"; |
252 |
ts << " [id=\"" << resource.Target()->GetIdAttribute() << "\"]"; |
253 |
} |
253 |
} |
254 |
|
254 |
|
255 |
static base::Optional<Color> ResolveColor(const ComputedStyle& style, |
255 |
static base::Optional<Color> ResolveColorSVG(const ComputedStyle& style, |
256 |
const SVGPaint& paint, |
256 |
const SVGPaint& paint, |
257 |
const SVGPaint& visited_paint) { |
257 |
const SVGPaint& visited_paint) { |
258 |
if (!paint.HasColor()) |
258 |
if (!paint.HasColor()) |
259 |
return base::nullopt; |
259 |
return base::nullopt; |
260 |
Color color = style.ResolvedColor(paint.GetColor()); |
260 |
Color color = style.ResolvedColor(paint.GetColor()); |
Lines 283-289
static bool WriteSVGPaint(WTF::TextStream& ts,
Link Here
|
283 |
return true; |
283 |
return true; |
284 |
} |
284 |
} |
285 |
} |
285 |
} |
286 |
if (base::Optional<Color> color = ResolveColor(style, paint, visited_paint)) { |
286 |
if (base::Optional<Color> color = ResolveColorSVG(style, paint, visited_paint)) { |
287 |
ts << " [" << paint_name << "={" << s; |
287 |
ts << " [" << paint_name << "={" << s; |
288 |
ts << "[type=SOLID] [color=" << *color << "]"; |
288 |
ts << "[type=SOLID] [color=" << *color << "]"; |
289 |
return true; |
289 |
return true; |
290 |
-- a/src/3rdparty/chromium/base/task/thread_pool.cc |
290 |
++ b/src/3rdparty/chromium/base/task/thread_pool.cc |
Lines 15-24
namespace base {
Link Here
|
15 |
|
15 |
|
16 |
namespace { |
16 |
namespace { |
17 |
|
17 |
|
18 |
class PostTaskAndReplyWithTraitsTaskRunner |
18 |
class PostTaskAndReplyWithTraitsTaskRunnerTP |
19 |
: public internal::PostTaskAndReplyImpl { |
19 |
: public internal::PostTaskAndReplyImpl { |
20 |
public: |
20 |
public: |
21 |
explicit PostTaskAndReplyWithTraitsTaskRunner(const TaskTraits& traits) |
21 |
explicit PostTaskAndReplyWithTraitsTaskRunnerTP(const TaskTraits& traits) |
22 |
: traits_(traits) {} |
22 |
: traits_(traits) {} |
23 |
|
23 |
|
24 |
private: |
24 |
private: |
Lines 85-91
bool ThreadPool::PostTaskAndReply(const Location& from_here,
Link Here
|
85 |
const TaskTraits& traits, |
85 |
const TaskTraits& traits, |
86 |
OnceClosure task, |
86 |
OnceClosure task, |
87 |
OnceClosure reply) { |
87 |
OnceClosure reply) { |
88 |
return PostTaskAndReplyWithTraitsTaskRunner(traits).PostTaskAndReply( |
88 |
return PostTaskAndReplyWithTraitsTaskRunnerTP(traits).PostTaskAndReply( |
89 |
from_here, std::move(task), std::move(reply)); |
89 |
from_here, std::move(task), std::move(reply)); |
90 |
} |
90 |
} |
91 |
|
91 |
|