Changeset 106846 in webkit
- Timestamp:
- Feb 6, 2012 1:55:47 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r106840 r106846 1 2012-02-06 Jochen Eisinger <jochen@chromium.org> 2 3 Before accessing a frame's script controller in V8 bindings, first check that the frame actually exists 4 https://bugs.webkit.org/show_bug.cgi?id=77370 5 6 Reviewed by Adam Barth. 7 8 I don't have a working reproduction of the crash yet. As soon as I have 9 one, I will add new layout tests. 10 11 * bindings/v8/PageScriptDebugServer.cpp: 12 (WebCore::PageScriptDebugServer::addListener): 13 * bindings/v8/ScheduledAction.cpp: 14 (WebCore::ScheduledAction::execute): 15 * bindings/v8/ScriptCachedFrameData.cpp: 16 (WebCore::ScriptCachedFrameData::restore): 17 * page/DOMTimer.cpp: 18 (WebCore::DOMTimer::DOMTimer): remove temporary debug code 19 1 20 2012-02-06 James Robinson <jamesr@chromium.org> 2 21 -
trunk/Source/WebCore/bindings/v8/PageScriptDebugServer.cpp
r104694 r106846 77 77 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page) 78 78 { 79 V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame()); 80 if (!proxy) 81 return; 79 82 ScriptController* scriptController = page->mainFrame()->script(); 80 83 if (!scriptController->canExecuteScripts(NotAboutToExecuteScript)) 81 84 return; 82 V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());83 85 84 86 v8::HandleScope scope; -
trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp
r106680 r106846 97 97 if (context->isDocument()) { 98 98 Frame* frame = static_cast<Document*>(context)->frame(); 99 if (!frame) 100 return; 99 101 ScriptController* scriptController = frame->script(); 100 102 if (!scriptController->canExecuteScripts(AboutToExecuteScript)) -
trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp
r104694 r106846 60 60 return; 61 61 62 if (!frame ->script()->canExecuteScripts(NotAboutToExecuteScript))62 if (!frame || !frame->script()->canExecuteScripts(NotAboutToExecuteScript)) 63 63 return; 64 64 -
trunk/Source/WebCore/page/DOMTimer.cpp
r106823 r106846 28 28 #include "DOMTimer.h" 29 29 30 #include "Document.h"31 30 #include "InspectorInstrumentation.h" 32 31 #include "ScheduledAction.h" … … 72 71 , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLevel)) 73 72 { 74 // FIXME: remove once we found out the root cause for http://webkit.org/b/7737075 if (scriptExecutionContext()->isDocument() && !static_cast<Document*>(scriptExecutionContext())->frame())76 CRASH();77 73 scriptExecutionContext()->addTimeout(m_timeoutId, this); 78 74
Note: See TracChangeset
for help on using the changeset viewer.