[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 11:18:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b7fb844202e9bde222b93512eafd11a3a4f0f51b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 19 04:51:39 2010 +0000
Always set the current NSGraphicsContext before calling drawWithFrame
https://bugs.webkit.org/show_bug.cgi?id=42542
Reviewed by Dan Bernstein.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintMeter):
(WebCore::RenderThemeMac::paintSearchField):
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63642 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d36d32a..319bf0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-18 Anders carlsson <andersca at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Always set the current NSGraphicsContext before calling drawWithFrame
+ https://bugs.webkit.org/show_bug.cgi?id=42542
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMeter):
+ (WebCore::RenderThemeMac::paintSearchField):
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+
2010-07-18 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index bbf6906..575940f 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -826,6 +826,8 @@ bool RenderThemeMac::paintMeter(RenderObject* renderObject, const PaintInfo& pai
if (!renderObject->isMeter())
return true;
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
+
// Becaue NSLevelIndicatorCell doesn't support vertical gauge, we use a portable version
if (rect.width() < rect.height())
return RenderTheme::paintMeter(renderObject, paintInfo, rect);
@@ -1379,8 +1381,8 @@ bool RenderThemeMac::paintSliderThumb(RenderObject* o, const PaintInfo& paintInf
bool RenderThemeMac::paintSearchField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
{
- NSSearchFieldCell* search = this->search();
LocalCurrentGraphicsContext localContext(paintInfo.context);
+ NSSearchFieldCell* search = this->search();
setSearchCellState(o, r);
@@ -1480,6 +1482,7 @@ bool RenderThemeMac::paintSearchFieldCancelButton(RenderObject* o, const PaintIn
if (!input->renderer()->isBox())
return false;
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
setSearchCellState(input->renderer(), r);
NSSearchFieldCell* search = this->search();
@@ -1568,6 +1571,7 @@ bool RenderThemeMac::paintSearchFieldResultsDecoration(RenderObject* o, const Pa
if (!input->renderer()->isBox())
return false;
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
setSearchCellState(input->renderer(), r);
NSSearchFieldCell* search = this->search();
@@ -1600,6 +1604,7 @@ bool RenderThemeMac::paintSearchFieldResultsButton(RenderObject* o, const PaintI
if (!input->renderer()->isBox())
return false;
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
setSearchCellState(input->renderer(), r);
NSSearchFieldCell* search = this->search();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list