[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 74d0058c2a10e96681950c05dffc0f03084cb14e
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 15:19:20 2010 +0000

    Windows Release build fix after r71514
    
    The build was failing due to an alignment error. Strangely, depending
    on the order of SVGStaticPropertyTearOff's members, the build will
    either fail in Release (as it does before this change), or Debug (as it
    did before r71514), but not both.
    
    * svg/properties/SVGStaticPropertyTearOff.h:
    (WebCore::SVGStaticPropertyTearOff::SVGStaticPropertyTearOff): Copied
    the #pragma pack trick from JSSVGPODTypeWrapper.h, which has similar
    issues.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7accd5b..1e48643 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-08  Adam Roben  <aroben at apple.com>
+
+        Windows Release build fix after r71514
+
+        The build was failing due to an alignment error. Strangely, depending
+        on the order of SVGStaticPropertyTearOff's members, the build will
+        either fail in Release (as it does before this change), or Debug (as it
+        did before r71514), but not both.
+
+        * svg/properties/SVGStaticPropertyTearOff.h:
+        (WebCore::SVGStaticPropertyTearOff::SVGStaticPropertyTearOff): Copied
+        the #pragma pack trick from JSSVGPODTypeWrapper.h, which has similar
+        issues.
+
 2010-11-08  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/svg/properties/SVGStaticPropertyTearOff.h b/WebCore/svg/properties/SVGStaticPropertyTearOff.h
index b8222eb..8f31909 100644
--- a/WebCore/svg/properties/SVGStaticPropertyTearOff.h
+++ b/WebCore/svg/properties/SVGStaticPropertyTearOff.h
@@ -25,6 +25,11 @@
 
 namespace WebCore {
 
+#if COMPILER(MSVC)
+// UpdateMethod is 12 bytes. We have to pack to a size greater than or equal to that to avoid an
+// alignment warning (C4121). 16 is the next-largest size allowed for packing, so we use that.
+#pragma pack(push, 16)
+#endif
 template<typename ContextElement, typename PropertyType>
 class SVGStaticPropertyTearOff : public SVGPropertyTearOff<PropertyType> {
 public:
@@ -52,6 +57,9 @@ private:
     UpdateMethod m_update;
     RefPtr<ContextElement> m_contextElement;
 };
+#if COMPILER(MSVC)
+#pragma pack(pop)
+#endif
 
 }
 

-- 
WebKit Debian packaging