summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-06-19 17:19:23 -0700
committerChris Craik <ccraik@google.com>2012-06-19 17:19:23 -0700
commitcfad1b4c7cfa8eb502d1263c81f43e37e28ee928 (patch)
tree198e75be9ce89e68caee518bbded34273e6633e2
parent334c36c686871998bf6c4ac958dfe3b3d5a87033 (diff)
downloadexternal_webkit-cfad1b4c7cfa8eb502d1263c81f43e37e28ee928.zip
external_webkit-cfad1b4c7cfa8eb502d1263c81f43e37e28ee928.tar.gz
external_webkit-cfad1b4c7cfa8eb502d1263c81f43e37e28ee928.tar.bz2
Fix GPL build
Change-Id: Ie9d941bd59584b8a77b90e1f41b2c49a0e02e572
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.cpp1
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.h2
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.cpp b/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.cpp
index 1ee3b67..4b71b1c 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.cpp
@@ -98,6 +98,7 @@ status_t TexturesGenerator::readyToRun()
TilesManager::instance()->tileWidth(),
TilesManager::instance()->tileHeight());
m_bitmap.allocPixels();
+ m_localTid = androidGetTid();
return NO_ERROR;
}
diff --git a/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.h b/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.h
index 22ecf69..d75fbca 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.h
+++ b/Source/WebCore/platform/graphics/android/rendering/TexturesGenerator.h
@@ -59,6 +59,7 @@ public:
static const int gDeferPriorityCutoff = 500000000;
SkBitmap* bitmap() { return &m_bitmap; }
+ int getLocalTid() { return m_localTid; }
private:
QueuedOperation* popNext();
virtual bool threadLoop();
@@ -70,6 +71,7 @@ private:
SkBitmap m_bitmap;
bool m_deferredMode;
+ int m_localTid;
// defer painting for one second if best in queue has priority
// QueuedOperation::gDeferPriorityCutoff or higher
diff --git a/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp b/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
index 8a8a43b..8b9cfb6 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
@@ -530,7 +530,7 @@ SkBitmap* TilesManager::threadLocalBitmap()
{
pid_t localTid = androidGetTid();
for (int i = 0; i < NUM_TEXTURES_GENERATORS; i++) {
- if (localTid == m_textureGenerators[i]->getTid())
+ if (localTid == m_textureGenerators[i]->getLocalTid())
return m_textureGenerators[i]->bitmap();
}
return 0;