[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Sun Feb 20 22:48:27 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 73f7d7b7d58eaa29ddef63a8c7a368176d2e5b64
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 20:28:33 2011 +0000
Fix Windows build.
* WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
(WebKit::WebPopupMenu::setUpPlatformData):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75532 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 154b6a5..c7de16d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
2011-01-11 Anders Carlsson <andersca at apple.com>
+ Fix Windows build.
+
+ * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp:
+ (WebKit::WebPopupMenu::setUpPlatformData):
+
+2011-01-11 Anders Carlsson <andersca at apple.com>
+
Reviewed by Sam Weinig.
Rename ShareableBitmap::createSharable to createShareable
diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
index 9ca5012..9c23133 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::createShareable(data.m_backingStoreSize);
- data.m_selectedBackingStore = ShareableImage::createShareable(data.m_backingStoreSize);
+ data.m_notSelectedBackingStore = ShareableBitmap::createShareable(data.m_backingStoreSize);
+ data.m_selectedBackingStore = ShareableBitmap::createShareable(data.m_backingStoreSize);
OwnPtr<GraphicsContext> notSelectedBackingStoreContext = data.m_notSelectedBackingStore->createGraphicsContext();
OwnPtr<GraphicsContext> selectedBackingStoreContext = data.m_selectedBackingStore->createGraphicsContext();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list