Source/core/rendering/RenderView.h - Issue 15973002: Remove NonCompositedContentHost -- Take 2

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

Issue 15973002: Remove NonCompositedContentHost -- Take 2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: adding back annotation. final rebase. Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

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) 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 178 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 // FIXME: This is a work around because the current implementation of counte rs	189 // FIXME: This is a work around because the current implementation of counte rs

190 // requires walking the entire tree repeatedly and most pages don't actually use either	190 // requires walking the entire tree repeatedly and most pages don't actually use either

191 // feature so we shouldn't take the performance hit when not needed. Long te rm we should	191 // feature so we shouldn't take the performance hit when not needed. Long te rm we should

192 // rewrite the counter and quotes code.	192 // rewrite the counter and quotes code.

193 void addRenderCounter() { m_renderCounterCount++; }	193 void addRenderCounter() { m_renderCounterCount++; }

194 void removeRenderCounter() { ASSERT(m_renderCounterCount > 0); m_renderCount erCount--; }	194 void removeRenderCounter() { ASSERT(m_renderCounterCount > 0); m_renderCount erCount--; }

195 bool hasRenderCounters() { return m_renderCounterCount; }	195 bool hasRenderCounters() { return m_renderCounterCount; }

196	196

197 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;	197 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;

198	198

	199 virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE FINAL;

	200

199 protected:	201 protected:

200 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;	202 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;

201 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;	203 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;

202 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst;	204 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst;

203 virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE;	205 virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE;

204	206

205 private:	207 private:

206 bool initializeLayoutState(LayoutState&);	208 bool initializeLayoutState(LayoutState&);

207	209

208 virtual void calcColumnWidth() OVERRIDE;	210 virtual void calcColumnWidth() OVERRIDE;

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 RenderObject::FlowThreadState m_flowThreadState;	399 RenderObject::FlowThreadState m_flowThreadState;

398 bool m_fragmenting;	400 bool m_fragmenting;

399 #ifndef NDEBUG	401 #ifndef NDEBUG

400 LayoutState* m_layoutState;	402 LayoutState* m_layoutState;

401 #endif	403 #endif

402 };	404 };

403	405

404 } // namespace WebCore	406 } // namespace WebCore

405	407

406 #endif // RenderView_h	408 #endif // RenderView_h

OLD	NEW