[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
paroga at webkit.org
paroga at webkit.org
Fri Jan 21 15:04:26 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 9d728f26e8fc1d7faa8d0c5788acae92fcdac21d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 21:19:24 2011 +0000
2011-01-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Eric Seidel.
[WINCE] Remove JSC::g_stackBase
https://bugs.webkit.org/show_bug.cgi?id=51779
* wtf/StackBounds.cpp:
2011-01-06 Patrick Gansterer <paroga at webkit.org>
Reviewed by Eric Seidel.
[WINCE] Remove JSC::g_stackBase
https://bugs.webkit.org/show_bug.cgi?id=51779
* platform/wince/SharedTimerWinCE.cpp:
(WebCore::TimerWindowWndProc):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75190 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0c2d315..3a33d09 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ [WINCE] Remove JSC::g_stackBase
+ https://bugs.webkit.org/show_bug.cgi?id=51779
+
+ * wtf/StackBounds.cpp:
+
2011-01-06 Joone Hur <joone.hur at collabora.co.uk>
Reviewed by Eric Seidel.
diff --git a/Source/JavaScriptCore/wtf/StackBounds.cpp b/Source/JavaScriptCore/wtf/StackBounds.cpp
index 50df704..be8ce84 100644
--- a/Source/JavaScriptCore/wtf/StackBounds.cpp
+++ b/Source/JavaScriptCore/wtf/StackBounds.cpp
@@ -179,11 +179,6 @@ void StackBounds::initialize()
#elif OS(WINCE)
-} // namespace WTF
-// FIXME: this is not threadsafe, and should probably be removed.
-namespace JSC { JS_EXPORTDATA void* g_stackBase = 0; }
-namespace WTF {
-
static bool detectGrowingDownward(void* previousFrame)
{
// Find the address of this stack frame by taking the address of a local variable.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb59043..7f5e02d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-06 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ [WINCE] Remove JSC::g_stackBase
+ https://bugs.webkit.org/show_bug.cgi?id=51779
+
+ * platform/wince/SharedTimerWinCE.cpp:
+ (WebCore::TimerWindowWndProc):
+
2011-01-06 Robert Hogan <robert at webkit.org>
Reviewed by Antonio Gomes.
diff --git a/WebCore/platform/wince/SharedTimerWinCE.cpp b/WebCore/platform/wince/SharedTimerWinCE.cpp
index 81295e2..829d95e 100644
--- a/WebCore/platform/wince/SharedTimerWinCE.cpp
+++ b/WebCore/platform/wince/SharedTimerWinCE.cpp
@@ -35,10 +35,6 @@
#include <wtf/CurrentTime.h>
#include <windows.h>
-namespace JSC {
-JS_EXPORTDATA extern void* g_stackBase;
-}
-
namespace WebCore {
enum {
@@ -55,22 +51,17 @@ const LPCWSTR kTimerWindowClassName = L"TimerWindowClass";
LRESULT CALLBACK TimerWindowWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- int dummy;
- JSC::g_stackBase = &dummy;
-
if (message == WM_TIMER) {
if (timerID != TimerIdNone)
sharedTimerFiredFunction();
- } else if (message == WM_USER) {
+ } else if (message == WM_USER) {
if (timerID = TimerIdManual) {
sharedTimerFiredFunction();
PostMessage(hWnd, WM_USER, 0, 0);
}
- } else {
- JSC::g_stackBase = 0;
+ } else
return DefWindowProc(hWnd, message, wParam, lParam);
- }
- JSC::g_stackBase = 0;
+
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list