Changeset 81540 in webkit

Timestamp:

Mar 18, 2011 5:51:25 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-18 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

WebCore GYP build should build
​https://bugs.webkit.org/show_bug.cgi?id=56696

After this patch, the WebCore GYP build successfully compiles and
links. I haven't trying executing it yet.

• WebCore.gypi:
  • DOMMouseEvent should be included as part of the Objective-C bindings.
• WebCore.xcodeproj/project.pbxproj:
  • RenderSVGPath.cpp was mistakenly included directly in the project instead of being built by RenderSVGAllInOne.
• gyp/WebCore.gyp:
  • Exclude some more files from the build. These files are absent in the normal build. I didn't see them earlier because the dead code stripping was hiding them. (They're probably unreferenced.)
  • Switch to using RenderSVGAllInOne. I'm not entirely sure if this part of the patch is necessary, but it matches the normal build more closely.
• platform/mac/WebCoreObjCExtras.mm:
  • The normal build passes the -Wdeprecated-declarations flag when compiling this file. The GYP folks explicitly do not want to add that feature to GYP, and there does not appear to be a way to remove the deprecated call from this file.
• rendering/svg/RenderSVGAllInOne.cpp:
  • Add RenderSVGPath.cpp, which was missing previously.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• gyp/WebCore.gyp (modified) (4 diffs)
• platform/mac/WebCoreObjCExtras.mm (modified) (1 diff)
• rendering/svg/RenderSVGAllInOne.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        WebCore GYP build should build
+        https://bugs.webkit.org/show_bug.cgi?id=56696
+
+        After this patch, the WebCore GYP build successfully compiles and
+        links.  I haven't trying executing it yet.
+
+        * WebCore.gypi:
+            - DOMMouseEvent should be included as part of the Objective-C bindings.
+        * WebCore.xcodeproj/project.pbxproj:
+            - RenderSVGPath.cpp was mistakenly included directly in the project
+              instead of being built by RenderSVGAllInOne.
+        * gyp/WebCore.gyp:
+            - Exclude some more files from the build.  These files are absent
+              in the normal build.  I didn't see them earlier because the dead
+              code stripping was hiding them.  (They're probably unreferenced.)
+            - Switch to using RenderSVGAllInOne.  I'm not entirely sure if this
+              part of the patch is necessary, but it matches the normal build
+              more closely.
+        * platform/mac/WebCoreObjCExtras.mm:
+            - The normal build passes the -Wdeprecated-declarations flag when
+              compiling this file.  The GYP folks explicitly do not want to add
+              that feature to GYP, and there does not appear to be a way to
+              remove the deprecated call from this file.
+        * rendering/svg/RenderSVGAllInOne.cpp:
+            - Add RenderSVGPath.cpp, which was missing previously.
+
 2011-03-18  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -6764 +6764 @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMessagePort.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMessagePortInternal.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMouseEvent.mm',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMouseEventInternal.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMutationEvent.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMMutationEventInternal.h',

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4073 +4073 @@
                 ABFE7E120D32FAF60066F4D2 /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7E100D32FAF50066F4D2 /* MediaControlElements.cpp */; };
                 ABFE7E130D32FAF60066F4D2 /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = ABFE7E110D32FAF50066F4D2 /* MediaControlElements.h */; };
-                ADDF1AD61257CD9A0003A759 /* RenderSVGPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */; };
                 ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; };
                 B0149E7D11A4B21500196A7B /* AsyncImageResizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0149E7911A4B21500196A7B /* AsyncImageResizer.cpp */; };
@@ -24771 +24770 @@
                                 D302754D12A5FEAB004BD828 /* RenderSummary.cpp in Sources */,
                                 0F4E57171313276200CF85AF /* RenderSVGAllInOne.cpp in Sources */,
-                                ADDF1AD61257CD9A0003A759 /* RenderSVGPath.cpp in Sources */,
                                 A8DF4AEC0980C42C0052981B /* RenderTable.cpp in Sources */,
                                 A8DF4AEA0980C42C0052981B /* RenderTableCell.cpp in Sources */,

trunk/Source/WebCore/gyp/WebCore.gyp

@@ -69 +69 @@
         ['exclude', 'platform/graphics/cg/FontPlatformData\\.h$'],
         ['exclude', 'platform/graphics/gpu/LoopBlinnPathProcessor\\.(cpp|h)$'],
+        ['exclude', 'platform/graphics/gpu/LoopBlinnLocalTriangulator\\.(cpp|h)$'],
+        ['exclude', 'platform/graphics/gpu/LoopBlinnPathCache\\.(cpp|h)$'],
+        ['exclude', 'platform/graphics/gpu/LoopBlinnShader\\.(cpp|h)$'],
+        ['exclude', 'platform/graphics/gpu/LoopBlinnSolidFillShader\\.(cpp|h)$'],
         # FIXME: Consider excluding GL as a suffix.
         ['exclude', 'platform/graphics/ImageSource\\.cpp$'],
@@ -81 +85 @@
         ['exclude', 'plugins/PluginDatabase\\.cpp$'],
         ['exclude', 'plugins/PluginPackageNone\\.cpp$'],
+        ['exclude', 'plugins/PluginPackage\\.cpp$'],
         ['exclude', 'plugins/PluginStream\\.cpp$'],
         ['exclude', 'plugins/PluginView\\.cpp$'],
+        ['exclude', 'plugins/mac/PluginPackageMac\\.cpp$'],
         ['exclude', 'plugins/mac/PluginViewMac\\.mm$'],
         ['exclude', 'plugins/npapi\\.cpp$'],
@@ -103 +109 @@
 
         ['exclude', 'AllInOne\\.cpp$'],
+
+        ['exclude', 'rendering/svg/[^/]+\\.cpp'],
+        ['include', 'rendering/svg/RenderSVGAllInOne\\.cpp$'],
       ],
       'mac_framework_private_headers': [
@@ -144 +153 @@
             'INFOPLIST_FILE': '<(DEPTH)/WebCore/Info.plist',
             'ALWAYS_SEARCH_USER_PATHS': 'NO',
+            'DEAD_CODE_STRIPPING': 'NO',
           },
         }],

trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+// This file intentionally calls objc_finalizeOnMainThread, which is deprecated.
+// According to http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas
+// we need to place this directive before any data or functions are defined.
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include "config.h"

trunk/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp

@@ -35 +35 @@
 #include "RenderSVGInlineText.cpp"
 #include "RenderSVGModelObject.cpp"
+#include "RenderSVGPath.cpp"
 #include "RenderSVGResource.cpp"
 #include "RenderSVGResourceClipper.cpp"