| 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 ASSERT(m_insertionPosition != kNotFound); | 240 ASSERT(m_insertionPosition != kNotFound); |
| 241 ASSERT(!layoutObject->isLayoutView() || !m_insertionPosition || m_mapCoordin
atesFlags & TraverseDocumentBoundaries); | 241 ASSERT(!layoutObject->isLayoutView() || !m_insertionPosition || m_mapCoordin
atesFlags & TraverseDocumentBoundaries); |
| 242 ASSERT(offsetForFixedPosition.isZero() || layoutObject->isLayoutView()); | 242 ASSERT(offsetForFixedPosition.isZero() || layoutObject->isLayoutView()); |
| 243 | 243 |
| 244 m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, ac
cumulatingTransform, isNonUniform, isFixedPosition, hasTransform)); | 244 m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, ac
cumulatingTransform, isNonUniform, isFixedPosition, hasTransform)); |
| 245 | 245 |
| 246 LayoutGeometryMapStep& step = m_mapping[m_insertionPosition]; | 246 LayoutGeometryMapStep& step = m_mapping[m_insertionPosition]; |
| 247 step.m_offsetForFixedPosition = offsetForFixedPosition; | 247 step.m_offsetForFixedPosition = offsetForFixedPosition; |
| 248 | 248 |
| 249 if (!t.isIntegerTranslation()) | 249 if (!t.isIntegerTranslation()) |
| 250 step.m_transform = adoptPtr(new TransformationMatrix(t)); | 250 step.m_transform = TransformationMatrix::create(t); |
| 251 else | 251 else |
| 252 step.m_offset = LayoutSize(t.e(), t.f()); | 252 step.m_offset = LayoutSize(t.e(), t.f()); |
| 253 | 253 |
| 254 stepInserted(step); | 254 stepInserted(step); |
| 255 } | 255 } |
| 256 | 256 |
| 257 void LayoutGeometryMap::popMappingsToAncestor(const LayoutBoxModelObject* ancest
orLayoutObject) | 257 void LayoutGeometryMap::popMappingsToAncestor(const LayoutBoxModelObject* ancest
orLayoutObject) |
| 258 { | 258 { |
| 259 ASSERT(m_mapping.size()); | 259 ASSERT(m_mapping.size()); |
| 260 | 260 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 // If we're not working with multiple LayoutViews, then any view is consider
ed | 313 // If we're not working with multiple LayoutViews, then any view is consider
ed |
| 314 // "topmost" (to preserve original behavior). | 314 // "topmost" (to preserve original behavior). |
| 315 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) | 315 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) |
| 316 return true; | 316 return true; |
| 317 | 317 |
| 318 return layoutObject->frame()->isMainFrame(); | 318 return layoutObject->frame()->isMainFrame(); |
| 319 } | 319 } |
| 320 #endif | 320 #endif |
| 321 | 321 |
| 322 } // namespace blink | 322 } // namespace blink |
| OLD | NEW |