diff options
Diffstat (limited to 'Source')
5 files changed, 8 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp index 1eb7f39..e7d4780 100644 --- a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp +++ b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp @@ -86,6 +86,7 @@ AndroidAnimation::AndroidAnimation(AndroidAnimation* anim) , m_type(anim->m_type) , m_operations(anim->m_operations) , m_originalLayer(0) + , m_name(anim->name()) { gDebugAndroidAnimationInstances++; } diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp index b4df0a1..2259072 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.cpp +++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp @@ -355,6 +355,10 @@ LayerTexture* TilesManager::createTextureForLayer(LayerAndroid* layer, const Int if (m_layersMemoryUsage + size > MAX_LAYERS_ALLOCATION) cleanupLayersTextures(layer, true); + // If the cleanup can't achieve the goal, then don't create a layerTexture. + if (m_layersMemoryUsage + size > MAX_LAYERS_ALLOCATION) + return 0; + LayerTexture* texture = new LayerTexture(w, h); texture->setId(layer->uniqueId()); texture->setRect(rect); diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 78c3501..f51ba53 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -115,7 +115,7 @@ void WebRequestContext::setAcceptLanguage(const String& string) acceptLanguageWtfString = string; } -const std::string& WebRequestContext::GetAcceptLanguage() const +const std::string& WebRequestContext::accept_language() const { MutexLocker lock(acceptLanguageMutex); return acceptLanguageStdString; diff --git a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h index 9286127..c254ad6 100644 --- a/Source/WebKit/android/WebCoreSupport/WebRequestContext.h +++ b/Source/WebKit/android/WebCoreSupport/WebRequestContext.h @@ -38,7 +38,7 @@ class WebRequestContext : public net::URLRequestContext { public: // URLRequestContext overrides. virtual const std::string& GetUserAgent(const GURL&) const; - virtual const std::string& GetAcceptLanguage() const; + virtual const std::string& accept_language() const; WebRequestContext(bool isPrivateBrowsing); diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index a31169b..3ec15f3 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/WebKit/android/nav/CacheBuilder.cpp @@ -2893,7 +2893,7 @@ bool CacheBuilder::setData(CachedFrame* cachedFrame) if ((x | y) != 0) viewBounds.setLocation(WebCore::IntPoint(x, y)); cachedFrame->setLocalViewBounds(viewBounds); - cachedFrame->setContentsSize(layer->width(), layer->height()); + cachedFrame->setContentsSize(layer->scrollWidth(), layer->scrollHeight()); if (cachedFrame->childCount() == 0) return true; CachedFrame* lastCachedFrame = cachedFrame->lastChild(); |