Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: third_party/WebKit/WebCore/bindings/v8/WorkerScriptController.cpp

Issue 67061: Fix ASSERTS in worker code in OSX.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/WebKit/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 WorkerScriptController::WorkerScriptController(WorkerContext* workerContext) 49 WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
50 : m_workerContext(workerContext) 50 : m_workerContext(workerContext)
51 , m_proxy(new WorkerContextExecutionProxy(workerContext)) 51 , m_proxy(new WorkerContextExecutionProxy(workerContext))
52 , m_executionForbidden(false) 52 , m_executionForbidden(false)
53 { 53 {
54 } 54 }
55 55
56 WorkerScriptController::~WorkerScriptController() 56 WorkerScriptController::~WorkerScriptController()
57 { 57 {
58 removeAllDOMObjectsInCurrentThread();
58 } 59 }
59 60
60 ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode) 61 ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
61 { 62 {
62 { 63 {
63 MutexLocker lock(m_sharedDataMutex); 64 MutexLocker lock(m_sharedDataMutex);
64 if (m_executionForbidden) 65 if (m_executionForbidden)
65 return ScriptValue(); 66 return ScriptValue();
66 } 67 }
67 68
(...skipping 16 matching lines...) Expand all
84 } 85 }
85 86
86 void WorkerScriptController::setException(ScriptValue /* exception */) 87 void WorkerScriptController::setException(ScriptValue /* exception */)
87 { 88 {
88 notImplemented(); 89 notImplemented();
89 } 90 }
90 91
91 } // namespace WebCore 92 } // namespace WebCore
92 93
93 #endif // ENABLE(WORKERS) 94 #endif // ENABLE(WORKERS)
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698