From 4ee46079b69a9ec4bfde11e496062232190a8164 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 26 Apr 2012 14:10:24 +0000 Subject: [PATCH] Add patch to fix crash in WebCore::Document::webkitRequestAnimationFrame. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@606 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- patch/patch.cfg | 5 +++++ patch/patches/webcore_document.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 patch/patches/webcore_document.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index 376a187ee..e92d6de1d 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -31,6 +31,11 @@ patches = [ 'name': 'webcore_cachedresource', 'path': '../third_party/WebKit/Source/WebCore/loader/cache/', }, + { + # http://code.google.com/p/chromium/issues/detail?id=118331 + 'name': 'webcore_document', + 'path': '../third_party/WebKit/Source/WebCore/dom/', + }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=364 'name': 'spi_webcore_364', diff --git a/patch/patches/webcore_document.patch b/patch/patches/webcore_document.patch new file mode 100644 index 000000000..5c4a9415d --- /dev/null +++ b/patch/patches/webcore_document.patch @@ -0,0 +1,19 @@ +Index: Document.cpp +=================================================================== +--- Document.cpp (revision 102901) ++++ Document.cpp (working copy) +@@ -5079,8 +5079,13 @@ + #if ENABLE(REQUEST_ANIMATION_FRAME) + int Document::webkitRequestAnimationFrame(PassRefPtr callback, Element* animationElement) + { +- if (!m_scriptedAnimationController) ++ if (!m_scriptedAnimationController) { ++#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) + m_scriptedAnimationController = ScriptedAnimationController::create(this, page()->displayID()); ++#else ++ m_scriptedAnimationController = ScriptedAnimationController::create(this, 0); ++#endif ++ } + + return m_scriptedAnimationController->registerCallback(callback, animationElement); + }