Remove lots of things from RenderObject

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 58 matching lines @@
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
-namespace {
-
-static bool gModifyRenderTreeStructureAnyState = false;
-
-} // namespace
-
 #if ENABLE(ASSERT)
 
 RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject& renderObject)
     : m_renderObject(renderObject)
     , m_preexistingForbidden(m_renderObject.isSetNeedsLayoutForbidden())
 {
     m_renderObject.setNeedsLayoutIsForbidden(true);
 }
 
 RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
@@ skipping 2380 matching lines @@
         if (ancestor->isPositioned())
             break;
     }
 
     return node && node->isElementNode() ? toElement(node) : 0;
 }
 
 PositionWithAffinity RenderObject::createPositionWithAffinity(int offset, EAffinity affinity)
 {
     // If this is a non-anonymous renderer in an editable area, then it's simple.
-    if (Node* node = nonPseudoNode()) {
+    if (Node* node = this->node()) {
         if (!node->hasEditableStyle()) {
             // If it can be found, we prefer a visually equivalent position that is editable.
             Position position = createLegacyEditingPosition(node, offset);
             Position candidate = position.downstream(CanCrossEditingBoundary);
             if (candidate.deprecatedNode()->hasEditableStyle())
                 return PositionWithAffinity(candidate, affinity);
             candidate = position.upstream(CanCrossEditingBoundary);
             if (candidate.deprecatedNode()->hasEditableStyle())
                 return PositionWithAffinity(candidate, affinity);
         }
         // FIXME: Eliminate legacy editing positions
         return PositionWithAffinity(createLegacyEditingPosition(node, offset), affinity);
     }
 
     // We don't want to cross the boundary between editable and non-editable
     // regions of the document, but that is either impossible or at least
     // extremely unlikely in any normal case because we stop as soon as we
     // find a single non-anonymous renderer.
 
     // Find a nearby non-anonymous renderer.
     RenderObject* child = this;
     while (RenderObject* parent = child->parent()) {
         // Find non-anonymous content after.
         for (RenderObject* renderer = child->nextInPreOrder(parent); renderer; renderer = renderer->nextInPreOrder(parent)) {
-            if (Node* node = renderer->nonPseudoNode())
+            if (Node* node = renderer->node())
                 return PositionWithAffinity(firstPositionInOrBeforeNode(node), DOWNSTREAM);
         }
 
         // Find non-anonymous content before.
         for (RenderObject* renderer = child->previousInPreOrder(); renderer; renderer = renderer->previousInPreOrder()) {
             if (renderer == parent)
                 break;
-            if (Node* node = renderer->nonPseudoNode())
+            if (Node* node = renderer->node())
                 return PositionWithAffinity(lastPositionInOrAfterNode(node), DOWNSTREAM);
         }
 
         // Use the parent itself unless it too is anonymous.
-        if (Node* node = parent->nonPseudoNode())
+        if (Node* node = parent->node())
             return PositionWithAffinity(firstPositionInOrBeforeNode(node), DOWNSTREAM);
 
         // Repeat at the next level up.
         child = parent;
     }
 
     // Everything was anonymous. Give up.
     return PositionWithAffinity();
 }
 
@@ skipping 13 matching lines @@
 
 bool RenderObject::canUpdateSelectionOnRootLineBoxes()
 {
     if (needsLayout())
         return false;
 
     RenderBlock* containingBlock = this->containingBlock();
     return containingBlock ? !containingBlock->needsLayout() : false;
 }
 
-// We only create "generated" child renderers like one for first-letter if:
-// - the firstLetterBlock can have children in the DOM and
-// - the block doesn't have any special assumption on its text children.
-// This correctly prevents form controls from having such renderers.
-bool RenderObject::canHaveGeneratedChildren() const
-{
-    return canHaveChildren();
-}
-
-void RenderObject::setNeedsBoundariesUpdate()
-{
-    if (RenderObject* renderer = parent())
-        renderer->setNeedsBoundariesUpdate();
-}
-
-FloatRect RenderObject::objectBoundingBox() const
-{
-    ASSERT_NOT_REACHED();
-    return FloatRect();
-}
-
-FloatRect RenderObject::strokeBoundingBox() const
-{
-    ASSERT_NOT_REACHED();
-    return FloatRect();
-}
-
 // Returns the smallest rectangle enclosing all of the painted content
 // respecting clipping, masking, filters, opacity, stroke-width and markers
 FloatRect RenderObject::paintInvalidationRectInLocalCoordinates() const
 {
     ASSERT_NOT_REACHED();
     return FloatRect();
 }
 
-AffineTransform RenderObject::localTransform() const
-{
-    static const AffineTransform identity;
-    return identity;
-}
-
-const AffineTransform& RenderObject::localToParentTransform() const
-{
-    static const AffineTransform identity;
-    return identity;
-}
-
 bool RenderObject::nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint&, HitTestAction)
 {
     ASSERT_NOT_REACHED();
     return false;
 }
 
 bool RenderObject::isRelayoutBoundaryForInspector() const
 {
     return objectIsRelayoutBoundary(this);
 }
@@ skipping 18 matching lines @@
     setShouldDoFullPaintInvalidationIfSelfPaintingLayer(false);
     setOnlyNeededPositionedMovementLayout(false);
     setNeededLayoutBecauseOfChildren(false);
     setShouldInvalidateOverflowForPaint(false);
     setLayoutDidGetCalled(false);
     setMayNeedPaintInvalidation(false);
 }
 
 bool RenderObject::isAllowedToModifyRenderTreeStructure(Document& document)
 {
-    return DeprecatedDisableModifyRenderTreeStructureAsserts::canModifyRenderTreeStateInAnyState()
-        || document.lifecycle().stateAllowsRenderTreeMutations();
-}
-
-DeprecatedDisableModifyRenderTreeStructureAsserts::DeprecatedDisableModifyRenderTreeStructureAsserts()
-    : m_disabler(gModifyRenderTreeStructureAnyState, true)
-{
-}
-
-bool DeprecatedDisableModifyRenderTreeStructureAsserts::canModifyRenderTreeStateInAnyState()
-{
-    return gModifyRenderTreeStructureAnyState;
+    return document.lifecycle().stateAllowsRenderTreeMutations();
 }
 
 } // namespace blink
 
 #ifndef NDEBUG
 
 void showTree(const blink::RenderObject* object)
 {
     if (object)
         object->showTreeForThis();
@@ skipping 14 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif