No review; build fix only.

Roll-out changes r60110.

* win/include/WebKitSystemInterface/WebKitSystemInterface.h:
* win/lib/WebKitSystemInterface.lib:
* win/lib/WebKitSystemInterface_debug.lib:

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index db1343f3ad76e5069ae97ba42387d0e054e09f12..3783b39caa6dc0356c70e742ab34d5458b9dbdfa 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,18 +1,14 @@
 2010-05-24  Jer Noble  <jer.noble@apple.com>
 
-        Reviewed by Eric Carlson.
-
-        HTML5 <video> tag performance worse than Flash
-        https://bugs.webkit.org/show_bug.cgi?id=39577
-        rdar://problem/7982458
-
-        Added WebKitSystemInterface calls for new CAImageQueue APIs.
+        No review; build fix only.
         
+        Roll-out changes r60110.
+
         * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
         * win/lib/WebKitSystemInterface.lib:
         * win/lib/WebKitSystemInterface_debug.lib:
 
-010-05-24  Jer Noble  <jer.noble@apple.com>
+2010-05-24  Jer Noble  <jer.noble@apple.com>
 
         No review; build fix only.
 

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 13dc96692286caec7609f0f1048dd9f5ba1db749..445b292aee8a071bfe26517e8247a5cf70362be6 100644 (file)
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -50,14 +50,6 @@ typedef const struct __CFURL* CFURLRef;
 typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
 typedef struct tagLOGFONTW LOGFONTW;
 typedef LOGFONTW LOGFONT;
-typedef struct _CACFLayer *CACFLayerRef;
-typedef struct __CVBuffer *CVBufferRef;
-typedef CVBufferRef CVImageBufferRef;
-typedef CVImageBufferRef CVPixelBufferRef;
-typedef struct _CAImageQueue *CAImageQueueRef;
-typedef unsigned long CFTypeID;
-
-class WKCAImageQueue;
 
 void wkSetFontSmoothingLevel(int type);
 int wkGetFontSmoothingLevel();
@@ -97,39 +89,4 @@ CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceR
 
 CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
 
-
-enum wkCAImageQueueFlags {
-    kWKCAImageQueueAsync = 1U << 0,
-    kWKCAImageQueueFill = 1U << 1,
-    kWKCAImageQueueProtected = 1U << 2,
-    kWKCAImageQueueUseCleanAperture = 1U << 3,
-    kWKCAImageQueueUseAspectRatio = 1U << 4,
-    kWKCAImageQueueLowQualityColor = 1U << 5,
-};
-
-enum wkWKCAImageQueueImageType {
-    kWKCAImageQueueNil = 1,
-    kWKCAImageQueueSurface,
-    kWKCAImageQueueBuffer,
-    kWKCAImageQueueIOSurface,
-};
-
-enum wkWKCAImageQueueImageFlags {
-    kWKCAImageQueueOpaque = 1U << 0,
-    kWKCAImageQueueFlush = 1U << 1,
-    kWKCAImageQueueWillFlush = 1U << 2,
-    kWKCAImageQueueFlipped = 1U << 3,
-    kWKCAImageQueueWaitGPU = 1U << 4,
-};
-
-typedef void (*wkCAImageQueueReleaseCallback)(unsigned int type, uint64_t id, void *info);
-CAImageQueueRef wkCAImageQueueCreate(uint32_t width, uint32_t height, uint32_t capacity);
-void wkCAImageQueueInvalidate(CAImageQueueRef iq);
-size_t wkCAImageQueueCollect(CAImageQueueRef iq);
-bool wkCAImageQueueInsertImage(CAImageQueueRef iq, CFTimeInterval t, unsigned int type, uint64_t id, uint32_t flags, wkCAImageQueueReleaseCallback release, void *info);
-uint64_t wkCAImageQueueRegisterPixelBuffer(CAImageQueueRef iq, void *data, size_t data_size, size_t rowbytes, size_t width, size_t height, OSType pixel_format, CFDictionaryRef attachments, uint32_t flags);
-void wkCAImageQueueSetFlags(CAImageQueueRef iq, uint32_t mask, uint32_t flags);
-uint32_t wkCAImageQueueGetFlags(CAImageQueueRef iq);
-CFTypeID wkCAImageQueueGetTypeID(void);
-
 #endif // WebKitSystemInterface_h

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 94a1d2df43fff287e0fedee6422e4254c05550f1..4fcc36bd343a78c73bb30c49b33d85ec38ccfc60 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 3523d3f188fbf237515195acfcd8a325409066b5..6d836db135873d8adecb6c48244ad427abb841eb 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ