| 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()->updateLifecycleToCompositingCleanPlusScrolling(); | 90     frameView()->frame().localFrameRoot()->view()->updateStyleAndLayoutIfNeededR
      ecursive(); | 
| 91     return hitTestNoLifecycleUpdate(result); | 91     return hitTestNoLifecycleUpdate(result); | 
| 92 } | 92 } | 
| 93 | 93 | 
| 94 bool LayoutView::hitTestNoLifecycleUpdate(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 | 
| (...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1006     return viewHeight(IncludeScrollbars) / scale; | 1006     return viewHeight(IncludeScrollbars) / scale; | 
| 1007 } | 1007 } | 
| 1008 | 1008 | 
| 1009 void LayoutView::willBeDestroyed() | 1009 void LayoutView::willBeDestroyed() | 
| 1010 { | 1010 { | 
| 1011     LayoutBlockFlow::willBeDestroyed(); | 1011     LayoutBlockFlow::willBeDestroyed(); | 
| 1012     m_compositor.clear(); | 1012     m_compositor.clear(); | 
| 1013 } | 1013 } | 
| 1014 | 1014 | 
| 1015 } // namespace blink | 1015 } // namespace blink | 
| OLD | NEW | 
|---|