summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/GLWebViewState.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-10-19 16:34:10 -0700
committerNicolas Roard <nicolas@android.com>2010-10-26 11:23:34 -0700
commit75394f5ee0aac2337cdff1597b4e686e22c52833 (patch)
tree9256c0016ef1647e117077ea0ae59781b64f1f48 /WebCore/platform/graphics/android/GLWebViewState.h
parentf2c1cb6633bade84ccbe4cc4408a7fb7e15c29b8 (diff)
downloadexternal_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.zip
external_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.tar.gz
external_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.tar.bz2
Fix random crashes when HW acceleration is turned on.
Bug:3107362 Change-Id: I354a07369056e696deed7458a4f4e14d54b7f6c8
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.h')
-rw-r--r--WebCore/platform/graphics/android/GLWebViewState.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h
index 1fc62df..95bc07d 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/WebCore/platform/graphics/android/GLWebViewState.h
@@ -155,7 +155,7 @@ public:
int originalTilesPosY() const { return m_originalTilesPosY; }
void setOriginalTilesPosY(int pos) { m_originalTilesPosY = pos; }
- bool paintBaseLayerContent(SkCanvas* canvas);
+ void paintBaseLayerContent(SkCanvas* canvas);
void setBaseLayer(BaseLayerAndroid* layer, IntRect& rect);
void setExtra(android::DrawExtra* extra, LayerAndroid* navLayer);
void resetExtra(bool repaint);
@@ -178,9 +178,6 @@ public:
unsigned int currentPictureCounter() const { return m_currentPictureCounter; }
SkRect& invalidatedRect() { return m_invalidatedRect; }
- void baseLayerLock() { m_baseLayerLock.lock(); }
- void baseLayerUnlock() { m_baseLayerLock.unlock(); }
-
private:
// Delay between scheduling a new page when the scale