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

Unified Diff: sky/engine/core/rendering/LayoutState.cpp

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/LayoutState.cpp
diff --git a/sky/engine/core/rendering/LayoutState.cpp b/sky/engine/core/rendering/LayoutState.cpp
deleted file mode 100644
index 44bdc049804c3073ba41d2864d899dd7558e276d..0000000000000000000000000000000000000000
--- a/sky/engine/core/rendering/LayoutState.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sky/engine/config.h"
-#include "sky/engine/core/rendering/LayoutState.h"
-
-#include "sky/engine/core/rendering/RenderInline.h"
-#include "sky/engine/core/rendering/RenderLayer.h"
-#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/platform/Partitions.h"
-
-namespace blink {
-
-LayoutState::LayoutState(RenderView& view)
- : m_containingBlockLogicalWidthChanged(false)
- , m_next(0)
- , m_renderer(view)
-{
- ASSERT(!view.layoutState());
- view.pushLayoutState(*this);
-}
-
-LayoutState::LayoutState(RenderBox& renderer, const LayoutSize& offset, bool containingBlockLogicalWidthChanged)
- : m_containingBlockLogicalWidthChanged(containingBlockLogicalWidthChanged)
- , m_next(renderer.view()->layoutState())
- , m_renderer(renderer)
-{
- renderer.view()->pushLayoutState(*this);
- m_layoutOffset = m_next->m_layoutOffset + offset;
- // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
-}
-
-LayoutState::LayoutState(RenderObject& root)
- : m_containingBlockLogicalWidthChanged(false)
- , m_next(root.view()->layoutState())
- , m_renderer(root)
-{
- ASSERT(!m_next);
- // We'll end up pushing in RenderView itself, so don't bother adding it.
- if (root.isRenderView())
- return;
-
- root.view()->pushLayoutState(*this);
-
- RenderObject* container = root.container();
- FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms);
- m_layoutOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());
-}
-
-LayoutState::~LayoutState()
-{
- if (m_renderer.view()->layoutState()) {
- ASSERT(m_renderer.view()->layoutState() == this);
- m_renderer.view()->popLayoutState();
- }
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698