Cleanup: Only need one bit (not two) to express flow thread state.

Source/core/layout/LayoutObject.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 247 matching lines @@
 bool LayoutObject::isHR() const
 {
     return isHTMLHRElement(node());
 }
 
 bool LayoutObject::isLegend() const
 {
     return isHTMLLegendElement(node());
 }
 
-void LayoutObject::setFlowThreadStateIncludingDescendants(FlowThreadState state)
+void LayoutObject::setIsInsideFlowThreadIncludingDescendants(bool insideFlowThread)
 {
     LayoutObject* next;
     for (LayoutObject *object = this; object; object = next) {
         // If object is a fragmentation context it already updated the descendants flag accordingly.
         if (object->isLayoutFlowThread()) {
             next = object->nextInPreOrderAfterChildren(this);
             continue;
         }
         next = object->nextInPreOrder(this);
-        ASSERT(state != object->flowThreadState());
-        object->setFlowThreadState(state);
+        ASSERT(insideFlowThread != object->isInsideFlowThread());
+        object->setIsInsideFlowThread(insideFlowThread);
     }
 }
 
 bool LayoutObject::requiresAnonymousTableWrappers(const LayoutObject* newChild) const
 {
     // Check should agree with:
     // CSS 2.1 Tables: 17.2.1 Anonymous table objects
     // http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes
     if (newChild->isLayoutTableCol()) {
         const LayoutTableCol* newTableColumn = toLayoutTableCol(newChild);
@@ skipping 301 matching lines @@
         LayoutBox* ancestorBox = toLayoutBox(ancestor);
         if (ancestorBox->canBeScrolledAndHasScrollableArea())
             return ancestorBox;
     }
 
     return 0;
 }
 
 LayoutFlowThread* LayoutObject::locateFlowThreadContainingBlock() const
 {
-    ASSERT(flowThreadState() != NotInsideFlowThread);
+    ASSERT(isInsideFlowThread());
 
     // See if we have the thread cached because we're in the middle of layout.
     if (LayoutState* layoutState = view()->layoutState()) {
         if (LayoutFlowThread* flowThread = layoutState->flowThread())
             return flowThread;
     }
 
     // Not in the middle of layout so have to find the thread the slow way.
     LayoutObject* curr = const_cast<LayoutObject*>(this);
     while (curr) {
@@ skipping 1896 matching lines @@
 
     removeFromLayoutFlowThread();
 
     // Update cached boundaries in SVG layoutObjects if a child is removed.
     if (parent()->isSVG())
         parent()->setNeedsBoundariesUpdate();
 }
 
 void LayoutObject::removeFromLayoutFlowThread()
 {
-    if (flowThreadState() == NotInsideFlowThread)
+    if (!isInsideFlowThread())
         return;
 
     // Sometimes we remove the element from the flow, but it's not destroyed at that time.
     // It's only until later when we actually destroy it and remove all the children from it.
     // Currently, that happens for firstLetter elements and list markers.
     // Pass in the flow thread so that we don't have to look it up for all the children.
     // If we're a column spanner, we need to use our parent to find the flow thread, since a spanner
     // doesn't have the flow thread in its containing block chain. We still need to notify the flow
     // thread when the layoutObject removed happens to be a spanner, so that we get rid of the spanner
     // placeholder, and column sets around the placeholder get merged.
     LayoutFlowThread* flowThread = isColumnSpanAll() ? parent()->flowThreadContainingBlock() : flowThreadContainingBlock();
     removeFromLayoutFlowThreadRecursive(flowThread);
 }
 
 void LayoutObject::removeFromLayoutFlowThreadRecursive(LayoutFlowThread* layoutFlowThread)
 {
     if (const LayoutObjectChildList* children = virtualChildren()) {
         for (LayoutObject* child = children->firstChild(); child; child = child->nextSibling()) {
             if (child->isLayoutFlowThread())
                 continue; // Don't descend into inner fragmentation contexts.
             child->removeFromLayoutFlowThreadRecursive(child->isLayoutFlowThread() ? toLayoutFlowThread(child) : layoutFlowThread);
         }
     }
 
     if (layoutFlowThread && layoutFlowThread != this)
         layoutFlowThread->flowThreadDescendantWillBeRemoved(this);
-    setFlowThreadState(NotInsideFlowThread);
+    setIsInsideFlowThread(false);
     RELEASE_ASSERT(!spannerPlaceholder());
 }
 
 void LayoutObject::destroyAndCleanupAnonymousWrappers()
 {
     // If the tree is destroyed, there is no need for a clean-up phase.
     if (documentBeingDestroyed()) {
         destroy();
         return;
     }
@@ skipping 764 matching lines @@
 {
     if (object1) {
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif