Combine 4 bools into GeometryInfoFlags.

third_party/WebKit/Source/core/layout/LayoutGeometryMap.cpp

 /*
  * Copyright (C) 2012 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
@@ skipping 64 matching lines @@
         if (i > 0 && currentStep.m_layoutObject == ancestor) {
 #if ENABLE(ASSERT)
             foundAncestor = true;
 #endif
             break;
         }
 
         // If this box has a transform, it acts as a fixed position container
         // for fixed descendants, which prevents the propagation of 'fixed'
         // unless the layer itself is also fixed position.
-        if (i && currentStep.m_hasTransform && !currentStep.m_isFixedPosition)
+        if (i && currentStep.m_flags & HasTransform && !(currentStep.m_flags & IsFixedPosition))
             inFixed = false;
-        else if (currentStep.m_isFixedPosition)
+        else if (currentStep.m_flags & IsFixedPosition)
             inFixed = true;
 
         ASSERT(!i == isTopmostLayoutView(currentStep.m_layoutObject));
 
         if (!i) {
             // A null container indicates mapping through the root LayoutView, so including its transform (the page scale).
             if (!ancestor && currentStep.m_transform)
                 transformState.applyTransform(*currentStep.m_transform.get());
         } else {
-            TransformState::TransformAccumulation accumulate = currentStep.m_accumulatingTransform ? TransformState::AccumulateTransform : TransformState::FlattenTransform;
+            TransformState::TransformAccumulation accumulate = currentStep.m_flags & AccumulatingTransform ? TransformState::AccumulateTransform : TransformState::FlattenTransform;
             if (currentStep.m_transform)
                 transformState.applyTransform(*currentStep.m_transform.get(), accumulate);
             else
                 transformState.move(currentStep.m_offset.width(), currentStep.m_offset.height(), accumulate);
         }
 
         if (inFixed && !currentStep.m_offsetForFixedPosition.isZero()) {
             ASSERT(currentStep.m_layoutObject->isLayoutView());
             transformState.move(currentStep.m_offsetForFixedPosition);
         }
     }
 
     ASSERT(foundAncestor);
     transformState.flatten();
 }
 
 #ifndef NDEBUG
 // Handy function to call from gdb while debugging mismatched point/rect errors.
 void LayoutGeometryMap::dumpSteps() const
 {
     fprintf(stderr, "LayoutGeometryMap::dumpSteps accumulatedOffset=%d,%d\n", m_accumulatedOffset.width().toInt(), m_accumulatedOffset.height().toInt());
     for (int i = m_mapping.size() - 1; i >= 0; --i) {
         fprintf(stderr, " [%d] %s: offset=%d,%d", i,
             m_mapping[i].m_layoutObject->debugName().ascii().data(),
             m_mapping[i].m_offset.width().toInt(),
             m_mapping[i].m_offset.height().toInt());
-        if (m_mapping[i].m_hasTransform)
+        if (m_mapping[i].m_flags & HasTransform)
             fprintf(stderr, " hasTransform");
         fprintf(stderr, "\n");
     }
 }
 #endif
 
 FloatQuad LayoutGeometryMap::mapToAncestor(const FloatRect& rect, const LayoutBoxModelObject* ancestor) const
 {
     FloatQuad result;
 
@@ skipping 69 matching lines @@
         layer->convertToLayerCoords(ancestorLayer, layerOffset);
 
         // The LayoutView must be pushed first.
         if (!m_mapping.size()) {
             ASSERT(ancestorLayer->layoutObject()->isLayoutView());
             pushMappingsToAncestor(ancestorLayer->layoutObject(), 0);
         }
 
         TemporaryChange<size_t> positionChange(m_insertionPosition, m_mapping.size());
         bool accumulatingTransform = layer->layoutObject()->style()->preserves3D() || ancestorLayer->layoutObject()->style()->preserves3D();
-        push(layoutObject, toLayoutSize(layerOffset), accumulatingTransform, /*isNonUniform*/ false, /*isFixedPosition*/ false, /*hasTransform*/ false);
+        push(layoutObject, toLayoutSize(layerOffset), accumulatingTransform ? AccumulatingTransform : 0);
         return;
     }
     const LayoutBoxModelObject* ancestorLayoutObject = ancestorLayer ? ancestorLayer->layoutObject() : 0;
     pushMappingsToAncestor(layoutObject, ancestorLayoutObject);
 }
 
-void LayoutGeometryMap::push(const LayoutObject* layoutObject, const LayoutSize& offsetFromContainer, bool accumulatingTransform, bool isNonUniform, bool isFixedPosition, bool hasTransform, LayoutSize offsetForFixedPosition)
+void LayoutGeometryMap::push(const LayoutObject* layoutObject, const LayoutSize& offsetFromContainer, GeometryInfoFlags flags, LayoutSize offsetForFixedPosition)
 {
     LAYOUT_GEOMETRY_MAP_LOG("LayoutGeometryMap::push %p %d,%d isNonUniform=%d\n", layoutObject, offsetFromContainer.width().toInt(), offsetFromContainer.height().toInt(), isNonUniform);
 
     ASSERT(m_insertionPosition != kNotFound);
     ASSERT(!layoutObject->isLayoutView() || !m_insertionPosition || m_mapCoordinatesFlags & TraverseDocumentBoundaries);
     ASSERT(offsetForFixedPosition.isZero() || layoutObject->isLayoutView());
 
-    m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, accumulatingTransform, isNonUniform, isFixedPosition, hasTransform));
+    m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, flags));
 
     LayoutGeometryMapStep& step = m_mapping[m_insertionPosition];
     step.m_offset = offsetFromContainer;
     step.m_offsetForFixedPosition = offsetForFixedPosition;
 
     stepInserted(step);
 }
 
-void LayoutGeometryMap::push(const LayoutObject* layoutObject, const TransformationMatrix& t, bool accumulatingTransform, bool isNonUniform, bool isFixedPosition, bool hasTransform, LayoutSize offsetForFixedPosition)
+void LayoutGeometryMap::push(const LayoutObject* layoutObject, const TransformationMatrix& t, GeometryInfoFlags flags, LayoutSize offsetForFixedPosition)
 {
     ASSERT(m_insertionPosition != kNotFound);
     ASSERT(!layoutObject->isLayoutView() || !m_insertionPosition || m_mapCoordinatesFlags & TraverseDocumentBoundaries);
     ASSERT(offsetForFixedPosition.isZero() || layoutObject->isLayoutView());
 
-    m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, accumulatingTransform, isNonUniform, isFixedPosition, hasTransform));
+    m_mapping.insert(m_insertionPosition, LayoutGeometryMapStep(layoutObject, flags));
 
     LayoutGeometryMapStep& step = m_mapping[m_insertionPosition];
     step.m_offsetForFixedPosition = offsetForFixedPosition;
 
     if (!t.isIntegerTranslation())
         step.m_transform = TransformationMatrix::create(t);
     else
         step.m_offset = LayoutSize(t.e(), t.f());
 
     stepInserted(step);
@@ skipping 12 matching lines @@
 void LayoutGeometryMap::popMappingsToAncestor(const PaintLayer* ancestorLayer)
 {
     const LayoutBoxModelObject* ancestorLayoutObject = ancestorLayer ? ancestorLayer->layoutObject() : 0;
     popMappingsToAncestor(ancestorLayoutObject);
 }
 
 void LayoutGeometryMap::stepInserted(const LayoutGeometryMapStep& step)
 {
     m_accumulatedOffset += step.m_offset;
 
-    if (step.m_isNonUniform)
+    if (step.m_flags & IsNonUniform)
         ++m_nonUniformStepsCount;
 
     if (step.m_transform)
         ++m_transformedStepsCount;
 
-    if (step.m_isFixedPosition)
+    if (step.m_flags & IsFixedPosition)
         ++m_fixedStepsCount;
 }
 
 void LayoutGeometryMap::stepRemoved(const LayoutGeometryMapStep& step)
 {
     m_accumulatedOffset -= step.m_offset;
 
-    if (step.m_isNonUniform) {
+    if (step.m_flags & IsNonUniform) {
         ASSERT(m_nonUniformStepsCount);
         --m_nonUniformStepsCount;
     }
 
     if (step.m_transform) {
         ASSERT(m_transformedStepsCount);
         --m_transformedStepsCount;
     }
 
-    if (step.m_isFixedPosition) {
+    if (step.m_flags & IsFixedPosition) {
         ASSERT(m_fixedStepsCount);
         --m_fixedStepsCount;
     }
 }
 
 #if ENABLE(ASSERT)
 bool LayoutGeometryMap::isTopmostLayoutView(const LayoutObject* layoutObject) const
 {
     if (!layoutObject->isLayoutView())
         return false;
 
     // If we're not working with multiple LayoutViews, then any view is considered
     // "topmost" (to preserve original behavior).
     if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries))
         return true;
 
     return layoutObject->frame()->isMainFrame();
 }
 #endif
 
 } // namespace blink