diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
| commit | ee4c86d1990a9e26277a6948e7027ad8d525ebfa (patch) | |
| tree | 1e2d3408cd097606571f40ab63353c27bcb7dd5c /Source/WebCore/dom/Document.cpp | |
| parent | d882bec96d0d30aeeda2141bfadfca7f038ee862 (diff) | |
Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718)
New snapshot that includes the return of -fkeep-memory at link time
to reduce memory pressure as well as modularized documentation
Diffstat (limited to 'Source/WebCore/dom/Document.cpp')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index c453cd3cc..efe89f40f 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -182,6 +182,10 @@ #include <wtf/StdLibExtras.h> #include <wtf/text/StringBuffer.h> +#if USE(ACCELERATED_COMPOSITING) +#include "RenderLayerCompositor.h" +#endif + #if ENABLE(SHARED_WORKERS) #include "SharedWorkerRepository.h" #endif @@ -4962,14 +4966,18 @@ void Document::resumeScriptedAnimationControllerCallbacks() void Document::windowScreenDidChange(PlatformDisplayID displayID) { + UNUSED_PARAM(displayID); + #if ENABLE(REQUEST_ANIMATION_FRAME) if (m_scriptedAnimationController) m_scriptedAnimationController->windowScreenDidChange(displayID); -#else - UNUSED_PARAM(displayID); #endif -} +#if USE(ACCELERATED_COMPOSITING) + if (renderView()->usesCompositing()) + renderView()->compositor()->windowScreenDidChange(displayID); +#endif +} String Document::displayStringModifiedByEncoding(const String& str) const { |