Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always send epochs to webrender in layout 2020 #23940

Merged
merged 1 commit into from Aug 10, 2019
Merged

Conversation

@nox
Copy link
Member

nox commented Aug 9, 2019

This change is Reviewable

@emilio
emilio approved these changes Aug 9, 2019
Copy link
Member

emilio left a comment

rs+

@nox
Copy link
Member Author

nox commented Aug 9, 2019

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

bors-servo commented Aug 9, 2019

📌 Commit 69beaf6 has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Aug 9, 2019

Testing commit 69beaf6 with merge d1650c8...

bors-servo added a commit that referenced this pull request Aug 9, 2019
Always send epochs to webrender in layout 2020

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23940)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 9, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Aug 9, 2019

Diff in /repo/components/layout_thread_2020/lib.rs at line 957:
     }
 
     /// Advances the animation clock of the document.
�[31m-    fn handle_advance_clock_ms<'a, 'b>(
�(B�[m�[31m-        &mut self,
�(B�[m�[31m-        how_many_ms: i32,
�(B�[m�[31m-        tick_animations: bool,
�(B�[m�[31m-    ) {
�(B�[m�[32m+    fn handle_advance_clock_ms<'a, 'b>(&mut self, how_many_ms: i32, tick_animations: bool) {
�(B�[m         self.timer.increment(how_many_ms as f64 / 1000.0);
         if tick_animations {
             self.tick_all_animations();
Diff in /repo/components/layout_thread_2020/lib.rs at line 1281:
         }
 
         // Perform post-style recalculation layout passes.
�[31m-        self.perform_post_style_recalc_layout_passes(
�(B�[m�[31m-            &data.reflow_goal,
�(B�[m�[31m-            Some(&document),
�(B�[m�[31m-        );
�(B�[m�[32m+        self.perform_post_style_recalc_layout_passes(&data.reflow_goal, Some(&document));
�(B�[m 
         self.first_reflow.set(false);
         self.respond_to_query_if_necessary(&data.reflow_goal, &mut *rw_data, &mut layout_context);
Diff in /repo/components/layout_thread_2020/lib.rs at line 1416:
                 ua_or_user: &ua_or_user_guard,
             };
 
�[31m-            self.perform_post_style_recalc_layout_passes(
�(B�[m�[31m-                &ReflowGoal::TickAnimations,
�(B�[m�[31m-                None,
�(B�[m�[31m-            );
�(B�[m�[32m+            self.perform_post_style_recalc_layout_passes(&ReflowGoal::TickAnimations, None);
�(B�[m         }
     }
 
Run `./mach fmt` to fix the formatting
@nox nox force-pushed the fix-layout-2020 branch from 69beaf6 to 6876245 Aug 10, 2019
@nox
Copy link
Member Author

nox commented Aug 10, 2019

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

📌 Commit 6876245 has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

Testing commit 6876245 with merge 82ff940...

bors-servo added a commit that referenced this pull request Aug 10, 2019
Always send epochs to webrender in layout 2020

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23940)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Aug 10, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

Testing commit 6876245 with merge b01a4d0...

bors-servo added a commit that referenced this pull request Aug 10, 2019
Always send epochs to webrender in layout 2020

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23940)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: emilio
Pushing b01a4d0 to master...

@bors-servo bors-servo merged commit 6876245 into master Aug 10, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the fix-layout-2020 branch Sep 30, 2019
@SimonSapin SimonSapin added this to Done / resolved in Layout 2020 Dec 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Layout 2020
  
Merged / resolved
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.