Title: [133186] trunk/Source/WebCore
- Revision
- 133186
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-01 09:46:10 -0700 (Thu, 01 Nov 2012)
Log Message
[BlackBerry] Update BB10 form theme.
https://bugs.webkit.org/show_bug.cgi?id=100760
Patch by Tiancheng Jiang <tiji...@rim.com> on 2012-11-01
Reviewed by Rob Buis.
RIM PR 235194.
Check img pointer is null, if so, do early return.
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::drawControl):
(WebCore::drawThreeSlice):
(WebCore::drawNineSlice):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133185 => 133186)
--- trunk/Source/WebCore/ChangeLog 2012-11-01 16:45:41 UTC (rev 133185)
+++ trunk/Source/WebCore/ChangeLog 2012-11-01 16:46:10 UTC (rev 133186)
@@ -1,3 +1,19 @@
+2012-11-01 Tiancheng Jiang <tiji...@rim.com>
+
+ [BlackBerry] Update BB10 form theme.
+ https://bugs.webkit.org/show_bug.cgi?id=100760
+
+ Reviewed by Rob Buis.
+
+ RIM PR 235194.
+
+ Check img pointer is null, if so, do early return.
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore::drawControl):
+ (WebCore::drawThreeSlice):
+ (WebCore::drawNineSlice):
+
2012-11-01 Adam Barth <aba...@webkit.org>
Unreviewed. Build fix.
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (133185 => 133186)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-11-01 16:45:41 UTC (rev 133185)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-11-01 16:46:10 UTC (rev 133186)
@@ -170,12 +170,16 @@
static void drawControl(GraphicsContext* gc, const FloatRect& rect, Image* img)
{
+ if (!img)
+ return;
FloatRect srcRect(0, 0, img->width(), img->height());
gc->drawImage(img, ColorSpaceDeviceRGB, rect, srcRect);
}
static void drawThreeSlice(GraphicsContext* gc, const IntRect& rect, Image* img, int slice)
{
+ if (!img)
+ return;
FloatSize dstSlice(rect.height() / 2, rect.height());
FloatRect srcRect(0, 0, slice, img->height());
FloatRect dstRect(rect.location(), dstSlice);
@@ -192,6 +196,8 @@
static void drawNineSlice(GraphicsContext* gc, const IntRect& rect, double scale, Image* img, int slice)
{
+ if (!img)
+ return;
if (rect.height() * scale < 101.0)
scale = 101.0 / rect.height();
FloatSize dstSlice(slice / scale, slice / scale);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
