Reorganize platform/graphics/android

Change-Id: Idc67155cfa99784dcd931e705336bfa063ecae46
aosp-mirror · Apr 6, 2012 · 2e510fd · 2e510fd
1 parent c88c889
commit 2e510fd
Show file tree

Hide file tree

Showing 107 changed files with 61 additions and 52 deletions.
diff --git a/Android.mk b/Android.mk
@@ -128,6 +128,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(WEBCORE_PATH)/platform/graphics \
 	$(WEBCORE_PATH)/platform/graphics/android \
 	$(WEBCORE_PATH)/platform/graphics/android/context \
+	$(WEBCORE_PATH)/platform/graphics/android/fonts \
+	$(WEBCORE_PATH)/platform/graphics/android/layers \
+	$(WEBCORE_PATH)/platform/graphics/android/rendering \
+	$(WEBCORE_PATH)/platform/graphics/android/utils \
 	$(WEBCORE_PATH)/platform/graphics/filters \
 	$(WEBCORE_PATH)/platform/graphics/gpu \
 	$(WEBCORE_PATH)/platform/graphics/network \

diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -81,6 +81,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
@@ -633,70 +633,74 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/graphics/StringTruncator.cpp \
 	platform/graphics/WidthIterator.cpp \
 	\
-	platform/graphics/android/AndroidAnimation.cpp \
-	platform/graphics/android/BaseLayerAndroid.cpp \
-	platform/graphics/android/BaseRenderer.cpp \
 	platform/graphics/android/BitmapAllocatorAndroid.cpp \
-	platform/graphics/android/CanvasLayer.cpp \
-	platform/graphics/android/CanvasTexture.cpp \
-	platform/graphics/android/ClassTracker.cpp \
-	platform/graphics/android/DumpLayer.cpp \
-	platform/graphics/android/FixedPositioning.cpp \
-	platform/graphics/android/FontAndroid.cpp \
-	platform/graphics/android/FontCacheAndroid.cpp \
-	platform/graphics/android/FontCustomPlatformData.cpp \
-	platform/graphics/android/FontDataAndroid.cpp \
-	platform/graphics/android/FontPlatformDataAndroid.cpp \
-	platform/graphics/android/GaneshContext.cpp \
-	platform/graphics/android/GaneshRenderer.cpp \
-	platform/graphics/android/GLExtras.cpp \
-	platform/graphics/android/GLUtils.cpp \
-	platform/graphics/android/GLWebViewState.cpp \
-	platform/graphics/android/GlyphMapAndroid.cpp \
 	platform/graphics/android/GradientAndroid.cpp \
 	platform/graphics/android/GraphicsLayerAndroid.cpp \
-	platform/graphics/android/IFrameContentLayerAndroid.cpp \
-	platform/graphics/android/IFrameLayerAndroid.cpp \
+	platform/graphics/android/GLWebViewState.cpp \
 	platform/graphics/android/ImageAndroid.cpp \
 	platform/graphics/android/ImageBufferAndroid.cpp \
 	platform/graphics/android/ImageSourceAndroid.cpp \
-	platform/graphics/android/ImagesManager.cpp \
-	platform/graphics/android/ImageTexture.cpp \
-	platform/graphics/android/InspectorCanvas.cpp \
-	platform/graphics/android/Layer.cpp \
-	platform/graphics/android/LayerAndroid.cpp \
-	platform/graphics/android/MediaLayer.cpp \
-	platform/graphics/android/MediaTexture.cpp \
-	platform/graphics/android/PaintTileOperation.cpp \
 	platform/graphics/android/PathAndroid.cpp \
 	platform/graphics/android/PatternAndroid.cpp \
-	platform/graphics/android/PictureLayerContent.cpp \
-	platform/graphics/android/PictureSetLayerContent.cpp \
-	platform/graphics/android/RasterRenderer.cpp \
-	platform/graphics/android/ScrollableLayerAndroid.cpp \
 	platform/graphics/android/SharedBufferStream.cpp \
-	platform/graphics/android/ShaderProgram.cpp \
-	platform/graphics/android/Surface.cpp \
-	platform/graphics/android/SurfaceBacking.cpp \
-	platform/graphics/android/TextureInfo.cpp \
-	platform/graphics/android/TexturesGenerator.cpp \
-	platform/graphics/android/Tile.cpp \
-	platform/graphics/android/TileGrid.cpp \
-	platform/graphics/android/TileTexture.cpp \
-	platform/graphics/android/TilesManager.cpp \
-	platform/graphics/android/TilesProfiler.cpp \
-	platform/graphics/android/TransferQueue.cpp \
-	platform/graphics/android/SurfaceCollection.cpp \
-	platform/graphics/android/SurfaceCollectionManager.cpp \
-	platform/graphics/android/VerticalTextMap.cpp \
-	platform/graphics/android/VideoLayerAndroid.cpp \
-	platform/graphics/android/VideoLayerManager.cpp \
 	\
 	platform/graphics/android/context/GraphicsContextAndroid.cpp \
 	platform/graphics/android/context/GraphicsOperationCollection.cpp \
 	platform/graphics/android/context/PlatformGraphicsContext.cpp \
 	platform/graphics/android/context/PlatformGraphicsContextRecording.cpp \
-	platform/graphics/android/context/PlatformGraphicsContextSkia.cpp
+	platform/graphics/android/context/PlatformGraphicsContextSkia.cpp \
+	\
+	platform/graphics/android/fonts/FontAndroid.cpp \
+	platform/graphics/android/fonts/FontCacheAndroid.cpp \
+	platform/graphics/android/fonts/FontCustomPlatformData.cpp \
+	platform/graphics/android/fonts/FontDataAndroid.cpp \
+	platform/graphics/android/fonts/FontPlatformDataAndroid.cpp \
+	platform/graphics/android/fonts/GlyphMapAndroid.cpp \
+	platform/graphics/android/fonts/VerticalTextMap.cpp \
+	\
+	platform/graphics/android/layers/AndroidAnimation.cpp \
+	platform/graphics/android/layers/BaseLayerAndroid.cpp \
+	platform/graphics/android/layers/CanvasLayer.cpp \
+	platform/graphics/android/layers/CanvasTexture.cpp \
+	platform/graphics/android/layers/DumpLayer.cpp \
+	platform/graphics/android/layers/FixedPositioning.cpp \
+	platform/graphics/android/layers/IFrameContentLayerAndroid.cpp \
+	platform/graphics/android/layers/IFrameLayerAndroid.cpp \
+	platform/graphics/android/layers/Layer.cpp \
+	platform/graphics/android/layers/LayerAndroid.cpp \
+	platform/graphics/android/layers/MediaLayer.cpp \
+	platform/graphics/android/layers/MediaTexture.cpp \
+	platform/graphics/android/layers/PictureLayerContent.cpp \
+	platform/graphics/android/layers/PictureSetLayerContent.cpp \
+	platform/graphics/android/layers/ScrollableLayerAndroid.cpp \
+	platform/graphics/android/layers/VideoLayerAndroid.cpp \
+	platform/graphics/android/layers/VideoLayerManager.cpp \
+	\
+	platform/graphics/android/rendering/BaseRenderer.cpp \
+	platform/graphics/android/rendering/GaneshContext.cpp \
+	platform/graphics/android/rendering/GaneshRenderer.cpp \
+	platform/graphics/android/rendering/GLExtras.cpp \
+	platform/graphics/android/rendering/GLUtils.cpp \
+	platform/graphics/android/rendering/ImagesManager.cpp \
+	platform/graphics/android/rendering/ImageTexture.cpp \
+	platform/graphics/android/rendering/InspectorCanvas.cpp \
+	platform/graphics/android/rendering/PaintTileOperation.cpp \
+	platform/graphics/android/rendering/RasterRenderer.cpp \
+	platform/graphics/android/rendering/ShaderProgram.cpp \
+	platform/graphics/android/rendering/Surface.cpp \
+	platform/graphics/android/rendering/SurfaceBacking.cpp \
+	platform/graphics/android/rendering/SurfaceCollection.cpp \
+	platform/graphics/android/rendering/SurfaceCollectionManager.cpp \
+	platform/graphics/android/rendering/TextureInfo.cpp \
+	platform/graphics/android/rendering/TexturesGenerator.cpp \
+	platform/graphics/android/rendering/Tile.cpp \
+	platform/graphics/android/rendering/TileGrid.cpp \
+	platform/graphics/android/rendering/TileTexture.cpp \
+	platform/graphics/android/rendering/TilesManager.cpp \
+	platform/graphics/android/rendering/TilesProfiler.cpp \
+	platform/graphics/android/rendering/TransferQueue.cpp \
+	\
+	platform/graphics/android/utils/ClassTracker.cpp
 
 ifeq ($(ENABLE_SVG), true)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
@@ -1268,5 +1272,5 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 # For complex scripts(Arabic, Thai, Hindi...).
 ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
-	platform/graphics/android/HarfbuzzSkia.cpp
+	platform/graphics/android/fonts/HarfbuzzSkia.cpp
 endif
diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -36,7 +36,7 @@
 #elif (PLATFORM(EFL) || PLATFORM(GTK)) && USE(PANGO)
 #include "pango/FontPlatformData.h"
 #elif PLATFORM(ANDROID)
-#include "android/FontPlatformData.h"
+#include "android/fonts/FontPlatformData.h"
 #else
 
 #ifndef FontPlatformData_h

diff --git a/...tform/graphics/android/android_graphics.h → ...aphics/android/context/android_graphics.h b/...tform/graphics/android/android_graphics.h → ...aphics/android/context/android_graphics.h
diff --git a/...platform/graphics/android/FontAndroid.cpp → ...rm/graphics/android/fonts/FontAndroid.cpp b/...platform/graphics/android/FontAndroid.cpp → ...rm/graphics/android/fonts/FontAndroid.cpp
diff --git a/...orm/graphics/android/FontCacheAndroid.cpp → ...aphics/android/fonts/FontCacheAndroid.cpp b/...orm/graphics/android/FontCacheAndroid.cpp → ...aphics/android/fonts/FontCacheAndroid.cpp
diff --git a/...aphics/android/FontCustomPlatformData.cpp → .../android/fonts/FontCustomPlatformData.cpp b/...aphics/android/FontCustomPlatformData.cpp → .../android/fonts/FontCustomPlatformData.cpp
diff --git a/...graphics/android/FontCustomPlatformData.h → ...cs/android/fonts/FontCustomPlatformData.h b/...graphics/android/FontCustomPlatformData.h → ...cs/android/fonts/FontCustomPlatformData.h
diff --git a/...form/graphics/android/FontDataAndroid.cpp → ...raphics/android/fonts/FontDataAndroid.cpp b/...form/graphics/android/FontDataAndroid.cpp → ...raphics/android/fonts/FontDataAndroid.cpp
diff --git a/...tform/graphics/android/FontPlatformData.h → ...graphics/android/fonts/FontPlatformData.h b/...tform/graphics/android/FontPlatformData.h → ...graphics/android/fonts/FontPlatformData.h
diff --git a/...phics/android/FontPlatformDataAndroid.cpp → ...android/fonts/FontPlatformDataAndroid.cpp b/...phics/android/FontPlatformDataAndroid.cpp → ...android/fonts/FontPlatformDataAndroid.cpp
diff --git a/...form/graphics/android/GlyphMapAndroid.cpp → ...raphics/android/fonts/GlyphMapAndroid.cpp b/...form/graphics/android/GlyphMapAndroid.cpp → ...raphics/android/fonts/GlyphMapAndroid.cpp
diff --git a/...latform/graphics/android/HarfbuzzSkia.cpp → ...m/graphics/android/fonts/HarfbuzzSkia.cpp b/...latform/graphics/android/HarfbuzzSkia.cpp → ...m/graphics/android/fonts/HarfbuzzSkia.cpp
diff --git a/.../platform/graphics/android/HarfbuzzSkia.h → ...orm/graphics/android/fonts/HarfbuzzSkia.h b/.../platform/graphics/android/HarfbuzzSkia.h → ...orm/graphics/android/fonts/HarfbuzzSkia.h
diff --git a/...form/graphics/android/VerticalTextMap.cpp → ...raphics/android/fonts/VerticalTextMap.cpp b/...form/graphics/android/VerticalTextMap.cpp → ...raphics/android/fonts/VerticalTextMap.cpp
diff --git a/...atform/graphics/android/VerticalTextMap.h → .../graphics/android/fonts/VerticalTextMap.h b/...atform/graphics/android/VerticalTextMap.h → .../graphics/android/fonts/VerticalTextMap.h
diff --git a/...orm/graphics/android/AndroidAnimation.cpp → ...phics/android/layers/AndroidAnimation.cpp b/...orm/graphics/android/AndroidAnimation.cpp → ...phics/android/layers/AndroidAnimation.cpp
diff --git a/...tform/graphics/android/AndroidAnimation.h → ...raphics/android/layers/AndroidAnimation.h b/...tform/graphics/android/AndroidAnimation.h → ...raphics/android/layers/AndroidAnimation.h
diff --git a/...orm/graphics/android/BaseLayerAndroid.cpp → ...phics/android/layers/BaseLayerAndroid.cpp b/...orm/graphics/android/BaseLayerAndroid.cpp → ...phics/android/layers/BaseLayerAndroid.cpp
diff --git a/...tform/graphics/android/BaseLayerAndroid.h → ...raphics/android/layers/BaseLayerAndroid.h b/...tform/graphics/android/BaseLayerAndroid.h → ...raphics/android/layers/BaseLayerAndroid.h
diff --git a/...platform/graphics/android/CanvasLayer.cpp → ...m/graphics/android/layers/CanvasLayer.cpp b/...platform/graphics/android/CanvasLayer.cpp → ...m/graphics/android/layers/CanvasLayer.cpp
diff --git a/...e/platform/graphics/android/CanvasLayer.h → ...orm/graphics/android/layers/CanvasLayer.h b/...e/platform/graphics/android/CanvasLayer.h → ...orm/graphics/android/layers/CanvasLayer.h
diff --git a/...atform/graphics/android/CanvasTexture.cpp → ...graphics/android/layers/CanvasTexture.cpp b/...atform/graphics/android/CanvasTexture.cpp → ...graphics/android/layers/CanvasTexture.cpp
diff --git a/...platform/graphics/android/CanvasTexture.h → ...m/graphics/android/layers/CanvasTexture.h b/...platform/graphics/android/CanvasTexture.h → ...m/graphics/android/layers/CanvasTexture.h
diff --git a/...e/platform/graphics/android/DumpLayer.cpp → ...orm/graphics/android/layers/DumpLayer.cpp b/...e/platform/graphics/android/DumpLayer.cpp → ...orm/graphics/android/layers/DumpLayer.cpp
diff --git a/...ore/platform/graphics/android/DumpLayer.h → ...tform/graphics/android/layers/DumpLayer.h b/...ore/platform/graphics/android/DumpLayer.h → ...tform/graphics/android/layers/DumpLayer.h
diff --git a/...orm/graphics/android/FixedPositioning.cpp → ...phics/android/layers/FixedPositioning.cpp b/...orm/graphics/android/FixedPositioning.cpp → ...phics/android/layers/FixedPositioning.cpp
diff --git a/...tform/graphics/android/FixedPositioning.h → ...raphics/android/layers/FixedPositioning.h b/...tform/graphics/android/FixedPositioning.h → ...raphics/android/layers/FixedPositioning.h
diff --git a/...ics/android/IFrameContentLayerAndroid.cpp → ...roid/layers/IFrameContentLayerAndroid.cpp b/...ics/android/IFrameContentLayerAndroid.cpp → ...roid/layers/IFrameContentLayerAndroid.cpp
diff --git a/...phics/android/IFrameContentLayerAndroid.h → ...ndroid/layers/IFrameContentLayerAndroid.h b/...phics/android/IFrameContentLayerAndroid.h → ...ndroid/layers/IFrameContentLayerAndroid.h
diff --git a/...m/graphics/android/IFrameLayerAndroid.cpp → ...ics/android/layers/IFrameLayerAndroid.cpp b/...m/graphics/android/IFrameLayerAndroid.cpp → ...ics/android/layers/IFrameLayerAndroid.cpp
diff --git a/...orm/graphics/android/IFrameLayerAndroid.h → ...phics/android/layers/IFrameLayerAndroid.h b/...orm/graphics/android/IFrameLayerAndroid.h → ...phics/android/layers/IFrameLayerAndroid.h
diff --git a/...bCore/platform/graphics/android/Layer.cpp → ...latform/graphics/android/layers/Layer.cpp b/...bCore/platform/graphics/android/Layer.cpp → ...latform/graphics/android/layers/Layer.cpp
diff --git a/...WebCore/platform/graphics/android/Layer.h → .../platform/graphics/android/layers/Layer.h b/...WebCore/platform/graphics/android/Layer.h → .../platform/graphics/android/layers/Layer.h
diff --git a/...latform/graphics/android/LayerAndroid.cpp → .../graphics/android/layers/LayerAndroid.cpp b/...latform/graphics/android/LayerAndroid.cpp → .../graphics/android/layers/LayerAndroid.cpp
diff --git a/.../platform/graphics/android/LayerAndroid.h → ...rm/graphics/android/layers/LayerAndroid.h b/.../platform/graphics/android/LayerAndroid.h → ...rm/graphics/android/layers/LayerAndroid.h
diff --git a/.../platform/graphics/android/LayerContent.h → ...rm/graphics/android/layers/LayerContent.h b/.../platform/graphics/android/LayerContent.h → ...rm/graphics/android/layers/LayerContent.h
diff --git a/.../platform/graphics/android/MediaLayer.cpp → ...rm/graphics/android/layers/MediaLayer.cpp b/.../platform/graphics/android/MediaLayer.cpp → ...rm/graphics/android/layers/MediaLayer.cpp
diff --git a/...re/platform/graphics/android/MediaLayer.h → ...form/graphics/android/layers/MediaLayer.h b/...re/platform/graphics/android/MediaLayer.h → ...form/graphics/android/layers/MediaLayer.h
diff --git a/...platform/graphics/android/MediaListener.h → ...m/graphics/android/layers/MediaListener.h b/...platform/graphics/android/MediaListener.h → ...m/graphics/android/layers/MediaListener.h
diff --git a/...phics/android/MediaPlayerPrivateAndroid.h → ...ndroid/layers/MediaPlayerPrivateAndroid.h b/...phics/android/MediaPlayerPrivateAndroid.h → ...ndroid/layers/MediaPlayerPrivateAndroid.h
diff --git a/...latform/graphics/android/MediaTexture.cpp → .../graphics/android/layers/MediaTexture.cpp b/...latform/graphics/android/MediaTexture.cpp → .../graphics/android/layers/MediaTexture.cpp
diff --git a/.../platform/graphics/android/MediaTexture.h → ...rm/graphics/android/layers/MediaTexture.h b/.../platform/graphics/android/MediaTexture.h → ...rm/graphics/android/layers/MediaTexture.h
diff --git a/.../graphics/android/PictureLayerContent.cpp → ...cs/android/layers/PictureLayerContent.cpp b/.../graphics/android/PictureLayerContent.cpp → ...cs/android/layers/PictureLayerContent.cpp
diff --git a/...rm/graphics/android/PictureLayerContent.h → ...hics/android/layers/PictureLayerContent.h b/...rm/graphics/android/PictureLayerContent.h → ...hics/android/layers/PictureLayerContent.h
diff --git a/...aphics/android/PictureSetLayerContent.cpp → ...android/layers/PictureSetLayerContent.cpp b/...aphics/android/PictureSetLayerContent.cpp → ...android/layers/PictureSetLayerContent.cpp
diff --git a/...graphics/android/PictureSetLayerContent.h → ...s/android/layers/PictureSetLayerContent.h b/...graphics/android/PictureSetLayerContent.h → ...s/android/layers/PictureSetLayerContent.h
diff --git a/...aphics/android/ScrollableLayerAndroid.cpp → ...android/layers/ScrollableLayerAndroid.cpp b/...aphics/android/ScrollableLayerAndroid.cpp → ...android/layers/ScrollableLayerAndroid.cpp
diff --git a/...graphics/android/ScrollableLayerAndroid.h → ...s/android/layers/ScrollableLayerAndroid.h b/...graphics/android/ScrollableLayerAndroid.h → ...s/android/layers/ScrollableLayerAndroid.h
diff --git a/...rm/graphics/android/VideoLayerAndroid.cpp → ...hics/android/layers/VideoLayerAndroid.cpp b/...rm/graphics/android/VideoLayerAndroid.cpp → ...hics/android/layers/VideoLayerAndroid.cpp
diff --git a/...form/graphics/android/VideoLayerAndroid.h → ...aphics/android/layers/VideoLayerAndroid.h b/...form/graphics/android/VideoLayerAndroid.h → ...aphics/android/layers/VideoLayerAndroid.h
diff --git a/...rm/graphics/android/VideoLayerManager.cpp → ...hics/android/layers/VideoLayerManager.cpp b/...rm/graphics/android/VideoLayerManager.cpp → ...hics/android/layers/VideoLayerManager.cpp
diff --git a/...form/graphics/android/VideoLayerManager.h → ...aphics/android/layers/VideoLayerManager.h b/...form/graphics/android/VideoLayerManager.h → ...aphics/android/layers/VideoLayerManager.h
diff --git a/...latform/graphics/android/BaseRenderer.cpp → ...aphics/android/rendering/BaseRenderer.cpp b/...latform/graphics/android/BaseRenderer.cpp → ...aphics/android/rendering/BaseRenderer.cpp
diff --git a/.../platform/graphics/android/BaseRenderer.h → ...graphics/android/rendering/BaseRenderer.h b/.../platform/graphics/android/BaseRenderer.h → ...graphics/android/rendering/BaseRenderer.h
diff --git a/.../platform/graphics/android/DrawQuadData.h → ...graphics/android/rendering/DrawQuadData.h b/.../platform/graphics/android/DrawQuadData.h → ...graphics/android/rendering/DrawQuadData.h
diff --git a/...re/platform/graphics/android/GLExtras.cpp → ...m/graphics/android/rendering/GLExtras.cpp b/...re/platform/graphics/android/GLExtras.cpp → ...m/graphics/android/rendering/GLExtras.cpp
diff --git a/...Core/platform/graphics/android/GLExtras.h → ...orm/graphics/android/rendering/GLExtras.h b/...Core/platform/graphics/android/GLExtras.h → ...orm/graphics/android/rendering/GLExtras.h
diff --git a/...ore/platform/graphics/android/GLUtils.cpp → ...rm/graphics/android/rendering/GLUtils.cpp b/...ore/platform/graphics/android/GLUtils.cpp → ...rm/graphics/android/rendering/GLUtils.cpp
diff --git a/...bCore/platform/graphics/android/GLUtils.h → ...form/graphics/android/rendering/GLUtils.h b/...bCore/platform/graphics/android/GLUtils.h → ...form/graphics/android/rendering/GLUtils.h
diff --git a/...atform/graphics/android/GaneshContext.cpp → ...phics/android/rendering/GaneshContext.cpp b/...atform/graphics/android/GaneshContext.cpp → ...phics/android/rendering/GaneshContext.cpp
diff --git a/...platform/graphics/android/GaneshContext.h → ...raphics/android/rendering/GaneshContext.h b/...platform/graphics/android/GaneshContext.h → ...raphics/android/rendering/GaneshContext.h
diff --git a/...tform/graphics/android/GaneshRenderer.cpp → ...hics/android/rendering/GaneshRenderer.cpp b/...tform/graphics/android/GaneshRenderer.cpp → ...hics/android/rendering/GaneshRenderer.cpp
diff --git a/...latform/graphics/android/GaneshRenderer.h → ...aphics/android/rendering/GaneshRenderer.h b/...latform/graphics/android/GaneshRenderer.h → ...aphics/android/rendering/GaneshRenderer.h
diff --git a/...latform/graphics/android/ImageTexture.cpp → ...aphics/android/rendering/ImageTexture.cpp b/...latform/graphics/android/ImageTexture.cpp → ...aphics/android/rendering/ImageTexture.cpp
diff --git a/.../platform/graphics/android/ImageTexture.h → ...graphics/android/rendering/ImageTexture.h b/.../platform/graphics/android/ImageTexture.h → ...graphics/android/rendering/ImageTexture.h
diff --git a/...atform/graphics/android/ImagesManager.cpp → ...phics/android/rendering/ImagesManager.cpp b/...atform/graphics/android/ImagesManager.cpp → ...phics/android/rendering/ImagesManager.cpp
diff --git a/...platform/graphics/android/ImagesManager.h → ...raphics/android/rendering/ImagesManager.h b/...platform/graphics/android/ImagesManager.h → ...raphics/android/rendering/ImagesManager.h
diff --git a/...form/graphics/android/InspectorCanvas.cpp → ...ics/android/rendering/InspectorCanvas.cpp b/...form/graphics/android/InspectorCanvas.cpp → ...ics/android/rendering/InspectorCanvas.cpp
diff --git a/...atform/graphics/android/InspectorCanvas.h → ...phics/android/rendering/InspectorCanvas.h b/...atform/graphics/android/InspectorCanvas.h → ...phics/android/rendering/InspectorCanvas.h
diff --git a/...m/graphics/android/PaintTileOperation.cpp → .../android/rendering/PaintTileOperation.cpp b/...m/graphics/android/PaintTileOperation.cpp → .../android/rendering/PaintTileOperation.cpp
diff --git a/...orm/graphics/android/PaintTileOperation.h → ...cs/android/rendering/PaintTileOperation.h b/...orm/graphics/android/PaintTileOperation.h → ...cs/android/rendering/PaintTileOperation.h
diff --git a/...atform/graphics/android/QueuedOperation.h → ...phics/android/rendering/QueuedOperation.h b/...atform/graphics/android/QueuedOperation.h → ...phics/android/rendering/QueuedOperation.h
diff --git a/...tform/graphics/android/RasterRenderer.cpp → ...hics/android/rendering/RasterRenderer.cpp b/...tform/graphics/android/RasterRenderer.cpp → ...hics/android/rendering/RasterRenderer.cpp
diff --git a/...latform/graphics/android/RasterRenderer.h → ...aphics/android/rendering/RasterRenderer.h b/...latform/graphics/android/RasterRenderer.h → ...aphics/android/rendering/RasterRenderer.h
diff --git a/...atform/graphics/android/ShaderProgram.cpp → ...phics/android/rendering/ShaderProgram.cpp b/...atform/graphics/android/ShaderProgram.cpp → ...phics/android/rendering/ShaderProgram.cpp
diff --git a/...platform/graphics/android/ShaderProgram.h → ...raphics/android/rendering/ShaderProgram.h b/...platform/graphics/android/ShaderProgram.h → ...raphics/android/rendering/ShaderProgram.h
diff --git a/...ore/platform/graphics/android/Surface.cpp → ...rm/graphics/android/rendering/Surface.cpp b/...ore/platform/graphics/android/Surface.cpp → ...rm/graphics/android/rendering/Surface.cpp
diff --git a/...bCore/platform/graphics/android/Surface.h → ...form/graphics/android/rendering/Surface.h b/...bCore/platform/graphics/android/Surface.h → ...form/graphics/android/rendering/Surface.h
diff --git a/...tform/graphics/android/SurfaceBacking.cpp → ...hics/android/rendering/SurfaceBacking.cpp b/...tform/graphics/android/SurfaceBacking.cpp → ...hics/android/rendering/SurfaceBacking.cpp
diff --git a/...latform/graphics/android/SurfaceBacking.h → ...aphics/android/rendering/SurfaceBacking.h b/...latform/graphics/android/SurfaceBacking.h → ...aphics/android/rendering/SurfaceBacking.h
diff --git a/...rm/graphics/android/SurfaceCollection.cpp → ...s/android/rendering/SurfaceCollection.cpp b/...rm/graphics/android/SurfaceCollection.cpp → ...s/android/rendering/SurfaceCollection.cpp
diff --git a/...form/graphics/android/SurfaceCollection.h → ...ics/android/rendering/SurfaceCollection.h b/...form/graphics/android/SurfaceCollection.h → ...ics/android/rendering/SurfaceCollection.h
diff --git a/...hics/android/SurfaceCollectionManager.cpp → ...id/rendering/SurfaceCollectionManager.cpp b/...hics/android/SurfaceCollectionManager.cpp → ...id/rendering/SurfaceCollectionManager.cpp
diff --git a/...aphics/android/SurfaceCollectionManager.h → ...roid/rendering/SurfaceCollectionManager.h b/...aphics/android/SurfaceCollectionManager.h → ...roid/rendering/SurfaceCollectionManager.h
diff --git a/...platform/graphics/android/TextureInfo.cpp → ...raphics/android/rendering/TextureInfo.cpp b/...platform/graphics/android/TextureInfo.cpp → ...raphics/android/rendering/TextureInfo.cpp
diff --git a/...e/platform/graphics/android/TextureInfo.h → .../graphics/android/rendering/TextureInfo.h b/...e/platform/graphics/android/TextureInfo.h → .../graphics/android/rendering/TextureInfo.h
diff --git a/.../platform/graphics/android/TextureOwner.h → ...graphics/android/rendering/TextureOwner.h b/.../platform/graphics/android/TextureOwner.h → ...graphics/android/rendering/TextureOwner.h
diff --git a/...rm/graphics/android/TexturesGenerator.cpp → ...s/android/rendering/TexturesGenerator.cpp b/...rm/graphics/android/TexturesGenerator.cpp → ...s/android/rendering/TexturesGenerator.cpp
diff --git a/...form/graphics/android/TexturesGenerator.h → ...ics/android/rendering/TexturesGenerator.h b/...form/graphics/android/TexturesGenerator.h → ...ics/android/rendering/TexturesGenerator.h
diff --git a/...ebCore/platform/graphics/android/Tile.cpp → ...tform/graphics/android/rendering/Tile.cpp b/...ebCore/platform/graphics/android/Tile.cpp → ...tform/graphics/android/rendering/Tile.cpp
diff --git a/.../WebCore/platform/graphics/android/Tile.h → ...latform/graphics/android/rendering/Tile.h b/.../WebCore/platform/graphics/android/Tile.h → ...latform/graphics/android/rendering/Tile.h
diff --git a/...re/platform/graphics/android/TileGrid.cpp → ...m/graphics/android/rendering/TileGrid.cpp b/...re/platform/graphics/android/TileGrid.cpp → ...m/graphics/android/rendering/TileGrid.cpp
diff --git a/...Core/platform/graphics/android/TileGrid.h → ...orm/graphics/android/rendering/TileGrid.h b/...Core/platform/graphics/android/TileGrid.h → ...orm/graphics/android/rendering/TileGrid.h
diff --git a/...e/platform/graphics/android/TilePainter.h → .../graphics/android/rendering/TilePainter.h b/...e/platform/graphics/android/TilePainter.h → .../graphics/android/rendering/TilePainter.h
diff --git a/...platform/graphics/android/TileTexture.cpp → ...raphics/android/rendering/TileTexture.cpp b/...platform/graphics/android/TileTexture.cpp → ...raphics/android/rendering/TileTexture.cpp
diff --git a/...e/platform/graphics/android/TileTexture.h → .../graphics/android/rendering/TileTexture.h b/...e/platform/graphics/android/TileTexture.h → .../graphics/android/rendering/TileTexture.h
diff --git a/...latform/graphics/android/TilesManager.cpp → ...aphics/android/rendering/TilesManager.cpp b/...latform/graphics/android/TilesManager.cpp → ...aphics/android/rendering/TilesManager.cpp
diff --git a/.../platform/graphics/android/TilesManager.h → ...graphics/android/rendering/TilesManager.h b/.../platform/graphics/android/TilesManager.h → ...graphics/android/rendering/TilesManager.h
diff --git a/...atform/graphics/android/TilesProfiler.cpp → ...phics/android/rendering/TilesProfiler.cpp b/...atform/graphics/android/TilesProfiler.cpp → ...phics/android/rendering/TilesProfiler.cpp
diff --git a/...platform/graphics/android/TilesProfiler.h → ...raphics/android/rendering/TilesProfiler.h b/...platform/graphics/android/TilesProfiler.h → ...raphics/android/rendering/TilesProfiler.h
diff --git a/...atform/graphics/android/TransferQueue.cpp → ...phics/android/rendering/TransferQueue.cpp b/...atform/graphics/android/TransferQueue.cpp → ...phics/android/rendering/TransferQueue.cpp
diff --git a/...platform/graphics/android/TransferQueue.h → ...raphics/android/rendering/TransferQueue.h b/...platform/graphics/android/TransferQueue.h → ...raphics/android/rendering/TransferQueue.h
diff --git a/...latform/graphics/android/ClassTracker.cpp → ...m/graphics/android/utils/ClassTracker.cpp b/...latform/graphics/android/ClassTracker.cpp → ...m/graphics/android/utils/ClassTracker.cpp
diff --git a/.../platform/graphics/android/ClassTracker.h → ...orm/graphics/android/utils/ClassTracker.h b/.../platform/graphics/android/ClassTracker.h → ...orm/graphics/android/utils/ClassTracker.h
diff --git a/...re/platform/graphics/android/TestExport.h → ...tform/graphics/android/utils/TestExport.h b/...re/platform/graphics/android/TestExport.h → ...tform/graphics/android/utils/TestExport.h