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

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

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/RenderQuote.h ('k') | Source/WebCore/rendering/RenderView.cpp » ('j') | 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) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 RenderQuote* renderQuoteHead() const { return m_renderQuoteHead; } 222 RenderQuote* renderQuoteHead() const { return m_renderQuoteHead; }
223 223
224 // FIXME: This is a work around because the current implementation of counte rs 224 // FIXME: This is a work around because the current implementation of counte rs
225 // requires walking the entire tree repeatedly and most pages don't actually use either 225 // requires walking the entire tree repeatedly and most pages don't actually use either
226 // feature so we shouldn't take the performance hit when not needed. Long te rm we should 226 // feature so we shouldn't take the performance hit when not needed. Long te rm we should
227 // rewrite the counter and quotes code. 227 // rewrite the counter and quotes code.
228 void addRenderCounter() { m_renderCounterCount++; } 228 void addRenderCounter() { m_renderCounterCount++; }
229 void removeRenderCounter() { ASSERT(m_renderCounterCount > 0); m_renderCount erCount--; } 229 void removeRenderCounter() { ASSERT(m_renderCounterCount > 0); m_renderCount erCount--; }
230 bool hasRenderCounters() { return m_renderCounterCount; } 230 bool hasRenderCounters() { return m_renderCounterCount; }
231 231
232 // FIXME: This is a hack until we have proper pre layout tasks to handle quo te attachment.
233 // See RenderQuote::updateDepth for more details about what this is a workar ound for.
234 // See: https://bugs.webkit.org/show_bug.cgi?id=109628
235 void markQuoteContainingBlocksForLayoutIfNeeded();
236
237 protected: 232 protected:
238 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE; 233 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
239 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE; 234 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
240 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst; 235 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst;
241 virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE; 236 virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE;
242 237
243 private: 238 private:
244 virtual void calcColumnWidth() OVERRIDE; 239 virtual void calcColumnWidth() OVERRIDE;
245 virtual ColumnInfo::PaginationUnit paginationUnit() const OVERRIDE; 240 virtual ColumnInfo::PaginationUnit paginationUnit() const OVERRIDE;
246 241
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 if (m_view) 437 if (m_view)
443 m_view->enableLayoutState(); 438 m_view->enableLayoutState();
444 } 439 }
445 private: 440 private:
446 RenderView* m_view; 441 RenderView* m_view;
447 }; 442 };
448 443
449 } // namespace WebCore 444 } // namespace WebCore
450 445
451 #endif // RenderView_h 446 #endif // RenderView_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderQuote.h ('k') | Source/WebCore/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698