[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[weinig at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 71409455e541e8f23f9c63b7d180ea0071654e6f
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 22:03:13 2011 +0000

    Fix spelling mistake. Sharable -> Shareable.
    
    Reviewed by Anders Carlsson.
    
    * Shared/API/c/WKImage.h:
    * Shared/API/c/WKSharedAPICast.h:
    (WebKit::toImageOptions):
    * Shared/ImageOptions.h:
    * Shared/WebImage.cpp:
    (WebKit::WebImage::create):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e7ffdda..c239c8c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-11  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Fix spelling mistake. Sharable -> Shareable.
+
+        * Shared/API/c/WKImage.h:
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toImageOptions):
+        * Shared/ImageOptions.h:
+        * Shared/WebImage.cpp:
+        (WebKit::WebImage::create):
+
 2011-01-11  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/API/c/WKImage.h b/WebKit2/Shared/API/c/WKImage.h
index 2797cc5..e3a2f9e 100644
--- a/WebKit2/Shared/API/c/WKImage.h
+++ b/WebKit2/Shared/API/c/WKImage.h
@@ -34,7 +34,7 @@ extern "C" {
 #endif
 
 enum {
-    kWKImageOptionsSharable = 1 << 0,
+    kWKImageOptionsShareable = 1 << 0,
 };
 typedef uint32_t WKImageOptions;
 
diff --git a/WebKit2/Shared/API/c/WKSharedAPICast.h b/WebKit2/Shared/API/c/WKSharedAPICast.h
index 7af434b..6dc80e8 100644
--- a/WebKit2/Shared/API/c/WKSharedAPICast.h
+++ b/WebKit2/Shared/API/c/WKSharedAPICast.h
@@ -724,8 +724,8 @@ inline ImageOptions toImageOptions(WKImageOptions wkImageOptions)
 {
     unsigned imageOptions = 0;
 
-    if (wkImageOptions & kWKImageOptionsSharable)
-        imageOptions |= ImageOptionsSharable;
+    if (wkImageOptions & kWKImageOptionsShareable)
+        imageOptions |= ImageOptionsShareable;
 
     return static_cast<ImageOptions>(imageOptions);
 }
diff --git a/WebKit2/Shared/ImageOptions.h b/WebKit2/Shared/ImageOptions.h
index 3acc74a..caf79bf 100644
--- a/WebKit2/Shared/ImageOptions.h
+++ b/WebKit2/Shared/ImageOptions.h
@@ -29,7 +29,7 @@
 namespace WebKit {
 
 enum ImageOptions {
-    ImageOptionsSharable = 1 << 0,
+    ImageOptionsShareable = 1 << 0,
 };
 
 } // namespace WebKit
diff --git a/WebKit2/Shared/WebImage.cpp b/WebKit2/Shared/WebImage.cpp
index 7c7743d..1426690 100644
--- a/WebKit2/Shared/WebImage.cpp
+++ b/WebKit2/Shared/WebImage.cpp
@@ -33,7 +33,7 @@ namespace WebKit {
 
 PassRefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
 {
-    if (options & ImageOptionsSharable)
+    if (options & ImageOptionsShareable)
         return WebImage::create(ShareableBitmap::createShareable(size));
     return WebImage::create(ShareableBitmap::create(size));
 }

-- 
WebKit Debian packaging