summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/WebCore/platform/graphics/android/TilesManager.cpp4
-rw-r--r--Source/WebCore/platform/graphics/android/TilesProfiler.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp
index 398cb09..6a294b0 100644
--- a/Source/WebCore/platform/graphics/android/TilesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp
@@ -68,8 +68,8 @@
#define EXPANDED_TILE_BOUNDS_X 0
#define EXPANDED_TILE_BOUNDS_Y 0
#define MAX_TEXTURE_ALLOCATION 3+(6+EXPANDED_TILE_BOUNDS_X*2)*(4+EXPANDED_TILE_BOUNDS_Y*2)*2
-#define TILE_WIDTH 300
-#define TILE_HEIGHT 300
+#define TILE_WIDTH 256
+#define TILE_HEIGHT 256
#define LAYER_TILE_WIDTH 256
#define LAYER_TILE_HEIGHT 256
#define LAYER_TILES 10
diff --git a/Source/WebCore/platform/graphics/android/TilesProfiler.cpp b/Source/WebCore/platform/graphics/android/TilesProfiler.cpp
index 466923a..653d525 100644
--- a/Source/WebCore/platform/graphics/android/TilesProfiler.cpp
+++ b/Source/WebCore/platform/graphics/android/TilesProfiler.cpp
@@ -97,7 +97,7 @@ void TilesProfiler::nextFrame(int left, int top, int right, int bottom, float sc
m_records.append(WTF::Vector<TileProfileRecord>());
- //first two records designate viewport
+ //first record designates viewport
m_records.last().append(TileProfileRecord(
left, top, right, bottom,
scale, true, (int)(timeDelta * 1000)));
@@ -105,7 +105,7 @@ void TilesProfiler::nextFrame(int left, int top, int right, int bottom, float sc
void TilesProfiler::nextTile(BaseTile& tile, float scale, bool inView)
{
- if (!m_enabled || (m_records.size() > MAX_PROF_FRAMES))
+ if (!m_enabled || (m_records.size() > MAX_PROF_FRAMES) || (m_records.size() == 0))
return;
bool isReady = tile.isTileReady();
@@ -128,7 +128,7 @@ void TilesProfiler::nextTile(BaseTile& tile, float scale, bool inView)
void TilesProfiler::nextInval(const IntRect& rect, float scale)
{
- if (!m_enabled || (m_records.size() > MAX_PROF_FRAMES))
+ if (!m_enabled || (m_records.size() > MAX_PROF_FRAMES) || (m_records.size() == 0))
return;
m_records.last().append(TileProfileRecord(