| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 | 118 |
| 119 #if !ASSERT_DISABLED | 119 #if !ASSERT_DISABLED |
| 120 if (m_mapping.size() > 0) { | 120 if (m_mapping.size() > 0) { |
| 121 const RenderObject* lastRenderer = m_mapping.last().m_renderer; | 121 const RenderObject* lastRenderer = m_mapping.last().m_renderer; |
| 122 const RenderLayer* layer = lastRenderer->enclosingLayer(); | 122 const RenderLayer* layer = lastRenderer->enclosingLayer(); |
| 123 | 123 |
| 124 // Bounds for invisible layers are intentionally not calculated, and are | 124 // Bounds for invisible layers are intentionally not calculated, and are |
| 125 // therefore not necessarily expected to be correct here. This is ok, | 125 // therefore not necessarily expected to be correct here. This is ok, |
| 126 // because they will be recomputed if the layer becomes visible. | 126 // because they will be recomputed if the layer becomes visible. |
| 127 if (!layer || !layer->subtreeIsInvisible()) { | 127 if (!layer || !layer->subtreeIsInvisible()) { |
| 128 FloatPoint rendererMappedResult = lastRenderer->localToAbsolute(p, m
_mapCoordinatesFlags); | 128 FloatPoint rendererMappedResult = lastRenderer->localToAbsolute(cont
ainer, p, m_mapCoordinatesFlags); |
| 129 | 129 |
| 130 ASSERT(roundedIntPoint(rendererMappedResult) == roundedIntPoint(resu
lt)); | 130 ASSERT(roundedIntPoint(rendererMappedResult) == roundedIntPoint(resu
lt)); |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 return result; | 135 return result; |
| 136 } | 136 } |
| 137 | 137 |
| 138 #ifndef NDEBUG | 138 #ifndef NDEBUG |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 // If we're not working with multiple RenderViews, then any view is consider
ed | 337 // If we're not working with multiple RenderViews, then any view is consider
ed |
| 338 // "topmost" (to preserve original behavior). | 338 // "topmost" (to preserve original behavior). |
| 339 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) | 339 if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries)) |
| 340 return true; | 340 return true; |
| 341 | 341 |
| 342 return renderer->frame()->isMainFrame(); | 342 return renderer->frame()->isMainFrame(); |
| 343 } | 343 } |
| 344 #endif | 344 #endif |
| 345 | 345 |
| 346 } // namespace WebCore | 346 } // namespace WebCore |
| OLD | NEW |