source: webkit/trunk/JavaScriptCore/API/APIShims.h@ 55633

Last change on this file since 55633 was 54790, checked in by [email protected], 15 years ago

Removed some mistaken code added in http://trac.webkit.org/changeset/53860.

Reviewed by Oliver Hunt.

  • API/APIShims.h:

(JSC::APICallbackShim::APICallbackShim):
(JSC::APICallbackShim::~APICallbackShim): No need to start/stop the
timeout checker when calling out from the API to the client; we want to
monitor the VM for timeouts, not the client. This mistake was harmless /
undetectable, since it's totally redundant with the APIEntryShim, which
also starts / stops the timeout checker.

File size: 3.0 KB
Line 
1/*
2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#ifndef APIShims_h
27#define APIShims_h
28
29#include "CallFrame.h"
30#include "JSLock.h"
31
32namespace JSC {
33
34class APIEntryShimWithoutLock {
35protected:
36 APIEntryShimWithoutLock(JSGlobalData* globalData, bool registerThread)
37 : m_globalData(globalData)
38 , m_entryIdentifierTable(setCurrentIdentifierTable(globalData->identifierTable))
39 {
40 if (registerThread)
41 globalData->heap.registerThread();
42 m_globalData->timeoutChecker.start();
43 }
44
45 ~APIEntryShimWithoutLock()
46 {
47 m_globalData->timeoutChecker.stop();
48 setCurrentIdentifierTable(m_entryIdentifierTable);
49 }
50
51private:
52 JSGlobalData* m_globalData;
53 IdentifierTable* m_entryIdentifierTable;
54};
55
56class APIEntryShim : public APIEntryShimWithoutLock {
57public:
58 // Normal API entry
59 APIEntryShim(ExecState* exec, bool registerThread = true)
60 : APIEntryShimWithoutLock(&exec->globalData(), registerThread)
61 , m_lock(exec)
62 {
63 }
64
65 // JSPropertyNameAccumulator only has a globalData.
66 APIEntryShim(JSGlobalData* globalData, bool registerThread = true)
67 : APIEntryShimWithoutLock(globalData, registerThread)
68 , m_lock(globalData->isSharedInstance ? LockForReal : SilenceAssertionsOnly)
69 {
70 }
71
72private:
73 JSLock m_lock;
74};
75
76class APICallbackShim {
77public:
78 APICallbackShim(ExecState* exec)
79 : m_dropAllLocks(exec)
80 , m_globalData(&exec->globalData())
81 {
82 resetCurrentIdentifierTable();
83 }
84
85 ~APICallbackShim()
86 {
87 setCurrentIdentifierTable(m_globalData->identifierTable);
88 }
89
90private:
91 JSLock::DropAllLocks m_dropAllLocks;
92 JSGlobalData* m_globalData;
93};
94
95}
96
97#endif
Note: See TracBrowser for help on using the repository browser.