anticipate more optimizations by renaming some files and methods

src/record/SkRecording.cpp

Index: src/record/SkRecording.cpp
diff --git a/src/record/SkRecording.cpp b/src/record/SkRecording.cpp
index 2c59c8a217174040b6da32c69c29d79b30ca806d..6af19593f85894bd1f41b3cda1326c9111859a56 100644
--- a/src/record/SkRecording.cpp
+++ b/src/record/SkRecording.cpp
@@ -8,7 +8,7 @@
 #include "SkRecording.h"
 
 #include "SkRecord.h"
-#include "SkRecordCulling.h"
+#include "SkRecordOpts.h"
 #include "SkRecordDraw.h"
 #include "SkRecorder.h"
 
@@ -37,7 +37,7 @@ SkRecording::SkRecording(int width, int height) {
 
 /*static*/ const SkPlayback* SkRecording::Delete(SkRecording* recording) {
     SkRecord* record = recording->fRecord;
-    SkRecordAnnotateCullingPairs(record);
+    SkRecordOptimize(record);
     SkDELETE(recording);
     return SkNEW_ARGS(SkPlayback, (record));
 }