| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1326 } else { | 1326 } else { |
| 1327 host_layer_position.Move(-graphics_layer_->OffsetFromLayoutObject()); | 1327 host_layer_position.Move(-graphics_layer_->OffsetFromLayoutObject()); |
| 1328 } | 1328 } |
| 1329 | 1329 |
| 1330 overflow_controls_host_layer_->SetPosition(FloatPoint(host_layer_position)); | 1330 overflow_controls_host_layer_->SetPosition(FloatPoint(host_layer_position)); |
| 1331 | 1331 |
| 1332 const IntRect border_box = | 1332 const IntRect border_box = |
| 1333 ToLayoutBox(owning_layer_.GetLayoutObject()).PixelSnappedBorderBoxRect(); | 1333 ToLayoutBox(owning_layer_.GetLayoutObject()).PixelSnappedBorderBoxRect(); |
| 1334 overflow_controls_host_layer_->SetSize(FloatSize(border_box.Size())); | 1334 overflow_controls_host_layer_->SetSize(FloatSize(border_box.Size())); |
| 1335 overflow_controls_host_layer_->SetMasksToBounds(true); | 1335 overflow_controls_host_layer_->SetMasksToBounds(true); |
| 1336 overflow_controls_host_layer_->SetBackfaceVisibility( |
| 1337 owning_layer_.GetLayoutObject().Style()->BackfaceVisibility() == |
| 1338 kBackfaceVisibilityVisible); |
| 1336 } | 1339 } |
| 1337 | 1340 |
| 1338 void CompositedLayerMapping::UpdateChildContainmentLayerGeometry( | 1341 void CompositedLayerMapping::UpdateChildContainmentLayerGeometry( |
| 1339 const IntRect& clipping_box, | 1342 const IntRect& clipping_box, |
| 1340 const IntRect& local_compositing_bounds) { | 1343 const IntRect& local_compositing_bounds) { |
| 1341 if (!child_containment_layer_) | 1344 if (!child_containment_layer_) |
| 1342 return; | 1345 return; |
| 1343 | 1346 |
| 1344 FloatPoint clip_position_in_layout_object_space( | 1347 FloatPoint clip_position_in_layout_object_space( |
| 1345 clipping_box.Location() - local_compositing_bounds.Location() + | 1348 clipping_box.Location() - local_compositing_bounds.Location() + |
| (...skipping 2255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3601 } else if (graphics_layer == decoration_outline_layer_.get()) { | 3604 } else if (graphics_layer == decoration_outline_layer_.get()) { |
| 3602 name = "Decoration Layer"; | 3605 name = "Decoration Layer"; |
| 3603 } else { | 3606 } else { |
| 3604 NOTREACHED(); | 3607 NOTREACHED(); |
| 3605 } | 3608 } |
| 3606 | 3609 |
| 3607 return name; | 3610 return name; |
| 3608 } | 3611 } |
| 3609 | 3612 |
| 3610 } // namespace blink | 3613 } // namespace blink |
| OLD | NEW |