Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 LayoutView::~LayoutView() | 80 LayoutView::~LayoutView() |
| 81 { | 81 { |
| 82 } | 82 } |
| 83 | 83 |
| 84 bool LayoutView::hitTest(HitTestResult& result) | 84 bool LayoutView::hitTest(HitTestResult& result) |
| 85 { | 85 { |
| 86 // We have to recursively update layout/style here because otherwise, when t he hit test recurses | 86 // We have to recursively update layout/style here because otherwise, when t he hit test recurses |
| 87 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer | 87 // into a child document, it could trigger a layout on the parent document, which can destroy DeprecatedPaintLayer |
| 88 // that are higher up in the call stack, leading to crashes. | 88 // that are higher up in the call stack, leading to crashes. |
| 89 // Note that Document::updateLayout calls its parent's updateLayout. | 89 // Note that Document::updateLayout calls its parent's updateLayout. |
| 90 frameView()->updateLayoutAndStyleForPainting(); | 90 frameView()->updateLifecycleToCompositingClean(); |
|
chrishtr
2015/07/01 21:44:58
This is the only caller of the new updateLifecycle
| |
| 91 return hitTestNoLayoutAndStyleUpdate(result); | 91 return hitTestNoLifecycleUpdate(result); |
| 92 } | 92 } |
| 93 | 93 |
| 94 bool LayoutView::hitTestNoLayoutAndStyleUpdate(HitTestResult& result) | 94 bool LayoutView::hitTestNoLifecycleUpdate(HitTestResult& result) |
| 95 { | 95 { |
| 96 TRACE_EVENT_BEGIN0("blink,devtools.timeline", "HitTest"); | 96 TRACE_EVENT_BEGIN0("blink,devtools.timeline", "HitTest"); |
| 97 m_hitTestCount++; | 97 m_hitTestCount++; |
| 98 | 98 |
| 99 ASSERT(!result.hitTestLocation().isRectBasedTest() || result.hitTestRequest( ).listBased()); | 99 ASSERT(!result.hitTestLocation().isRectBasedTest() || result.hitTestRequest( ).listBased()); |
| 100 | 100 |
| 101 commitPendingSelection(); | 101 commitPendingSelection(); |
| 102 | 102 |
| 103 uint64_t domTreeVersion = document().domTreeVersion(); | 103 uint64_t domTreeVersion = document().domTreeVersion(); |
| 104 HitTestResult cacheResult = result; | 104 HitTestResult cacheResult = result; |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 985 return viewHeight(IncludeScrollbars) / scale; | 985 return viewHeight(IncludeScrollbars) / scale; |
| 986 } | 986 } |
| 987 | 987 |
| 988 void LayoutView::willBeDestroyed() | 988 void LayoutView::willBeDestroyed() |
| 989 { | 989 { |
| 990 LayoutBlockFlow::willBeDestroyed(); | 990 LayoutBlockFlow::willBeDestroyed(); |
| 991 m_compositor.clear(); | 991 m_compositor.clear(); |
| 992 } | 992 } |
| 993 | 993 |
| 994 } // namespace blink | 994 } // namespace blink |
| OLD | NEW |