| 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 if (style.position() == FixedPosition || style.isFlippedBlocksWritingMode()) | 198 if (style.position() == FixedPosition || style.isFlippedBlocksWritingMode()) |
| 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->isFloatingWithNonContainingBlockParent()) |
| 209 !current->parent()->isLayoutBlock()) | |
| 210 return false; | 209 return false; |
| 211 } | 210 } |
| 212 | 211 |
| 213 return true; | 212 return true; |
| 214 } | 213 } |
| 215 | 214 |
| 216 void LayoutGeometryMap::pushMappingsToAncestor( | 215 void LayoutGeometryMap::pushMappingsToAncestor( |
| 217 const PaintLayer* layer, | 216 const PaintLayer* layer, |
| 218 const PaintLayer* ancestorLayer) { | 217 const PaintLayer* ancestorLayer) { |
| 219 const LayoutObject* layoutObject = layer->layoutObject(); | 218 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 | 372 // If we're not working with multiple LayoutViews, then any view is considered |
| 374 // "topmost" (to preserve original behavior). | 373 // "topmost" (to preserve original behavior). |
| 375 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) | 374 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) |
| 376 return true; | 375 return true; |
| 377 | 376 |
| 378 return layoutObject->frame()->isMainFrame(); | 377 return layoutObject->frame()->isMainFrame(); |
| 379 } | 378 } |
| 380 #endif | 379 #endif |
| 381 | 380 |
| 382 } // namespace blink | 381 } // namespace blink |
| OLD | NEW |