Changeset 59221 in webkit

Timestamp:

May 12, 2010 3:58:48 AM (14 years ago)

Author:

zherczeg@webkit.org

Message:

Build fix for Windows and Chromium builds.

Reviewed by Nikolas Zimmermann.

• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• svg/graphics/filters/SVGFELighting.cpp:

(WebCore::FELighting::LightingData::upLeftPixelValue):
(WebCore::FELighting::LightingData::upPixelValue):
(WebCore::FELighting::LightingData::upRightPixelValue):
(WebCore::FELighting::LightingData::leftPixelValue):
(WebCore::FELighting::LightingData::centerPixelValue):
(WebCore::FELighting::LightingData::rightPixelValue):
(WebCore::FELighting::LightingData::downLeftPixelValue):
(WebCore::FELighting::LightingData::downPixelValue):
(WebCore::FELighting::LightingData::downRightPixelValue):
(WebCore::FELighting::setPixel):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• svg/graphics/filters/SVGFELighting.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-12  Zoltan Herczeg  <zherczeg@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Build fix for Windows and Chromium builds.
+
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * svg/graphics/filters/SVGFELighting.cpp:
+        (WebCore::FELighting::LightingData::upLeftPixelValue):
+        (WebCore::FELighting::LightingData::upPixelValue):
+        (WebCore::FELighting::LightingData::upRightPixelValue):
+        (WebCore::FELighting::LightingData::leftPixelValue):
+        (WebCore::FELighting::LightingData::centerPixelValue):
+        (WebCore::FELighting::LightingData::rightPixelValue):
+        (WebCore::FELighting::LightingData::downLeftPixelValue):
+        (WebCore::FELighting::LightingData::downPixelValue):
+        (WebCore::FELighting::LightingData::downRightPixelValue):
+        (WebCore::FELighting::setPixel):
+
 2010-05-12  Zoltan Herczeg  <zherczeg@webkit.org>
 

trunk/WebCore/WebCore.gypi

@@ -3400 +3400 @@
             'svg/graphics/filters/SVGFEImage.cpp',
             'svg/graphics/filters/SVGFEImage.h',
+            'svg/graphics/filters/SVGFELighting.cpp',
+            'svg/graphics/filters/SVGFELighting.h',
             'svg/graphics/filters/SVGFEMerge.cpp',
             'svg/graphics/filters/SVGFEMerge.h',

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -42844 +42844 @@
                                         </File>
                                         <File
+                                                RelativePath="..\svg\graphics\filters\SVGFELighting.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\svg\graphics\filters\SVGFELighting.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\svg\graphics\filters\SVGFEMerge.cpp"
                                                 >

trunk/WebCore/svg/graphics/filters/SVGFELighting.cpp

@@ -58 +58 @@
 const static unsigned char cOpaqueAlpha = static_cast<unsigned char>(0xff);
 
-inline int FELighting::LightingData::upLeftPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::upLeftPixelValue()
 {
     return static_cast<int>(pixels->get(offset - widthMultipliedByPixelSize - cPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::upPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::upPixelValue()
 {
     return static_cast<int>(pixels->get(offset - widthMultipliedByPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::upRightPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::upRightPixelValue()
 {
     return static_cast<int>(pixels->get(offset - widthMultipliedByPixelSize + cPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::leftPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::leftPixelValue()
 {
     return static_cast<int>(pixels->get(offset - cPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::centerPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::centerPixelValue()
 {
     return static_cast<int>(pixels->get(offset + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::rightPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::rightPixelValue()
 {
     return static_cast<int>(pixels->get(offset + cPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::downLeftPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::downLeftPixelValue()
 {
     return static_cast<int>(pixels->get(offset + widthMultipliedByPixelSize - cPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::downPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::downPixelValue()
 {
     return static_cast<int>(pixels->get(offset + widthMultipliedByPixelSize + cAlphaChannelOffset));
 }
 
-inline int FELighting::LightingData::downRightPixelValue()
+ALWAYS_INLINE int FELighting::LightingData::downRightPixelValue()
 {
     return static_cast<int>(pixels->get(offset + widthMultipliedByPixelSize + cPixelSize + cAlphaChannelOffset));
 }
 
-inline void FELighting::setPixel(LightingData& data, LightSource::PaintingData& paintingData,
+ALWAYS_INLINE void FELighting::setPixel(LightingData& data, LightSource::PaintingData& paintingData,
     int lightX, int lightY, float factorX, int normalX, float factorY, int normalY)
 {