X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fweb%2FWebHeap.cpp;h=f7afef6ab2256b3feedb139abe5d62d3dac241c5;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=65bfb60a3dc869f88749736ed42ed78ac1a1e900;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/web/WebHeap.cpp b/src/third_party/WebKit/Source/web/WebHeap.cpp
index 65bfb60..f7afef6 100644
--- a/src/third_party/WebKit/Source/web/WebHeap.cpp
+++ b/src/third_party/WebKit/Source/web/WebHeap.cpp
@@ -31,38 +31,28 @@
 #include "config.h"
 #include "WebHeap.h"
 
-#if ENABLE(OILPAN)
 #include "heap/ThreadState.h"
-#endif
 
 namespace blink {
 
-void WebHeap::enterSafePoint()
+void WebHeap::attachThread()
 {
-#if ENABLE(OILPAN)
-    WebCore::ThreadState::current()->enterSafePointWithoutPointers();
-#endif
+    WebCore::ThreadState::attach();
 }
 
-void WebHeap::leaveSafePoint()
+void WebHeap::detachThread()
 {
-#if ENABLE(OILPAN)
-    WebCore::ThreadState::current()->leaveSafePoint();
-#endif
+    WebCore::ThreadState::detach();
 }
 
-void WebHeap::attachThread()
+WebHeap::SafePointScope::SafePointScope()
 {
-#if ENABLE(OILPAN)
-    WebCore::ThreadState::attach();
-#endif
+    WebCore::ThreadState::current()->enterSafePointWithPointers(this);
 }
 
-void WebHeap::detachThread()
+WebHeap::SafePointScope::~SafePointScope()
 {
-#if ENABLE(OILPAN)
-    WebCore::ThreadState::detach();
-#endif
+    WebCore::ThreadState::current()->leaveSafePoint();
 }
 
 } // namespace blink