diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-10-21 17:02:16 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-10-26 12:01:17 -0700 |
| commit | 3a7a2aa023d51b1806d4063ab0ea5ef7d488556f (patch) | |
| tree | 9a4a2ba969fe70b3ffd90efc517a46d8bf5f9849 /WebCore/platform/graphics/android/BaseTile.h | |
| parent | 75394f5ee0aac2337cdff1597b4e686e22c52833 (diff) | |
| download | external_webkit-3a7a2aa023d51b1806d4063ab0ea5ef7d488556f.zip external_webkit-3a7a2aa023d51b1806d4063ab0ea5ef7d488556f.tar.gz external_webkit-3a7a2aa023d51b1806d4063ab0ea5ef7d488556f.tar.bz2 | |
Remove locks in BaseTile. Also fix the bug where the browser hangs when closing a tab.
Bug:3112610
Change-Id: I4f4854a8a0688fc24b512e7671a2ad0708121075
Diffstat (limited to 'WebCore/platform/graphics/android/BaseTile.h')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseTile.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/BaseTile.h b/WebCore/platform/graphics/android/BaseTile.h index b7e63d6..429d950 100644 --- a/WebCore/platform/graphics/android/BaseTile.h +++ b/WebCore/platform/graphics/android/BaseTile.h @@ -76,7 +76,7 @@ public: void paintBitmap(); float scale() const { return m_scale; } - void setScale(float scale) { m_scale = scale; } + void setScale(float scale); TiledPage* page() { return m_page; } int x() const { return m_x; } @@ -92,9 +92,6 @@ private: // these variables can be updated throughout the lifetime of the object BackedDoubleBufferedTexture* m_texture; float m_scale; - - // used to ensure the variables are consistent between threads - android::Mutex m_varLock; }; } // namespace WebCore |