WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 60 matching lines @@
 #include "RenderScrollbarPart.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
 #include "ScaleTransformOperation.h"
 #include "Scrollbar.h"
 #include "ScrollbarTheme.h"
 #include "SelectionController.h"
 #include "TransformationMatrix.h"
 #include "TranslateTransformOperation.h"
 #include <wtf/StdLibExtras.h>
+#include <wtf/UnusedParam.h>
 
 #if USE(ACCELERATED_COMPOSITING)
 #include "RenderLayerBacking.h"
 #include "RenderLayerCompositor.h"
 #endif
 
 #if ENABLE(SVG)
 #include "SVGNames.h"
 #endif
 
@@ skipping 228 matching lines @@
     if (hasTransform != hadTransform) {
         if (hasTransform)
             m_transform.set(new TransformationMatrix);
         else
             m_transform.clear();
     }
     
     if (hasTransform) {
         RenderBox* box = renderBox();
         ASSERT(box);
-        m_transform->reset();
+        m_transform->makeIdentity();
         box->style()->applyTransform(*m_transform, box->borderBoxRect().size());
     }
 }
 
 void RenderLayer::setHasVisibleContent(bool b)
 { 
     if (m_hasVisibleContent == b && !m_visibleContentStatusDirty)
         return;
     m_visibleContentStatusDirty = false; 
     m_hasVisibleContent = b;
@@ skipping 2494 matching lines @@
     if (m_marquee)
         m_marquee->suspend();
     
     for (RenderLayer* curr = firstChild(); curr; curr = curr->nextSibling())
         curr->suspendMarquees();
 }
 
 } // namespace WebCore