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

[andersca at apple.com]

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

    2011-01-11  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Rename ShareableBitmap::createSharable to createShareable
            https://bugs.webkit.org/show_bug.cgi?id=52234
    
            * Shared/ShareableBitmap.cpp:
            (WebKit::ShareableBitmap::createShareable):
            * Shared/ShareableBitmap.h:
            * Shared/WebImage.cpp:
            (WebKit::WebImage::create):
            * WebProcess/Plugins/PluginProxy.cpp:
            (WebKit::PluginProxy::geometryDidChange):
            * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
            (WebKit::WebPopupMenu::setUpPlatformData):
            * WebProcess/WebPage/FindController.cpp:
            (WebKit::FindController::updateFindIndicator):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1459fdd..154b6a5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,25 @@
 
         Reviewed by Sam Weinig.
 
+        Rename ShareableBitmap::createSharable to createShareable
+        https://bugs.webkit.org/show_bug.cgi?id=52234
+
+        * Shared/ShareableBitmap.cpp:
+        (WebKit::ShareableBitmap::createShareable):
+        * Shared/ShareableBitmap.h:
+        * Shared/WebImage.cpp:
+        (WebKit::WebImage::create):
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::geometryDidChange):
+        * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
+        (WebKit::WebPopupMenu::setUpPlatformData):
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::updateFindIndicator):
+
+2011-01-11  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Rename BackingStore to ShareableBitmap
         https://bugs.webkit.org/show_bug.cgi?id=52228
 
diff --git a/WebKit2/Shared/ShareableBitmap.cpp b/WebKit2/Shared/ShareableBitmap.cpp
index b2393c9..90fa0d8 100644
--- a/WebKit2/Shared/ShareableBitmap.cpp
+++ b/WebKit2/Shared/ShareableBitmap.cpp
@@ -43,7 +43,7 @@ PassRefPtr<ShareableBitmap> ShareableBitmap::create(const WebCore::IntSize& size
     return adoptRef(new ShareableBitmap(size, data));
 }
 
-PassRefPtr<ShareableBitmap> ShareableBitmap::createSharable(const IntSize& size)
+PassRefPtr<ShareableBitmap> ShareableBitmap::createShareable(const IntSize& size)
 {
     size_t numBytes = numBytesForSize(size);
     
diff --git a/WebKit2/Shared/ShareableBitmap.h b/WebKit2/Shared/ShareableBitmap.h
index fe61395..e44f4ad 100644
--- a/WebKit2/Shared/ShareableBitmap.h
+++ b/WebKit2/Shared/ShareableBitmap.h
@@ -45,7 +45,7 @@ public:
     static PassRefPtr<ShareableBitmap> create(const WebCore::IntSize&);
 
     // Create a shareable bitmap whose backing memory can be shared with another process.
-    static PassRefPtr<ShareableBitmap> createSharable(const WebCore::IntSize&);
+    static PassRefPtr<ShareableBitmap> createShareable(const WebCore::IntSize&);
 
     // Create a shareable bitmap from a shared memory handle.
     static PassRefPtr<ShareableBitmap> create(const WebCore::IntSize&, const SharedMemory::Handle&);
diff --git a/WebKit2/Shared/WebImage.cpp b/WebKit2/Shared/WebImage.cpp
index 30d19cd..7c7743d 100644
--- a/WebKit2/Shared/WebImage.cpp
+++ b/WebKit2/Shared/WebImage.cpp
@@ -34,7 +34,7 @@ namespace WebKit {
 PassRefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
 {
     if (options & ImageOptionsSharable)
-        return WebImage::create(ShareableBitmap::createSharable(size));
+        return WebImage::create(ShareableBitmap::createShareable(size));
     return WebImage::create(ShareableBitmap::create(size));
 }
 
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.cpp b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
index 549f53a..f029cbf 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
@@ -175,7 +175,7 @@ void PluginProxy::geometryDidChange(const IntRect& frameRect, const IntRect& cli
 
     if (didUpdateBackingStore) {
         // Create a new plug-in backing store.
-        m_pluginBackingStore = ShareableBitmap::createSharable(frameRect.size());
+        m_pluginBackingStore = ShareableBitmap::createShareable(frameRect.size());
         if (!m_pluginBackingStore)
             return;
 
diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
index bf3010a..9ca5012 100644
--- a/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
@@ -78,8 +78,8 @@ void WebPopupMenu::setUpPlatformData(const WebCore::IntRect& pageCoordinates, Pl
     int backingStoreWidth = max(pageCoordinates.width() - m_popupClient->clientInsetLeft() - m_popupClient->clientInsetRight(), popupWidth);
 
     data.m_backingStoreSize = IntSize(backingStoreWidth, (itemCount * data.m_itemHeight));
-    data.m_notSelectedBackingStore = ShareableImage::createSharable(data.m_backingStoreSize);
-    data.m_selectedBackingStore = ShareableImage::createSharable(data.m_backingStoreSize);
+    data.m_notSelectedBackingStore = ShareableImage::createShareable(data.m_backingStoreSize);
+    data.m_selectedBackingStore = ShareableImage::createShareable(data.m_backingStoreSize);
 
     OwnPtr<GraphicsContext> notSelectedBackingStoreContext = data.m_notSelectedBackingStore->createGraphicsContext();
     OwnPtr<GraphicsContext> selectedBackingStoreContext = data.m_selectedBackingStore->createGraphicsContext();
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index e59988b..9b8669d 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -158,7 +158,7 @@ bool FindController::updateFindIndicator(Frame* selectedFrame, bool isShowingOve
     selectedFrame->selection()->getClippedVisibleTextRectangles(textRects);
 
     // Create a backing store and paint the find indicator text into it.
-    RefPtr<ShareableBitmap> findIndicatorTextBackingStore = ShareableBitmap::createSharable(selectionRectInWindowCoordinates.size());
+    RefPtr<ShareableBitmap> findIndicatorTextBackingStore = ShareableBitmap::createShareable(selectionRectInWindowCoordinates.size());
     OwnPtr<GraphicsContext> graphicsContext = findIndicatorTextBackingStore->createGraphicsContext();
 
     graphicsContext->translate(-selectionRectInWindowCoordinates.x(), -selectionRectInWindowCoordinates.y());

-- 
WebKit Debian packaging