Remove anchorPoint from WebLayer and GraphicsLayer.

Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 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 61 matching lines @@
     return map;
 }
 
 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient* client)
 {
     return factory->createGraphicsLayer(client);
 }
 
 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     : m_client(client)
-    , m_anchorPoint(0.5f, 0.5f, 0)
+    , m_transformOriginSet(false)
     , m_backgroundColor(Color::transparent)
     , m_opacity(1)
     , m_zPosition(0)
     , m_blendMode(blink::WebBlendModeNormal)
     , m_contentsOpaque(false)
     , m_shouldFlattenTransform(true)
     , m_backfaceVisibility(true)
     , m_masksToBounds(false)
     , m_drawsContent(false)
     , m_contentsVisible(true)
@@ skipping 350 matching lines @@
 }
 
 void GraphicsLayer::setupContentsLayer(WebLayer* contentsLayer)
 {
     ASSERT(contentsLayer);
     m_contentsLayer = contentsLayer;
     m_contentsLayerId = m_contentsLayer->id();
 
     m_contentsLayer->setWebLayerClient(this);
     m_contentsLayer->setTransformOrigin(FloatPoint3D());
-    m_contentsLayer->setAnchorPoint(FloatPoint(0, 0));
     m_contentsLayer->setUseParentBackfaceVisibility(true);
 
     // It is necessary to call setDrawsContent as soon as we receive the new contentsLayer, for
     // the correctness of early exit conditions in setDrawsContent() and setContentsVisible().
     m_contentsLayer->setDrawsContent(m_contentsVisible);
 
     // Insert the content layer first. Video elements require this, because they have
     // shadow content that must display in front of the video.
     m_layer->layer()->insertChild(m_contentsLayer, 0);
     WebLayer* borderWebLayer = m_contentsClippingMaskLayer ? m_contentsClippingMaskLayer->platformLayer() : 0;
@@ skipping 93 matching lines @@
     if (m_position != FloatPoint()) {
         writeIndent(ts, indent + 1);
         ts << "(position " << m_position.x() << " " << m_position.y() << ")\n";
     }
 
     if (m_boundsOrigin != FloatPoint()) {
         writeIndent(ts, indent + 1);
         ts << "(bounds origin " << m_boundsOrigin.x() << " " << m_boundsOrigin.y() << ")\n";
     }
 
-    if (m_anchorPoint != FloatPoint3D(0.5f, 0.5f, 0)) {
-        writeIndent(ts, indent + 1);
-        ts << "(anchor " << m_anchorPoint.x() << " " << m_anchorPoint.y() << ")\n";
+    if (m_transformOriginSet && m_transformOrigin != FloatPoint3D(m_size.width() * 0.5f, m_size.height() * 0.5f, 0)) {

[ojan, 2014/06/05 21:53:31]

Bikeshed: This soudns like a set of transformOrigin's to me. How about
m_hasTransformOrigin?

[chrishtr, 2014/06/05 22:24:24]

Done.

         writeIndent(ts, indent + 1);
         ts << "(transformOrigin " << m_transformOrigin.x() << " " << m_transformOrigin.y() << ")\n";
     }
 
     if (m_size != IntSize()) {
         writeIndent(ts, indent + 1);
         ts << "(bounds " << m_size.width() << " " << m_size.height() << ")\n";
     }
 
     if (m_opacity != 1) {
@@ skipping 220 matching lines @@
 {
     m_debugInfo.setOwnerNodeId(nodeId);
 }
 
 void GraphicsLayer::setPosition(const FloatPoint& point)
 {
     m_position = point;
     platformLayer()->setPosition(m_position);
 }
 
-void GraphicsLayer::setAnchorPoint(const FloatPoint3D& point)
-{
-    m_anchorPoint = point;
-    platformLayer()->setAnchorPoint(FloatPoint(m_anchorPoint.x(), m_anchorPoint.y()));
-    platformLayer()->setAnchorPointZ(m_anchorPoint.z());
-}
-
 void GraphicsLayer::setSize(const FloatSize& size)
 {
     // We are receiving negative sizes here that cause assertions to fail in the compositor. Clamp them to 0 to
     // avoid those assertions.
     // FIXME: This should be an ASSERT instead, as negative sizes should not exist in WebCore.
     FloatSize clampedSize = size;
     if (clampedSize.width() < 0 || clampedSize.height() < 0)
         clampedSize = FloatSize();
 
     if (clampedSize == m_size)
         return;
 
     m_size = clampedSize;
 
     m_layer->layer()->setBounds(flooredIntSize(m_size));
     // Note that we don't resize m_contentsLayer. It's up the caller to do that.
 }
 
 void GraphicsLayer::setTransform(const TransformationMatrix& transform)
 {
     m_transform = transform;
     platformLayer()->setTransform(TransformationMatrix::toSkMatrix44(m_transform));
 }
 
 void GraphicsLayer::setTransformOrigin(const FloatPoint3D& transformOrigin)
 {
+    m_transformOriginSet = true;
     m_transformOrigin = transformOrigin;
     platformLayer()->setTransformOrigin(transformOrigin);
 }
 
 void GraphicsLayer::setShouldFlattenTransform(bool shouldFlatten)
 {
     if (shouldFlatten == m_shouldFlattenTransform)
         return;
 
     m_shouldFlattenTransform = shouldFlatten;
@@ skipping 387 matching lines @@
 #ifndef NDEBUG
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif