diff options
| -rw-r--r-- | Source/WebCore/editing/TextIterator.cpp | 1 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp index 3aa68af..871d1f9 100644 --- a/Source/WebCore/editing/TextIterator.cpp +++ b/Source/WebCore/editing/TextIterator.cpp @@ -298,6 +298,7 @@ TextIterator::TextIterator(const Range* r, TextIteratorBehavior behavior) #if OS(ANDROID) , m_stopsOnFormControls(behavior & TextIteratorStopsOnFormControls) , m_shouldStop(false) + , m_needsAnotherNewline(false) #endif { if (!r) diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 012427c..ccd7c14 100644 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -1667,6 +1667,12 @@ void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS // If our z-index changes value or our visibility changes, // we need to dirty our stacking context's z-order list. if (newStyle) { +#if ENABLE(COMPOSITED_FIXED_ELEMENTS) + RenderLayer* layer = hasLayer() ? enclosingLayer() : 0; + if (layer && m_style->position() != newStyle->position() + && (m_style->position() == FixedPosition || newStyle->position() == FixedPosition)) + layer->dirtyZOrderLists(); +#endif bool visibilityChanged = m_style->visibility() != newStyle->visibility() || m_style->zIndex() != newStyle->zIndex() || m_style->hasAutoZIndex() != newStyle->hasAutoZIndex(); diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp index 0af3cc2..f42f307 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp @@ -189,7 +189,7 @@ int WebCookieJar::getNumCookiesInDatabase() return cookieStore()->GetCookieMonster()->GetAllCookies().size(); } -class FlushSemaphore : public base::RefCounted<FlushSemaphore> +class FlushSemaphore : public base::RefCountedThreadSafe<FlushSemaphore> { public: FlushSemaphore() |