[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
japhet at chromium.org
japhet at chromium.org
Wed Dec 22 12:11:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 586b2c6d8a2918f88c74f89a70a9ae5008614e73
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 23:37:12 2010 +0000
2010-08-16 Nate Chapin <japhet at chromium.org>
Unreviewed, Chromium mac build fix (with help from jamesr).
* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::ScrollbarThemeChromiumMac::paint):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65469 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c3acb1..eff8adc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16 Nate Chapin <japhet at chromium.org>
+
+ Unreviewed, Chromium mac build fix (with help from jamesr).
+
+ * platform/chromium/ScrollbarThemeChromiumMac.mm:
+ (WebCore::ScrollbarThemeChromiumMac::paint):
+
2010-08-16 Gavin Barraclough <barraclough at apple.com>
Reviewed by Sam Weinig
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
index e532d57..f6bfaee 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
@@ -452,9 +452,8 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
HIThemeDrawTrack(&trackInfo, 0, drawingContext->platformContext(), kHIThemeOrientationNormal);
}
- if (!canDrawDirectly) {
- context->drawImage(imageBuffer->image(), DeviceColorSpace, scrollbar->frameRect().location());
- }
+ if (!canDrawDirectly)
+ context->drawImageBuffer(imageBuffer, DeviceColorSpace, scrollbar->frameRect().location());
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list