diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-02-19 07:35:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-19 07:35:45 -0800 |
| commit | d3b2919d307e4b0ea98b7b5c67991c853c99b562 (patch) | |
| tree | 92adb1a4ed784d558fe7b934f14580d5a5b8fc2c /WebCore/platform/graphics/android/GLWebViewState.h | |
| parent | d3f534955e1e80e5a9192c84db518f8f0eff5b00 (diff) | |
| parent | 634f229e4f0075b052e110ba0a89554c46f6c510 (diff) | |
| download | external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.zip external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.tar.gz external_webkit-d3b2919d307e4b0ea98b7b5c67991c853c99b562.tar.bz2 | |
am 634f229e: Do not merge: Cherry-pick Fix ANR in the browser from master
* commit '634f229e4f0075b052e110ba0a89554c46f6c510':
Do not merge: Cherry-pick Fix ANR in the browser from master
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.h')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h index d45340d..4b71d86 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.h +++ b/WebCore/platform/graphics/android/GLWebViewState.h @@ -208,6 +208,9 @@ public: void setBackgroundColor(SkColor color) { m_backgroundColor = color; } SkColor getBackgroundColor() { return m_backgroundColor; } + bool drawGL(IntRect& rect, SkRect& viewport, + float scale, SkColor color = SK_ColorWHITE); + private: void inval(const IntRect& rect); // caller must hold m_baseLayerLock |