diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-11 13:06:29 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-01-11 13:31:17 -0500 |
| commit | 8b0b15e74bb7f1bd03bfd07f706a5afa637b0b73 (patch) | |
| tree | 567ddbbd582944bc8b732f38ac17220c258509d0 /WebCore/rendering/RenderLayer.h | |
| parent | c3c04e3ba294eb676d432752484dc9074ae6b7e4 (diff) | |
| download | external_webkit-8b0b15e74bb7f1bd03bfd07f706a5afa637b0b73.zip external_webkit-8b0b15e74bb7f1bd03bfd07f706a5afa637b0b73.tar.gz external_webkit-8b0b15e74bb7f1bd03bfd07f706a5afa637b0b73.tar.bz2 | |
Prevent a crash by caching overflow scrolling.
Use adoptRef when creating a new bridge item. Use
toRenderBoxModelObject instead of toRenderBox as RenderInlines have layers.
Bug: 3321493
Change-Id: I4283681eba961aedaa8d80bfdfb3d1a468aab1ac
Diffstat (limited to 'WebCore/rendering/RenderLayer.h')
| -rw-r--r-- | WebCore/rendering/RenderLayer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.h b/WebCore/rendering/RenderLayer.h index 2a80a17..8d176df 100644 --- a/WebCore/rendering/RenderLayer.h +++ b/WebCore/rendering/RenderLayer.h @@ -275,7 +275,7 @@ public: bool hasOverflowControls() const; #if ENABLE(ANDROID_OVERFLOW_SCROLL) - bool hasOverflowScroll() const; + bool hasOverflowScroll() const { return m_hasOverflowScroll; } bool hasOverflowParent() const; #endif void positionOverflowControls(int tx, int ty); @@ -703,6 +703,9 @@ protected: bool m_hasCompositingDescendant : 1; bool m_mustOverlapCompositedLayers : 1; #endif +#if ENABLE(ANDROID_OVERFLOW_SCROLL) + bool m_hasOverflowScroll : 1; +#endif RenderMarquee* m_marquee; // Used by layers with overflow:marquee |