Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: Source/WebCore/rendering/RenderView.cpp

Issue 12314017: Revert 143493 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderView.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 #include "Frame.h" 29 #include "Frame.h"
30 #include "FrameView.h" 30 #include "FrameView.h"
31 #include "GraphicsContext.h" 31 #include "GraphicsContext.h"
32 #include "HTMLFrameOwnerElement.h" 32 #include "HTMLFrameOwnerElement.h"
33 #include "HitTestResult.h" 33 #include "HitTestResult.h"
34 #include "Page.h" 34 #include "Page.h"
35 #include "RenderGeometryMap.h" 35 #include "RenderGeometryMap.h"
36 #include "RenderLayer.h" 36 #include "RenderLayer.h"
37 #include "RenderLayerBacking.h" 37 #include "RenderLayerBacking.h"
38 #include "RenderNamedFlowThread.h" 38 #include "RenderNamedFlowThread.h"
39 #include "RenderQuote.h"
40 #include "RenderSelectionInfo.h" 39 #include "RenderSelectionInfo.h"
41 #include "RenderWidget.h" 40 #include "RenderWidget.h"
42 #include "RenderWidgetProtector.h" 41 #include "RenderWidgetProtector.h"
43 #include "StyleInheritedData.h" 42 #include "StyleInheritedData.h"
44 #include "TransformState.h" 43 #include "TransformState.h"
45 #include "WebCoreMemoryInstrumentation.h" 44 #include "WebCoreMemoryInstrumentation.h"
46 45
47 #if USE(ACCELERATED_COMPOSITING) 46 #if USE(ACCELERATED_COMPOSITING)
48 #include "RenderLayerCompositor.h" 47 #include "RenderLayerCompositor.h"
49 #endif 48 #endif
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 return m_flowThreadController.get(); 1030 return m_flowThreadController.get();
1032 } 1031 }
1033 1032
1034 RenderBlock::IntervalArena* RenderView::intervalArena() 1033 RenderBlock::IntervalArena* RenderView::intervalArena()
1035 { 1034 {
1036 if (!m_intervalArena) 1035 if (!m_intervalArena)
1037 m_intervalArena = IntervalArena::create(); 1036 m_intervalArena = IntervalArena::create();
1038 return m_intervalArena.get(); 1037 return m_intervalArena.get();
1039 } 1038 }
1040 1039
1041 void RenderView::markQuoteContainingBlocksForLayoutIfNeeded()
1042 {
1043 for (RenderQuote* quote = m_renderQuoteHead; quote; quote = quote->next()) {
1044 if (!quote->needsLayout())
1045 continue;
1046 // Can't use markContainingBlocksForLayout because it would abort as soo n
1047 // as it sees a parent that already thinks it needs layout.
1048 for (RenderObject* renderer = quote->parent(); renderer; renderer = rend erer->parent())
1049 renderer->setChildNeedsLayout(true, MarkOnlyThis);
1050 }
1051 }
1052
1053 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1040 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1054 { 1041 {
1055 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1042 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1056 RenderBlock::reportMemoryUsage(memoryObjectInfo); 1043 RenderBlock::reportMemoryUsage(memoryObjectInfo);
1057 info.addWeakPointer(m_frameView); 1044 info.addWeakPointer(m_frameView);
1058 info.addWeakPointer(m_selectionStart); 1045 info.addWeakPointer(m_selectionStart);
1059 info.addWeakPointer(m_selectionEnd); 1046 info.addWeakPointer(m_selectionEnd);
1060 info.addMember(m_widgets); 1047 info.addMember(m_widgets);
1061 info.addMember(m_layoutState); 1048 info.addMember(m_layoutState);
1062 #if USE(ACCELERATED_COMPOSITING) 1049 #if USE(ACCELERATED_COMPOSITING)
1063 info.addMember(m_compositor); 1050 info.addMember(m_compositor);
1064 #endif 1051 #endif
1065 #if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS) 1052 #if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
1066 info.addMember(m_customFilterGlobalContext); 1053 info.addMember(m_customFilterGlobalContext);
1067 #endif 1054 #endif
1068 info.addMember(m_flowThreadController); 1055 info.addMember(m_flowThreadController);
1069 info.addMember(m_intervalArena); 1056 info.addMember(m_intervalArena);
1070 info.addWeakPointer(m_renderQuoteHead); 1057 info.addWeakPointer(m_renderQuoteHead);
1071 } 1058 }
1072 1059
1073 } // namespace WebCore 1060 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698