diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-14 12:32:12 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-21 11:31:20 (GMT) |
| commit | 54400a5c370a5dc84eec89ebab8e2a5be39402a3 (patch) | |
| tree | 455349780aa61a80ecbd125d14e872eb8df20e42 | |
| parent | c425b9933dca054328df1f76da2509f953347f43 (diff) | |
| download | Qt-54400a5c370a5dc84eec89ebab8e2a5be39402a3.zip Qt-54400a5c370a5dc84eec89ebab8e2a5be39402a3.tar.gz Qt-54400a5c370a5dc84eec89ebab8e2a5be39402a3.tar.bz2 | |
WINSCW compile fix for WebCore
WINSCW fails to parse function pointer name if it is not
introduced before use.
Reviewed-by: Miikka Heikkinen
(cherry picked from commit e0314fa999e58a057604cdbd4bd6fdfe5248d75e)
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h index 8eb55c1..2ad437b 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h @@ -70,6 +70,9 @@ namespace WebCore { virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; + private: + static void destroyJSDOMGlobalObjectData(void*); + protected: struct JSDOMGlobalObjectData : public JSC::JSGlobalObject::JSGlobalObjectData { JSDOMGlobalObjectData(DOMWrapperWorld* world, Destructor destructor = destroyJSDOMGlobalObjectData) @@ -89,8 +92,6 @@ namespace WebCore { }; private: - static void destroyJSDOMGlobalObjectData(void*); - JSDOMGlobalObjectData* d() const { return static_cast<JSDOMGlobalObjectData*>(JSC::JSVariableObject::d); } }; |