OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 return false; | 199 return false; |
200 | 200 |
201 if (current->style()->canContainFixedPositionObjects() || | 201 if (current->style()->canContainFixedPositionObjects() || |
202 current->isLayoutFlowThread() || current->isSVGRoot()) | 202 current->isLayoutFlowThread() || current->isSVGRoot()) |
203 return false; | 203 return false; |
204 | 204 |
205 if (current == ancestor) | 205 if (current == ancestor) |
206 break; | 206 break; |
207 | 207 |
208 if (current->isFloating() && current->parent() && | 208 if (current->isFloating() && current->parent() && |
209 !current->parent()->isLayoutBlock()) | 209 !current->parent()->canContainFloatingObject(*current)) |
210 return false; | 210 return false; |
211 } | 211 } |
212 | 212 |
213 return true; | 213 return true; |
214 } | 214 } |
215 | 215 |
216 void LayoutGeometryMap::pushMappingsToAncestor( | 216 void LayoutGeometryMap::pushMappingsToAncestor( |
217 const PaintLayer* layer, | 217 const PaintLayer* layer, |
218 const PaintLayer* ancestorLayer) { | 218 const PaintLayer* ancestorLayer) { |
219 const LayoutObject* layoutObject = layer->layoutObject(); | 219 const LayoutObject* layoutObject = layer->layoutObject(); |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 // If we're not working with multiple LayoutViews, then any view is considered | 373 // If we're not working with multiple LayoutViews, then any view is considered |
374 // "topmost" (to preserve original behavior). | 374 // "topmost" (to preserve original behavior). |
375 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) | 375 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) |
376 return true; | 376 return true; |
377 | 377 |
378 return layoutObject->frame()->isMainFrame(); | 378 return layoutObject->frame()->isMainFrame(); |
379 } | 379 } |
380 #endif | 380 #endif |
381 | 381 |
382 } // namespace blink | 382 } // namespace blink |
OLD | NEW |