Changeset 48839 in webkit
- Timestamp:
- Sep 28, 2009 3:16:09 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r48837 r48839 198 198 199 199 * wtf/Platform.h: Add a WTF_USE_QXMLQUERY #define. 200 201 2009-09-28 Yongjun Zhang <yongjun.zhang@nokia.com>202 203 Reviewed by Eric Seidel.204 205 https://bugs.webkit.org/show_bug.cgi?id=28054206 207 Use derefInNotNull() to work around winscw compiler forward declaration bug208 regarding templated classes.209 210 The compiler bug is reported at211 https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.212 213 The change should be reverted when the above bug is fixed in winscw compiler.214 215 Add parenthesis around (RefPtr::*UnspecifiedBoolType) to make winscw compiler216 work with the default UnSpecifiedBoolType() operator, which removes the winscw hack.217 218 * wtf/RefPtr.h:219 (WTF::RefPtr::~RefPtr):220 (WTF::RefPtr::clear):221 (WTF::RefPtr::operator UnspecifiedBoolType):222 200 223 201 2009-09-28 Gabor Loki <loki@inf.u-szeged.hu> -
trunk/JavaScriptCore/wtf/RefPtr.h
r48836 r48839 51 51 bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); } 52 52 53 ~RefPtr() { derefIfNotNull(m_ptr); }53 ~RefPtr() { if (T* ptr = m_ptr) ptr->deref(); } 54 54 55 55 template <typename U> RefPtr(const RefPtr<U>& o) : m_ptr(o.get()) { if (T* ptr = m_ptr) ptr->ref(); } … … 57 57 T* get() const { return m_ptr; } 58 58 59 void clear() { derefIfNotNull(m_ptr); m_ptr = 0; }59 void clear() { if (T* ptr = m_ptr) ptr->deref(); m_ptr = 0; } 60 60 PassRefPtr<T> release() { PassRefPtr<T> tmp = adoptRef(m_ptr); m_ptr = 0; return tmp; } 61 61 … … 66 66 67 67 // This conversion operator allows implicit conversion to bool but not to other integer types. 68 typedef T* (RefPtr::*UnspecifiedBoolType); 68 #if COMPILER(WINSCW) 69 operator bool() const { return m_ptr; } 70 #else 71 typedef T* RefPtr::*UnspecifiedBoolType; 69 72 operator UnspecifiedBoolType() const { return m_ptr ? &RefPtr::m_ptr : 0; } 73 #endif 70 74 71 75 RefPtr& operator=(const RefPtr&); -
trunk/WebCore/ChangeLog
r48838 r48839 149 149 (WebCore::XSLTMessageHandler::handleMessage): Forwards all processor messages to the Console. 150 150 (WebCore::XSLTProcessor::transformToString): Uses QXmlQuery. 151 152 2009-09-28 Yongjun Zhang <yongjun.zhang@nokia.com>153 154 Reviewed by Eric Seidel.155 156 Make JObjectWrapper::ref() and deref() public accessible to derefIfNull().157 158 Will be reverted when the following winscw compiler bug is fixed.159 https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812160 161 * bridge/jni/jni_instance.h:162 151 163 152 2009-09-28 Andrew Scherkus <scherkus@chromium.org> -
trunk/WebCore/bridge/jni/jni_instance.h
r48825 r48839 48 48 friend class JavaMethod; 49 49 50 public: 50 protected: 51 JObjectWrapper(jobject instance); 52 ~JObjectWrapper(); 53 51 54 void ref() { _refCount++; } 52 55 void deref() … … 56 59 } 57 60 58 protected:59 JObjectWrapper(jobject instance);60 ~JObjectWrapper();61 62 61 jobject _instance; 63 62
Note: See TracChangeset
for help on using the changeset viewer.