OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
832 m_analyzer = adoptPtr(new LayoutAnalyzer()); | 832 m_analyzer = adoptPtr(new LayoutAnalyzer()); |
833 m_analyzer->reset(); | 833 m_analyzer->reset(); |
834 } | 834 } |
835 | 835 |
836 PassOwnPtr<TracedValue> FrameView::analyzerCounters() | 836 PassOwnPtr<TracedValue> FrameView::analyzerCounters() |
837 { | 837 { |
838 if (!m_analyzer) | 838 if (!m_analyzer) |
839 return TracedValue::create(); | 839 return TracedValue::create(); |
840 OwnPtr<TracedValue> value = m_analyzer->toTracedValue(); | 840 OwnPtr<TracedValue> value = m_analyzer->toTracedValue(); |
841 value->setString("host", layoutView()->document().location()->host()); | 841 value->setString("host", layoutView()->document().location()->host()); |
| 842 value->setString("frame", String::format("0x%" PRIxPTR, reinterpret_cast<uin
tptr_t>(m_frame.get()))); |
842 return value.release(); | 843 return value.release(); |
843 } | 844 } |
844 | 845 |
845 #define PERFORM_LAYOUT_TRACE_CATEGORIES "blink,benchmark," TRACE_DISABLED_BY_DEF
AULT("blink.debug.layout") | 846 #define PERFORM_LAYOUT_TRACE_CATEGORIES "blink,benchmark," TRACE_DISABLED_BY_DEF
AULT("blink.debug.layout") |
846 | 847 |
847 void FrameView::performLayout(bool inSubtreeLayout) | 848 void FrameView::performLayout(bool inSubtreeLayout) |
848 { | 849 { |
849 ASSERT(inSubtreeLayout || m_layoutSubtreeRootList.isEmpty()); | 850 ASSERT(inSubtreeLayout || m_layoutSubtreeRootList.isEmpty()); |
850 | 851 |
851 TRACE_EVENT_BEGIN0(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayou
t"); | 852 TRACE_EVENT_BEGIN0(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayou
t"); |
(...skipping 3216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4068 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4069 return m_hiddenForThrottling && m_crossOriginForThrottling; |
4069 } | 4070 } |
4070 | 4071 |
4071 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4072 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
4072 { | 4073 { |
4073 ASSERT(layoutView()); | 4074 ASSERT(layoutView()); |
4074 return *layoutView(); | 4075 return *layoutView(); |
4075 } | 4076 } |
4076 | 4077 |
4077 } // namespace blink | 4078 } // namespace blink |
OLD | NEW |