Minor cleanup of unused headers and overly described functions.

Test: local compile
Change-Id: I5b794c9473f6d3a9e1d4f9365c951c7ce9dade50

core/jni/android/graphics/Picture.cpp

@@ -43,7 +43,7 @@ Canvas* Picture::beginRecording(int width, int height) {
     mRecorder.reset(new SkPictureRecorder);
     mWidth = width;
     mHeight = height;
-    SkCanvas* canvas = mRecorder->beginRecording(width, height, NULL, 0);
+    SkCanvas* canvas = mRecorder->beginRecording(SkIntToScalar(width), SkIntToScalar(height));
     return Canvas::create_canvas(canvas);
 }
 

libs/hwui/renderthread/CanvasContext.cpp

@@ -19,11 +19,9 @@
 
 #include "AnimationContext.h"
 #include "Caches.h"
-#include "DeferredLayerUpdater.h"
 #include "EglManager.h"
 #include "LayerUpdateQueue.h"
 #include "Properties.h"
-#include "Readback.h"
 #include "RenderThread.h"
 #include "hwui/Canvas.h"
 #include "renderstate/RenderState.h"

libs/hwui/tests/unit/SkiaCanvasTests.cpp

@@ -45,7 +45,7 @@ TEST(SkiaCanvasProxy, drawGlyphsViaPicture) {
         SkCanvas* skCanvas = recorder.beginRecording(200, 200, NULL, 0);
         std::unique_ptr<Canvas> pictCanvas(Canvas::create_canvas(skCanvas));
         TestUtils::drawUtf8ToCanvas(pictCanvas.get(), text, paint, 25, 25);
-        sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
+        sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
 
         canvas.asSkCanvas()->drawPicture(picture);
     });