| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 FrameView::FrameView(LocalFrame* frame) | 108 FrameView::FrameView(LocalFrame* frame) |
| 109 : m_frame(frame) | 109 : m_frame(frame) |
| 110 , m_canHaveScrollbars(true) | 110 , m_canHaveScrollbars(true) |
| 111 , m_slowRepaintObjectCount(0) | 111 , m_slowRepaintObjectCount(0) |
| 112 , m_hasPendingLayout(false) | 112 , m_hasPendingLayout(false) |
| 113 , m_layoutSubtreeRoot(0) | 113 , m_layoutSubtreeRoot(0) |
| 114 , m_inSynchronousPostLayout(false) | 114 , m_inSynchronousPostLayout(false) |
| 115 , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired) | 115 , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired) |
| 116 , m_updateWidgetsTimer(this, &FrameView::updateWidgetsTimerFired) | 116 , m_updateWidgetsTimer(this, &FrameView::updateWidgetsTimerFired) |
| 117 , m_isTransparent(false) | 117 , m_isTransparent(false) |
| 118 , m_baseBackgroundColor(Color::white) | 118 , m_baseBackgroundColor(Color::gray) |
| 119 , m_mediaType("screen") | 119 , m_mediaType("screen") |
| 120 , m_overflowStatusDirty(true) | 120 , m_overflowStatusDirty(true) |
| 121 , m_viewportRenderer(0) | 121 , m_viewportRenderer(0) |
| 122 , m_wasScrolledByUser(false) | 122 , m_wasScrolledByUser(false) |
| 123 , m_inProgrammaticScroll(false) | 123 , m_inProgrammaticScroll(false) |
| 124 , m_safeToPropagateScrollToParent(true) | 124 , m_safeToPropagateScrollToParent(true) |
| 125 , m_isTrackingPaintInvalidations(false) | 125 , m_isTrackingPaintInvalidations(false) |
| 126 , m_scrollCorner(0) | 126 , m_scrollCorner(0) |
| 127 , m_shouldAutoSize(false) | 127 , m_shouldAutoSize(false) |
| 128 , m_inAutoSize(false) | 128 , m_inAutoSize(false) |
| (...skipping 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1730 { | 1730 { |
| 1731 Page* page = frame().page(); | 1731 Page* page = frame().page(); |
| 1732 if (!page) | 1732 if (!page) |
| 1733 return 0; | 1733 return 0; |
| 1734 return &page->chrome(); | 1734 return &page->chrome(); |
| 1735 } | 1735 } |
| 1736 | 1736 |
| 1737 void FrameView::contentRectangleForPaintInvalidation(const IntRect& r) | 1737 void FrameView::contentRectangleForPaintInvalidation(const IntRect& r) |
| 1738 { | 1738 { |
| 1739 ASSERT(paintInvalidationIsAllowed()); | 1739 ASSERT(paintInvalidationIsAllowed()); |
| 1740 ASSERT(!m_frame->owner()); | 1740 //ASSERT(!m_frame->owner()); |
| 1741 | 1741 |
| 1742 if (m_isTrackingPaintInvalidations) { | 1742 if (m_isTrackingPaintInvalidations) { |
| 1743 IntRect paintInvalidationRect = r; | 1743 IntRect paintInvalidationRect = r; |
| 1744 paintInvalidationRect.move(-scrollOffset()); | 1744 paintInvalidationRect.move(-scrollOffset()); |
| 1745 m_trackedPaintInvalidationRects.append(paintInvalidationRect); | 1745 m_trackedPaintInvalidationRects.append(paintInvalidationRect); |
| 1746 // FIXME: http://crbug.com/368518. Eventually, invalidateContentRectangl
eForPaint | 1746 // FIXME: http://crbug.com/368518. Eventually, invalidateContentRectangl
eForPaint |
| 1747 // is going away entirely once all layout tests are FCM. In the short | 1747 // is going away entirely once all layout tests are FCM. In the short |
| 1748 // term, no code should be tracking non-composited FrameView paint inval
idations. | 1748 // term, no code should be tracking non-composited FrameView paint inval
idations. |
| 1749 RELEASE_ASSERT_NOT_REACHED(); | 1749 RELEASE_ASSERT_NOT_REACHED(); |
| 1750 } | 1750 } |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1900 // layout in that case. | 1900 // layout in that case. |
| 1901 | 1901 |
| 1902 RenderView* renderView = this->renderView(); | 1902 RenderView* renderView = this->renderView(); |
| 1903 return layoutPending() | 1903 return layoutPending() |
| 1904 || (renderView && renderView->needsLayout()) | 1904 || (renderView && renderView->needsLayout()) |
| 1905 || isSubtreeLayout(); | 1905 || isSubtreeLayout(); |
| 1906 } | 1906 } |
| 1907 | 1907 |
| 1908 void FrameView::setNeedsLayout() | 1908 void FrameView::setNeedsLayout() |
| 1909 { | 1909 { |
| 1910 if (RenderView* renderView = this->renderView()) | 1910 printf("FrameView::setNeedsLayout\n"); |
| 1911 if (RenderView* renderView = this->renderView()) { |
| 1912 printf("FrameView::setNeedsLayout: call renderView\n"); |
| 1911 renderView->setNeedsLayout(); | 1913 renderView->setNeedsLayout(); |
| 1914 } |
| 1912 } | 1915 } |
| 1913 | 1916 |
| 1914 bool FrameView::isTransparent() const | 1917 bool FrameView::isTransparent() const |
| 1915 { | 1918 { |
| 1916 return m_isTransparent; | 1919 return m_isTransparent; |
| 1917 } | 1920 } |
| 1918 | 1921 |
| 1919 void FrameView::setTransparent(bool isTransparent) | 1922 void FrameView::setTransparent(bool isTransparent) |
| 1920 { | 1923 { |
| 1921 m_isTransparent = isTransparent; | 1924 m_isTransparent = isTransparent; |
| (...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3267 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3270 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3268 { | 3271 { |
| 3269 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3272 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3270 if (AXObjectCache* cache = axObjectCache()) { | 3273 if (AXObjectCache* cache = axObjectCache()) { |
| 3271 cache->remove(scrollbar); | 3274 cache->remove(scrollbar); |
| 3272 cache->handleScrollbarUpdate(this); | 3275 cache->handleScrollbarUpdate(this); |
| 3273 } | 3276 } |
| 3274 } | 3277 } |
| 3275 | 3278 |
| 3276 } // namespace WebCore | 3279 } // namespace WebCore |
| OLD | NEW |