Skip to content

Commit

Permalink
Auto merge of servo#239 - pcwalton:overlapping-iframe-scrolling, r=gl…
Browse files Browse the repository at this point in the history
…ennw

Preferentially dispatch events to topmost scroll layer siblings.

Addresses servo#9867.

r? @glennw
cc @paulrouget
  • Loading branch information
bors-servo committed Mar 15, 2016
2 parents 9309d52 + e8d30f0 commit ce55aca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ impl Frame {
self.layers.get(&scroll_layer_id).and_then(|layer| {
let transform = parent_transform.mul(&layer.local_transform);

for child_layer_id in &layer.children {
for child_layer_id in layer.children.iter().rev() {
if let Some(layer_id) = self.get_scroll_layer(cursor,
*child_layer_id,
&transform) {
Expand Down

0 comments on commit ce55aca

Please sign in to comment.