Remove IMAGE_RESIZER related code.
authorlevin@chromium.org <levin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Apr 2011 00:41:47 +0000 (00:41 +0000)
committerlevin@chromium.org <levin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Apr 2011 00:41:47 +0000 (00:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=59735

Reviewed by Adam Barth.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* features.pri:
* html/AsyncImageResizer.cpp: Removed.
* html/AsyncImageResizer.h: Removed.
* html/ImageResizerThread.cpp: Removed.
* html/ImageResizerThread.h: Removed.

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/build-webkit:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:
* win/tools/vsprops/FeatureDefinesCairo.vsprops:

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

25 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/features.pri
Source/WebCore/html/AsyncImageResizer.cpp [deleted file]
Source/WebCore/html/AsyncImageResizer.h [deleted file]
Source/WebCore/html/ImageResizerThread.cpp [deleted file]
Source/WebCore/html/ImageResizerThread.h [deleted file]
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Tools/ChangeLog
Tools/Scripts/build-webkit
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

index 9c56852e5ae7acb978388124cb9765b9c1258d99..9295ce0c8ae6d48953d026eb4944ab954c4c2d0b 100644 (file)
@@ -1,3 +1,12 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-04-28  Gavin Barraclough  <barraclough@apple.com>
 
         Reviewed by Oliver Hunt.
index 32add8c52cfc06a2b2e77bede260fe10ffc7ea76..5b3d63dd7afa1a50adaad7615036b2b076ec9566 100644 (file)
@@ -82,7 +82,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
-ENABLE_IMAGE_RESIZER = ;
 ENABLE_INDEXED_DATABASE = ;
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -130,4 +129,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 61ca4c908fae21b919165d740cddbb83abbb36b2..7e4bf9428c01af6d4e49ddf1be9128f1f16ba171 100644 (file)
@@ -703,7 +703,6 @@ SET(WebCore_SOURCES
     history/HistoryItem.cpp
     history/PageCache.cpp
 
-    html/AsyncImageResizer.cpp
     html/BaseButtonInputType.cpp
     html/BaseCheckableInputType.cpp
     html/BaseDateAndTimeInputType.cpp
@@ -810,7 +809,6 @@ SET(WebCore_SOURCES
     html/ImageData.cpp
     html/ImageDocument.cpp
     html/ImageInputType.cpp
-    html/ImageResizerThread.cpp
     html/InputType.cpp
     html/IsIndexInputType.cpp
     html/LabelsNodeList.cpp
index 9d8ea5cd4050eeeed0503020ed693361cd1f547a..09ff3f4c50468ba0632c80421ed6784df5c7fada 100644 (file)
@@ -1,3 +1,24 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * features.pri:
+        * html/AsyncImageResizer.cpp: Removed.
+        * html/AsyncImageResizer.h: Removed.
+        * html/ImageResizerThread.cpp: Removed.
+        * html/ImageResizerThread.h: Removed.
+
 2011-04-28  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Unreviewed trivial one-line fix inspired by wrong patch for https://bugs.webkit.org/show_bug.cgi?id=59630.
index 32add8c52cfc06a2b2e77bede260fe10ffc7ea76..5b3d63dd7afa1a50adaad7615036b2b076ec9566 100644 (file)
@@ -82,7 +82,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
-ENABLE_IMAGE_RESIZER = ;
 ENABLE_INDEXED_DATABASE = ;
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -130,4 +129,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index aa6573d2f7c5218f00943a34d6f194891e113475..bee17ca5e4e058e3d058c8320f8f85da81c1fad9 100644 (file)
@@ -279,16 +279,6 @@ else
 webcore_cppflags += -DENABLE_ICONDATABASE=0
 endif # END ENABLE_ICONDATABASE
 
-# ----
-# Image Resizer Support
-# ----
-if ENABLE_IMAGE_RESIZER
-FEATURE_DEFINES += ENABLE_IMAGE_RESIZER=1
-webcore_cppflags += -DENABLE_IMAGE_RESIZER=1
-else
-webcore_cppflags += -DENABLE_IMAGE_RESIZER=0
-endif # END ENABLE_IMAGE_RESIZER
-
 # ----
 # Orientation Events
 # ----
index 68bfb1c46f654d470a5a30b7bbe1472edb794b0d..fd4e7b4704c65ac9b156b91418cc620bb48a61a0 100644 (file)
@@ -1492,8 +1492,6 @@ webcore_sources += \
        Source/WebCore/history/HistoryItem.h \
        Source/WebCore/history/PageCache.cpp \
        Source/WebCore/history/PageCache.h \
-       Source/WebCore/html/AsyncImageResizer.cpp \
-       Source/WebCore/html/AsyncImageResizer.h \
        Source/WebCore/html/BaseButtonInputType.cpp \
        Source/WebCore/html/BaseButtonInputType.h \
        Source/WebCore/html/BaseCheckableInputType.cpp \
@@ -1757,8 +1755,6 @@ webcore_sources += \
        Source/WebCore/html/ImageDocument.h \
        Source/WebCore/html/ImageInputType.cpp \
        Source/WebCore/html/ImageInputType.h \
-       Source/WebCore/html/ImageResizerThread.cpp \
-       Source/WebCore/html/ImageResizerThread.h \
        Source/WebCore/html/InputType.cpp \
        Source/WebCore/html/InputType.h \
        Source/WebCore/html/IsIndexInputType.cpp \
index 1d8cd450383428d0a0d4e0920d1a8452cac4cd0b..f0c50af9b52f649f102ec6a5c5b2a35349db85f5 100644 (file)
             'history/cf/HistoryPropertyList.cpp',
             'history/mac/HistoryItemMac.mm',
             'history/qt/HistoryItemQt.cpp',
-            'html/AsyncImageResizer.cpp',
-            'html/AsyncImageResizer.h',
             'html/BaseButtonInputType.cpp',
             'html/BaseButtonInputType.h',
             'html/BaseCheckableInputType.cpp',
             'html/ImageDocument.h',
             'html/ImageInputType.cpp',
             'html/ImageInputType.h',
-            'html/ImageResizerThread.cpp',
-            'html/ImageResizerThread.h',
             'html/InputType.cpp',
             'html/IsIndexInputType.cpp',
             'html/IsIndexInputType.h',
index 450b526953315a8162acecb585ef7e8d4badad27..b92af9ff4467bde13d5338bd9641dcf8a24cff00 100644 (file)
@@ -626,7 +626,6 @@ SOURCES += \
     history/HistoryItem.cpp \
     history/qt/HistoryItemQt.cpp \
     history/PageCache.cpp \
-    html/AsyncImageResizer.cpp \
     html/BaseButtonInputType.cpp \
     html/BaseCheckableInputType.cpp \
     html/BaseDateAndTimeInputType.cpp \
@@ -733,7 +732,6 @@ SOURCES += \
     html/ImageData.cpp \
     html/ImageDocument.cpp \
     html/ImageInputType.cpp \
-    html/ImageResizerThread.cpp \
     html/InputType.cpp \
     html/IsIndexInputType.cpp \
     html/LabelsNodeList.cpp \
@@ -1598,7 +1596,6 @@ HEADERS += \
     history/CachedPage.h \
     history/HistoryItem.h \
     history/PageCache.h \
-    html/AsyncImageResizer.h \
     html/canvas/ArrayBuffer.h \
     html/canvas/ArrayBufferView.h \
     html/canvas/CanvasGradient.h \
@@ -1711,7 +1708,6 @@ HEADERS += \
     html/HTMLViewSourceDocument.h \
     html/ImageData.h \
     html/ImageDocument.h \
-    html/ImageResizerThread.h \
     html/LabelsNodeList.h \
     html/MediaDocument.h \
     html/PluginDocument.h \
index 28f19c0341f268cf1377c379b316d2d572e7aeb5..af53a5396328e3456839064907534c2dc420a474 100755 (executable)
                                RelativePath="..\fileapi\AsyncFileWriterClient.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\html\AsyncImageResizer.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\html\AsyncImageResizer.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\BaseButtonInputType.cpp"
                                >
                                RelativePath="..\html\ImageInputType.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\html\ImageResizerThread.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\html\ImageResizerThread.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\InputType.cpp"
                                >
index a306afaf4a9a16472fe2a72a656e097a6143f408..c0a71b9a19da48a2110fdee38cf3c103398f4cd7 100644 (file)
                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; };
                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
                ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; };
-               B0149E7D11A4B21500196A7B /* AsyncImageResizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0149E7911A4B21500196A7B /* AsyncImageResizer.cpp */; };
-               B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */ = {isa = PBXBuildFile; fileRef = B0149E7A11A4B21500196A7B /* AsyncImageResizer.h */; };
-               B0149E7F11A4B21500196A7B /* ImageResizerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0149E7B11A4B21500196A7B /* ImageResizerThread.cpp */; };
-               B0149E8011A4B21500196A7B /* ImageResizerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = B0149E7C11A4B21500196A7B /* ImageResizerThread.h */; };
                B1827493134CA4C100B98C2D /* CallbackFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1827492134CA4C100B98C2D /* CallbackFunction.cpp */; };
                B1D5ECB5134B58DA0087C78F /* CallbackFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = B1D5ECB4134B58DA0087C78F /* CallbackFunction.h */; };
                B1E54599134629C10092A545 /* NavigatorUserMediaError.h in Headers */ = {isa = PBXBuildFile; fileRef = B1E5458D134629C10092A545 /* NavigatorUserMediaError.h */; };
                ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; };
                ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGPath.cpp; sourceTree = "<group>"; };
                ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGPath.h; sourceTree = "<group>"; };
-               B0149E7911A4B21500196A7B /* AsyncImageResizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncImageResizer.cpp; sourceTree = "<group>"; };
-               B0149E7A11A4B21500196A7B /* AsyncImageResizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncImageResizer.h; sourceTree = "<group>"; };
-               B0149E7B11A4B21500196A7B /* ImageResizerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageResizerThread.cpp; sourceTree = "<group>"; };
-               B0149E7C11A4B21500196A7B /* ImageResizerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageResizerThread.h; sourceTree = "<group>"; };
                B1827492134CA4C100B98C2D /* CallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackFunction.cpp; sourceTree = "<group>"; };
                B1D5ECB4134B58DA0087C78F /* CallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackFunction.h; sourceTree = "<group>"; };
                B1E5458D134629C10092A545 /* NavigatorUserMediaError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaError.h; sourceTree = "<group>"; };
                                49484FAE102CF01E00187DD3 /* canvas */,
                                97C1F5511228558800EDE616 /* parser */,
                                4150F9ED12B6E0990008C860 /* shadow */,
-                               B0149E7911A4B21500196A7B /* AsyncImageResizer.cpp */,
-                               B0149E7A11A4B21500196A7B /* AsyncImageResizer.h */,
                                379E61C5126CA5C300B63E8D /* BaseButtonInputType.cpp */,
                                379E61C6126CA5C300B63E8D /* BaseButtonInputType.h */,
                                379E61C7126CA5C300B63E8D /* BaseCheckableInputType.cpp */,
                                97205AB21239291000B17380 /* ImageDocument.h */,
                                F55B3D8D1251F12D003EF269 /* ImageInputType.cpp */,
                                F55B3D8E1251F12D003EF269 /* ImageInputType.h */,
-                               B0149E7B11A4B21500196A7B /* ImageResizerThread.cpp */,
-                               B0149E7C11A4B21500196A7B /* ImageResizerThread.h */,
                                37E3524A12450C5200BAF5D9 /* InputType.cpp */,
                                37E3524C12450C6600BAF5D9 /* InputType.h */,
                                F55B3D8F1251F12D003EF269 /* IsIndexInputType.cpp */,
                                89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */,
                                976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */,
                                976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */,
-                               B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */,
                                37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,
                                A8C4A80D09D563270003AC8D /* Attr.h in Headers */,
                                A8C4A80B09D563270003AC8D /* Attribute.h in Headers */,
                                F55B3DC21251F12D003EF269 /* ImageInputType.h in Headers */,
                                089582560E857A7E00F82C83 /* ImageLoader.h in Headers */,
                                BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */,
-                               B0149E8011A4B21500196A7B /* ImageResizerThread.h in Headers */,
                                B27535710B053814002CE64F /* ImageSource.h in Headers */,
                                4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */,
                                316FE1180E6E1DA700BF6088 /* ImplicitAnimation.h in Headers */,
                                49EECDE210503C2400099FAB /* ArrayBuffer.cpp in Sources */,
                                49EECDDF10503C2400099FAB /* ArrayBufferView.cpp in Sources */,
                                89D08D9F12228451001241DF /* AsyncFileSystem.cpp in Sources */,
-                               B0149E7D11A4B21500196A7B /* AsyncImageResizer.cpp in Sources */,
                                A8C4A80E09D563270003AC8D /* Attr.cpp in Sources */,
                                A8C4A80C09D563270003AC8D /* Attribute.cpp in Sources */,
                                FD315FF612B0267600C1A359 /* AudioBasicProcessorNode.cpp in Sources */,
                                F55B3DC11251F12D003EF269 /* ImageInputType.cpp in Sources */,
                                089582550E857A7E00F82C83 /* ImageLoader.cpp in Sources */,
                                B275357B0B053814002CE64F /* ImageMac.mm in Sources */,
-                               B0149E7F11A4B21500196A7B /* ImageResizerThread.cpp in Sources */,
                                B275355F0B053814002CE64F /* ImageSourceCG.cpp in Sources */,
                                4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */,
                                316FE1170E6E1DA700BF6088 /* ImplicitAnimation.cpp in Sources */,
index 1474fcfef34d405e6f41a8ca5594c380d8decb11..6ca4bb088b70bcc443aadf7f057f9f7c1b476e42 100644 (file)
@@ -68,7 +68,6 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
 !contains(DEFINES, ENABLE_BLOB=.): DEFINES += ENABLE_BLOB=1
 !contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
-!contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
 !contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
 !contains(DEFINES, ENABLE_INSPECTOR=.): DEFINES += ENABLE_INSPECTOR=1
 !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
diff --git a/Source/WebCore/html/AsyncImageResizer.cpp b/Source/WebCore/html/AsyncImageResizer.cpp
deleted file mode 100644 (file)
index 4bb74c9..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if ENABLE(IMAGE_RESIZER)
-
-#include "AsyncImageResizer.h"
-
-#include "CachedImage.h"
-#include "ImageResizerThread.h"
-#include "SharedBuffer.h"
-#include <utility>
-
-namespace WebCore {
-
-PassRefPtr<AsyncImageResizer> AsyncImageResizer::create(CachedImage* cachedImage, OutputType outputType, IntSize desiredBounds, ScriptValue successCallback, ScriptValue errorCallback, float quality, AspectRatioOption aspectRatioOption, OrientationOption orientationOption)
-{
-    return adoptRef(new AsyncImageResizer(cachedImage, outputType, desiredBounds, successCallback, errorCallback, quality, aspectRatioOption, orientationOption));
-}
-
-AsyncImageResizer::AsyncImageResizer(CachedImage* cachedImage, OutputType outputType, IntSize desiredBounds, ScriptValue successCallback, ScriptValue errorCallback, float quality, AspectRatioOption aspectRatioOption, OrientationOption orientationOption)
-    : m_cachedImage(cachedImage)
-    , m_successCallback(successCallback)
-    , m_errorCallback(errorCallback)
-    , m_outputType(outputType)
-    , m_desiredBounds(desiredBounds)
-    , m_quality(quality)
-    , m_aspectRatioOption(aspectRatioOption)
-    , m_orientationOption(orientationOption)
-{
-    ASSERT(m_successCallback.isObject());
-    m_cachedImage->addClient(this);
-}
-
-AsyncImageResizer::~AsyncImageResizer()
-{
-}
-
-void AsyncImageResizer::notifyFinished(CachedResource* cachedResource)
-{
-    RefPtr<SharedBuffer> imageData = cachedResource->data()->copy();
-    cachedResource->removeClient(this);
-    CallbackInfo* callbackInfo = new CallbackInfo(this);
-    if (!ImageResizerThread::start(imageData, callbackInfo, m_outputType, m_desiredBounds, m_quality, m_aspectRatioOption, m_orientationOption))
-        resizeError();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(IMAGE_RESIZER)
diff --git a/Source/WebCore/html/AsyncImageResizer.h b/Source/WebCore/html/AsyncImageResizer.h
deleted file mode 100644 (file)
index add070a..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AsyncImageResizer_h
-#define AsyncImageResizer_h
-
-#if ENABLE(IMAGE_RESIZER)
-
-#include "Blob.h"
-#include "CachedResourceClient.h"
-#include "IntSize.h"
-#include "ScriptValue.h"
-
-namespace WebCore {
-
-class CachedImage;
-class ImageResizerThread;
-
-// AsyncImageResizer waits for the CachedImage that is passed in to load completely,
-// then starts an ImageResizerThread to resize the image. Once created, ImageResizerThread
-// becomes in charge of its own lifetime and that of AsyncImageResizer. After the callbacks
-// occur, both objects are destroyed. If the document is destroyed during resizing,
-// AsyncImageResizer will receive a notification and subsequently block the callbacks from
-// occurring.
-class AsyncImageResizer : public CachedResourceClient, public RefCounted<AsyncImageResizer> {
-public:
-    struct CallbackInfo {
-        CallbackInfo(PassRefPtr<AsyncImageResizer> asyncImageResizer)
-            : asyncImageResizer(asyncImageResizer)
-            , blob(0)
-        {
-        }
-
-        RefPtr<AsyncImageResizer> asyncImageResizer;
-        RefPtr<Blob> blob;
-    };
-    
-    enum OutputType {
-        JPEG,
-        PNG
-    };
-
-    enum AspectRatioOption {
-        PreserveAspectRatio,
-        IgnoreAspectRatio
-    };
-
-    enum OrientationOption {
-        CorrectOrientation,
-        IgnoreOrientation
-    };
-
-    static PassRefPtr<AsyncImageResizer> create(CachedImage*, OutputType, IntSize desiredBounds, ScriptValue successCallback, ScriptValue errorCallback, float quality, AspectRatioOption, OrientationOption);
-    ~AsyncImageResizer();
-
-    // FIXME: Insert override function for notification of document destruction (change m_callbacksOk).
-
-    void resizeComplete(RefPtr<Blob>) { /* FIXME: Not yet implemented. */ }
-    void resizeError() { /* FIXME: Not yet implemented. */ }
-
-private:
-    AsyncImageResizer(CachedImage*, OutputType, IntSize desiredBounds, ScriptValue successCallback, ScriptValue errorCallback, float quality, AspectRatioOption, OrientationOption);
-    virtual void notifyFinished(CachedResource*);
-
-    CachedImage* m_cachedImage;
-    ScriptValue m_successCallback;
-    ScriptValue m_errorCallback;
-    
-    // Parameters to pass into ImageResizerThread.
-    OutputType m_outputType;
-    IntSize m_desiredBounds;
-    float m_quality;
-    AspectRatioOption m_aspectRatioOption;
-    OrientationOption m_orientationOption;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(IMAGE_RESIZER)
-
-#endif // AsyncImageResizer_h
diff --git a/Source/WebCore/html/ImageResizerThread.cpp b/Source/WebCore/html/ImageResizerThread.cpp
deleted file mode 100644 (file)
index 1bae6a0..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if ENABLE(IMAGE_RESIZER)
-
-#include "ImageResizerThread.h"
-
-#include "BitmapImage.h"
-#include "Image.h"
-#include "SharedBuffer.h"
-#include <utility>
-
-namespace WebCore {
-
-static void returnBlobOrError(void* callbackInformation)
-{
-    AsyncImageResizer::CallbackInfo* callbackInfo = static_cast<AsyncImageResizer::CallbackInfo*>(callbackInformation);
-    if (!callbackInfo->blob)
-        callbackInfo->asyncImageResizer->resizeError();
-    else
-        callbackInfo->asyncImageResizer->resizeComplete(callbackInfo->blob);
-    delete callbackInfo;
-}
-
-bool ImageResizerThread::start(PassRefPtr<SharedBuffer> imageData, AsyncImageResizer::CallbackInfo* callbackInfo, AsyncImageResizer::OutputType outputType, IntSize desiredBounds, float quality, AsyncImageResizer::AspectRatioOption aspectRatioOption, AsyncImageResizer::OrientationOption orientationOption)
-{
-    ImageResizerThread* imageResizerThread = new ImageResizerThread(callbackInfo, outputType, desiredBounds, quality, aspectRatioOption, orientationOption);
-
-    RefPtr<SharedBuffer> copiedImageData = imageData->copy();
-    imageResizerThread->m_image = BitmapImage::create();
-    imageResizerThread->m_image->setData(copiedImageData, true);
-
-    imageResizerThread->m_threadID = createThread(ImageResizerThread::imageResizerThreadStart, imageResizerThread, "ImageResizerThread");
-    return imageResizerThread->m_threadID;
-}
-
-ImageResizerThread::ImageResizerThread(AsyncImageResizer::CallbackInfo* callbackInfo, AsyncImageResizer::OutputType outputType, IntSize desiredBounds, float quality, AsyncImageResizer::AspectRatioOption aspectRatioOption, AsyncImageResizer::OrientationOption orientationOption)
-    : m_threadID(0)
-    , m_callbackInfo(callbackInfo)
-    , m_outputType(outputType)
-    , m_desiredBounds(desiredBounds)
-    , m_quality(quality)
-    , m_aspectRatioOption(aspectRatioOption)
-    , m_orientationOption(orientationOption)
-{
-}
-
-ImageResizerThread::~ImageResizerThread()
-{
-}
-
-void* ImageResizerThread::imageResizerThreadStart(void* thread)
-{
-    return static_cast<ImageResizerThread*>(thread)->imageResizerThread();
-}
-
-void* ImageResizerThread::imageResizerThread()
-{
-    // FIXME: Do resizing, create blob, and catch any errors.
-
-    callOnMainThread(returnBlobOrError, static_cast<void*>(m_callbackInfo));
-    detachThread(m_threadID);
-    delete this;
-    return 0;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(IMAGE_RESIZER)
diff --git a/Source/WebCore/html/ImageResizerThread.h b/Source/WebCore/html/ImageResizerThread.h
deleted file mode 100644 (file)
index ae5ade5..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ImageResizerThread_h
-#define ImageResizerThread_h
-
-#if ENABLE(IMAGE_RESIZER)
-
-#include "AsyncImageResizer.h"
-
-namespace WebCore {
-
-class BitmapImage;
-class SharedBuffer;
-
-class ImageResizerThread {
-public:
-    static bool start(PassRefPtr<SharedBuffer> imageData, AsyncImageResizer::CallbackInfo*, AsyncImageResizer::OutputType, IntSize desiredBounds, float quality, AsyncImageResizer::AspectRatioOption, AsyncImageResizer::OrientationOption);
-    ~ImageResizerThread();
-
-private:
-    ImageResizerThread(AsyncImageResizer::CallbackInfo*, AsyncImageResizer::OutputType, IntSize desiredBounds, float quality, AsyncImageResizer::AspectRatioOption, AsyncImageResizer::OrientationOption);
-    static void* imageResizerThreadStart(void*);
-    void* imageResizerThread();
-
-    // Threading attributes.
-    ThreadIdentifier m_threadID;
-
-    // Image attributes.
-    AsyncImageResizer::CallbackInfo* m_callbackInfo;
-    RefPtr<BitmapImage> m_image;
-    AsyncImageResizer::OutputType m_outputType;
-    IntSize m_desiredBounds;
-    float m_quality;
-    AsyncImageResizer::AspectRatioOption m_aspectRatioOption;
-    AsyncImageResizer::OrientationOption m_orientationOption;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(IMAGE_RESIZER)
-
-#endif // ImageResizerThread_h
index f27571058bd83d9fc28136fbafcd5a183e915a75..0a164b5b4020dbcc6db970bd845005fb4fb1ef1c 100644 (file)
@@ -1,3 +1,12 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-04-28  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
index dfabac1bcb3eb1ea1cbba418aec7a0a65c7e1a5a..e8d2506787d623cbeeb52a5aefc75e2769fad77d 100644 (file)
@@ -84,7 +84,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
-ENABLE_IMAGE_RESIZER = ;
 ENABLE_INDEXED_DATABASE = ;
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -131,4 +130,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 521ce323d9a9c9983c5c66a84b6f2df3ed0f1b69..a06e8d1567585781d6a36f1e52a892a4a002d273 100644 (file)
@@ -1,3 +1,12 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-04-28  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Gavin Barraclough.
index dfabac1bcb3eb1ea1cbba418aec7a0a65c7e1a5a..e8d2506787d623cbeeb52a5aefc75e2769fad77d 100644 (file)
@@ -84,7 +84,6 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
 ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
 
-ENABLE_IMAGE_RESIZER = ;
 ENABLE_INDEXED_DATABASE = ;
 ENABLE_INPUT_SPEECH = ;
 ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -131,4 +130,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index abff96a8110e5d90eb055bdc19704ca8176e6bfb..9f5009c9e1b11268d793ce34843ff21edb32fbe5 100644 (file)
@@ -1,3 +1,12 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * Scripts/build-webkit:
+
 2011-04-28  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Adam Roben.
index 4ceb8d1bbcfba83c2d361617439d66911db9d0a2..7dc0730edcba7681e732c10c3e2d709c4fbf70f8 100755 (executable)
@@ -184,9 +184,6 @@ my @features = (
     { option => "icon-database", desc => "Toggle Icon database support",
       define => "ENABLE_ICONDATABASE", default => 1, value => \$iconDatabaseSupport },
 
-    { option => "image-resizer", desc => "Toggle Image Resizer API support",
-      define => "ENABLE_IMAGE_RESIZER", default => 0, value => \$imageResizerSupport },
-
     { option => "indexed-database", desc => "Toggle Indexed Database API support",
       define => "ENABLE_INDEXED_DATABASE", default => 0, value => \$indexedDatabaseSupport },
 
index 82159d54fdb857f503e8a73006562a15decf4c33..9cddcd02d50d5419c1cc564739db996f3520d4f6 100644 (file)
@@ -1,3 +1,13 @@
+2011-04-28  David Levin  <levin@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Remove IMAGE_RESIZER related code.
+        https://bugs.webkit.org/show_bug.cgi?id=59735
+
+        * win/tools/vsprops/FeatureDefines.vsprops: Also removed WML which was missed in r85256.
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops: Ditto.
+
 2011-04-28  Chris Fleizach  <cfleizach@apple.com>
 
         Reviewed by Maciej Stachowiak.
index f32ac96e2fa17e3d9e02258abcdf7ed058a9dab1..a64fd299465155074197c584ccaf44a324cb2757 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                Value="ENABLE_ICONDATABASE"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_IMAGE_RESIZER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_INDEXED_DATABASE"
                Value=""
                Value=""
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_WML"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_WORKERS"
                Value="ENABLE_WORKERS"
index ddf24166fcbf0188f0240952e5431d297e5fad3e..f8f11cf2defd0926e4c4f872f275d7661d0ee80f 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                Value="ENABLE_ICONDATABASE"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_IMAGE_RESIZER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_INDEXED_DATABASE"
                Value=""
                Value=""
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_WML"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_WORKERS"
                Value="ENABLE_WORKERS"