equal
deleted
inserted
replaced
19 #include "config.h" |
19 #include "config.h" |
20 #include "SharedTimer.h" |
20 #include "SharedTimer.h" |
21 #include <wtf/Assertions.h> |
21 #include <wtf/Assertions.h> |
22 #include <e32std.h> |
22 #include <e32std.h> |
23 #include <e32base.h> |
23 #include <e32base.h> |
|
24 #include <Timer.h> |
24 |
25 |
25 static TInt64 remainingMicro = 0; |
26 static TInt64 remainingMicro = 0; |
26 static bool shutdownInProgress = false; |
27 static bool shutdownInProgress = false; |
27 |
28 |
28 namespace WebCore { |
29 namespace WebCore { |
108 sharedTimer->Cancel(); |
109 sharedTimer->Cancel(); |
109 delete sharedTimer; |
110 delete sharedTimer; |
110 sharedTimer = NULL; |
111 sharedTimer = NULL; |
111 } |
112 } |
112 remainingMicro = 0; |
113 remainingMicro = 0; |
|
114 /* |
|
115 * The static boolean variable shutdownInProgress, must be reset in scenario's where a browser control instance is deleted and a new |
|
116 * instance is created without actually closing the application. |
|
117 */ |
|
118 shutdownInProgress = false ; |
113 } |
119 } |
114 |
120 |
115 void shutdownSharedTimer() |
121 void shutdownSharedTimer() |
116 { |
122 { |
117 shutdownInProgress = true; |
123 shutdownInProgress = true; |
118 stopSharedTimer(); |
124 stopSharedTimer(); |
|
125 TimerBase::deleteTimerHeap(); |
119 } |
126 } |
120 |
127 |
121 void initSharedTimer() |
128 void initSharedTimer() |
122 { |
129 { |
123 shutdownInProgress = false; |
130 shutdownInProgress = false; |