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

Unified Diff: sky/engine/core/rendering/RenderView.h

Issue 945003002: Remove LayoutState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: improve test Created 5 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/RenderView.h
diff --git a/sky/engine/core/rendering/RenderView.h b/sky/engine/core/rendering/RenderView.h
index 463eaac783f58b3abd79b134db0756eac9175311..66f0cc240c92e32b8ad6166d2ed7b41854818346 100644
--- a/sky/engine/core/rendering/RenderView.h
+++ b/sky/engine/core/rendering/RenderView.h
@@ -23,7 +23,6 @@
#define SKY_ENGINE_CORE_RENDERING_RENDERVIEW_H_
#include "sky/engine/core/frame/FrameView.h"
-#include "sky/engine/core/rendering/LayoutState.h"
#include "sky/engine/core/rendering/RenderBlockFlow.h"
#include "sky/engine/core/rendering/RenderIFrame.h"
#include "sky/engine/wtf/OwnPtr.h"
@@ -82,8 +81,6 @@ public:
virtual LayoutRect viewRect() const override;
- LayoutState* layoutState() const { return m_layoutState; }
-
IntRect unscaledDocumentRect() const;
LayoutRect backgroundRect(RenderBox* backgroundRenderer) const;
@@ -92,9 +89,6 @@ public:
double layoutViewportWidth() const;
double layoutViewportHeight() const;
- void pushLayoutState(LayoutState&);
- void popLayoutState();
-
void addIFrame(RenderIFrame* iframe);
void removeIFrame(RenderIFrame* iframe);
void updateIFramesAfterLayout();
@@ -104,11 +98,6 @@ private:
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
- void layoutContent();
-#if ENABLE(ASSERT)
- void checkLayoutState();
-#endif
-
void positionDialog(RenderBox*);
void positionDialogs();
@@ -120,8 +109,6 @@ private:
int m_selectionStartPos;
int m_selectionEndPos;
- LayoutState* m_layoutState;
-
unsigned m_renderCounterCount;
unsigned m_hitTestCount;

Powered by Google App Engine
This is Rietveld 408576698