OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "bindings/core/v8/V8GCForContextDispose.h" | 32 #include "bindings/core/v8/V8GCForContextDispose.h" |
33 | 33 |
| 34 #include "bindings/core/v8/V8PerIsolateData.h" |
34 #include "wtf/StdLibExtras.h" | 35 #include "wtf/StdLibExtras.h" |
35 #include <v8.h> | 36 #include <v8.h> |
36 | 37 |
37 namespace blink { | 38 namespace blink { |
38 | 39 |
39 V8GCForContextDispose::V8GCForContextDispose() | 40 V8GCForContextDispose::V8GCForContextDispose() |
40 : m_pseudoIdleTimer(this, &V8GCForContextDispose::pseudoIdleTimerFired) | 41 : m_pseudoIdleTimer(this, &V8GCForContextDispose::pseudoIdleTimerFired) |
41 , m_didDisposeContextForMainFrame(false) | 42 , m_didDisposeContextForMainFrame(false) |
42 { | 43 { |
43 } | 44 } |
44 | 45 |
45 void V8GCForContextDispose::notifyContextDisposed(bool isMainFrame) | 46 void V8GCForContextDispose::notifyContextDisposed(bool isMainFrame) |
46 { | 47 { |
47 m_didDisposeContextForMainFrame = m_didDisposeContextForMainFrame || isMainF
rame; | 48 m_didDisposeContextForMainFrame = m_didDisposeContextForMainFrame || isMainF
rame; |
48 v8::V8::ContextDisposedNotification(); | 49 V8PerIsolateData::mainThreadIsolate()->ContextDisposedNotification(); |
49 if (!m_pseudoIdleTimer.isActive()) | 50 if (!m_pseudoIdleTimer.isActive()) |
50 m_pseudoIdleTimer.startOneShot(0.8, FROM_HERE); | 51 m_pseudoIdleTimer.startOneShot(0.8, FROM_HERE); |
51 } | 52 } |
52 | 53 |
53 void V8GCForContextDispose::notifyIdleSooner(double maximumFireInterval) | 54 void V8GCForContextDispose::notifyIdleSooner(double maximumFireInterval) |
54 { | 55 { |
55 if (m_pseudoIdleTimer.isActive()) { | 56 if (m_pseudoIdleTimer.isActive()) { |
56 double nextFireInterval = m_pseudoIdleTimer.nextFireInterval(); | 57 double nextFireInterval = m_pseudoIdleTimer.nextFireInterval(); |
57 if (nextFireInterval > maximumFireInterval) { | 58 if (nextFireInterval > maximumFireInterval) { |
58 m_pseudoIdleTimer.stop(); | 59 m_pseudoIdleTimer.stop(); |
59 m_pseudoIdleTimer.startOneShot(maximumFireInterval, FROM_HERE); | 60 m_pseudoIdleTimer.startOneShot(maximumFireInterval, FROM_HERE); |
60 } | 61 } |
61 } | 62 } |
62 } | 63 } |
63 | 64 |
64 V8GCForContextDispose& V8GCForContextDispose::instanceTemplate() | 65 V8GCForContextDispose& V8GCForContextDispose::instanceTemplate() |
65 { | 66 { |
66 DEFINE_STATIC_LOCAL(V8GCForContextDispose, staticInstance, ()); | 67 DEFINE_STATIC_LOCAL(V8GCForContextDispose, staticInstance, ()); |
67 return staticInstance; | 68 return staticInstance; |
68 } | 69 } |
69 | 70 |
70 void V8GCForContextDispose::pseudoIdleTimerFired(Timer<V8GCForContextDispose>*) | 71 void V8GCForContextDispose::pseudoIdleTimerFired(Timer<V8GCForContextDispose>*) |
71 { | 72 { |
72 const int longIdlePauseInMs = 1000; | 73 const int longIdlePauseInMs = 1000; |
73 const int shortIdlePauseInMs = 10; | 74 const int shortIdlePauseInMs = 10; |
74 int hint = m_didDisposeContextForMainFrame ? longIdlePauseInMs : shortIdlePa
useInMs; | 75 int hint = m_didDisposeContextForMainFrame ? longIdlePauseInMs : shortIdlePa
useInMs; |
75 v8::V8::IdleNotification(hint); | 76 V8PerIsolateData::mainThreadIsolate()->IdleNotification(hint); |
76 m_didDisposeContextForMainFrame = false; | 77 m_didDisposeContextForMainFrame = false; |
77 } | 78 } |
78 | 79 |
79 } // namespace blink | 80 } // namespace blink |
OLD | NEW |