|
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/base/task/thread_pool.cc |
243 |
++ 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 |
|
