Miscellaneous cleanup to reduce number of includes in platform/graphics/

Source/core/html/HTMLCanvasElement.cpp

Index: Source/core/html/HTMLCanvasElement.cpp
diff --git a/Source/core/html/HTMLCanvasElement.cpp b/Source/core/html/HTMLCanvasElement.cpp
index 3f9a730aac4c62d107fcf386ae4cdedffc72a20f..a5aa7039ecbd557570143ed6dea4beffd988baee 100644
--- a/Source/core/html/HTMLCanvasElement.cpp
+++ b/Source/core/html/HTMLCanvasElement.cpp
@@ -28,8 +28,8 @@
 #include "config.h"
 #include "core/html/HTMLCanvasElement.h"
 
-#include <math.h>
 #include "HTMLNames.h"
+#include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
@@ -37,19 +37,19 @@
 #include "core/html/ImageData.h"
 #include "core/html/canvas/Canvas2DContextAttributes.h"
 #include "core/html/canvas/CanvasRenderingContext2D.h"
+#include "core/html/canvas/WebGLContextAttributes.h"
+#include "core/html/canvas/WebGLRenderingContext.h"
 #include "core/page/Frame.h"
-#include "RuntimeEnabledFeatures.h"
 #include "core/page/Settings.h"
 #include "core/platform/MIMETypeRegistry.h"
 #include "core/platform/graphics/GraphicsContextStateSaver.h"
 #include "core/platform/graphics/ImageBuffer.h"
+#include "core/platform/graphics/transforms/AffineTransform.h"
 #include "core/rendering/RenderHTMLCanvas.h"
+#include "public/platform/Platform.h"
 #include "wtf/MemoryInstrumentationHashSet.h"
 
-#include "core/html/canvas/WebGLContextAttributes.h"
-#include "core/html/canvas/WebGLRenderingContext.h"
-
-#include "public/platform/Platform.h"
+#include <math.h>
 
 namespace WebCore {
 
@@ -575,7 +575,7 @@ AffineTransform HTMLCanvasElement::baseTransform() const
     AffineTransform transform;
     if (size.width() && size.height())
         transform.scaleNonUniform(size.width() / unscaledSize.width(), size.height() / unscaledSize.height());
-    return m_imageBuffer->baseTransform() * transform;
+    return transform;
 }
 
 void HTMLCanvasElement::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const