[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 17:58:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 78c67f04488e2fe00f280857980a1c80b9f94356
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 21:12:00 2010 +0000
2010-12-03 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dirk Schulze.
Clean up some text-related code on GraphicsContext
https://bugs.webkit.org/show_bug.cgi?id=50464
Save 8 bytes in GraphicsContextState by rearranging the
data members to reduce padding.
* platform/graphics/GraphicsContextPrivate.h:
(WebCore::GraphicsContextState::GraphicsContextState):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73292 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f920576..b512d8e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,18 @@
2010-12-03 Simon Fraser <simon.fraser at apple.com>
+ Reviewed by Dirk Schulze.
+
+ Clean up some text-related code on GraphicsContext
+ https://bugs.webkit.org/show_bug.cgi?id=50464
+
+ Save 8 bytes in GraphicsContextState by rearranging the
+ data members to reduce padding.
+
+ * platform/graphics/GraphicsContextPrivate.h:
+ (WebCore::GraphicsContextState::GraphicsContextState):
+
+2010-12-03 Simon Fraser <simon.fraser at apple.com>
+
Another Chromium build fix.
* platform/graphics/skia/GraphicsContextSkia.cpp:
diff --git a/WebCore/platform/graphics/GraphicsContextPrivate.h b/WebCore/platform/graphics/GraphicsContextPrivate.h
index 273bffe..9288df4 100644
--- a/WebCore/platform/graphics/GraphicsContextPrivate.h
+++ b/WebCore/platform/graphics/GraphicsContextPrivate.h
@@ -34,51 +34,53 @@ namespace WebCore {
struct GraphicsContextState {
GraphicsContextState()
- : textDrawingMode(TextModeFill)
- , strokeStyle(SolidStroke)
- , strokeThickness(0)
+ : strokeThickness(0)
+ , shadowBlur(0)
+#if PLATFORM(CAIRO)
+ , globalAlpha(1)
+#endif
+ , textDrawingMode(TextModeFill)
, strokeColor(Color::black)
- , strokeColorSpace(ColorSpaceDeviceRGB)
- , fillRule(RULE_NONZERO)
, fillColor(Color::black)
+ , strokeStyle(SolidStroke)
+ , fillRule(RULE_NONZERO)
+ , strokeColorSpace(ColorSpaceDeviceRGB)
, fillColorSpace(ColorSpaceDeviceRGB)
, shouldAntialias(true)
, paintingDisabled(false)
- , shadowBlur(0)
, shadowsIgnoreTransforms(false)
-#if PLATFORM(CAIRO)
- , globalAlpha(1)
-#endif
{
}
- TextDrawingModeFlags textDrawingMode;
-
- StrokeStyle strokeStyle;
- float strokeThickness;
- Color strokeColor;
- ColorSpace strokeColorSpace;
RefPtr<Gradient> strokeGradient;
RefPtr<Pattern> strokePattern;
- WindRule fillRule;
- Color fillColor;
- ColorSpace fillColorSpace;
RefPtr<Gradient> fillGradient;
RefPtr<Pattern> fillPattern;
- bool shouldAntialias;
-
- bool paintingDisabled;
-
FloatSize shadowOffset;
+
+ float strokeThickness;
float shadowBlur;
- Color shadowColor;
- bool shadowsIgnoreTransforms;
#if PLATFORM(CAIRO)
float globalAlpha;
#endif
+ TextDrawingModeFlags textDrawingMode;
+
+ Color strokeColor;
+ Color fillColor;
+ Color shadowColor;
+
+ StrokeStyle strokeStyle;
+ WindRule fillRule;
+
+ ColorSpace strokeColorSpace;
+ ColorSpace fillColorSpace;
+
+ bool shouldAntialias;
+ bool paintingDisabled;
+ bool shadowsIgnoreTransforms;
};
class GraphicsContextPrivate : public Noncopyable {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list