REGRESSION(r84194): Build fails when turning on ENABLE_FILE_SYSTEM

https://bugs.webkit.org/show_bug.cgi?id=78088

Reviewed by Antonio Gomes.

WebCore::getDOMObjectWrapper was changed to WebCore::wrap in r84194.
Adapt to this change in JSEntryCustom.cpp and JSEntrySyncCustom.cpp.

Build fix, no new tests.

* bindings/js/JSEntryCustom.cpp:
(WebCore::toJS):
* bindings/js/JSEntrySyncCustom.cpp:
(WebCore::toJS):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107146 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c77587f..e0db884 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-08  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        REGRESSION(r84194): Build fails when turning on ENABLE_FILE_SYSTEM
+        https://bugs.webkit.org/show_bug.cgi?id=78088
+
+        Reviewed by Antonio Gomes.
+
+        WebCore::getDOMObjectWrapper was changed to WebCore::wrap in r84194.
+        Adapt to this change in JSEntryCustom.cpp and JSEntrySyncCustom.cpp.
+
+        Build fix, no new tests.
+
+        * bindings/js/JSEntryCustom.cpp:
+        (WebCore::toJS):
+        * bindings/js/JSEntrySyncCustom.cpp:
+        (WebCore::toJS):
+
 2012-02-08  Dana Jansens  <danakj@chromium.org>
 
         [Chromium] Fix opaque tracking for box shadows and non-composited child elements

diff --git a/Source/WebCore/bindings/js/JSEntryCustom.cpp b/Source/WebCore/bindings/js/JSEntryCustom.cpp
index 59d7e3c..2552e05 100644 (file)
--- a/Source/WebCore/bindings/js/JSEntryCustom.cpp
+++ b/Source/WebCore/bindings/js/JSEntryCustom.cpp
@@ -50,10 +50,10 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Entry* entry)
         return jsNull();
 
     if (entry->isFile())
-        return getDOMObjectWrapper<JSFileEntry>(exec, globalObject, static_cast<FileEntry*>(entry));
+        return wrap<JSFileEntry>(exec, globalObject, static_cast<FileEntry*>(entry));
 
     ASSERT(entry->isDirectory());
-    return getDOMObjectWrapper<JSDirectoryEntry>(exec, globalObject, static_cast<DirectoryEntry*>(entry));
+    return wrap<JSDirectoryEntry>(exec, globalObject, static_cast<DirectoryEntry*>(entry));
 }
 
 } // namespace WebCore

diff --git a/Source/WebCore/bindings/js/JSEntrySyncCustom.cpp b/Source/WebCore/bindings/js/JSEntrySyncCustom.cpp
index 22f96ad..7ad57c4 100644 (file)
--- a/Source/WebCore/bindings/js/JSEntrySyncCustom.cpp
+++ b/Source/WebCore/bindings/js/JSEntrySyncCustom.cpp
@@ -50,10 +50,10 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EntrySync* entry)
         return jsNull();
 
     if (entry->isFile())
-        return getDOMObjectWrapper<JSFileEntrySync>(exec, globalObject, static_cast<FileEntrySync*>(entry));
+        return wrap<JSFileEntrySync>(exec, globalObject, static_cast<FileEntrySync*>(entry));
 
     ASSERT(entry->isDirectory());
-    return getDOMObjectWrapper<JSDirectoryEntrySync>(exec, globalObject, static_cast<DirectoryEntrySync*>(entry));
+    return wrap<JSDirectoryEntrySync>(exec, globalObject, static_cast<DirectoryEntrySync*>(entry));
 }
 
 } // namespace WebCore