Changeset 113848 in webkit

Timestamp:

Apr 11, 2012 4:23:19 AM (12 years ago)

Author:

abecsi@webkit.org

Message:

Fix the build with gcc 4.7.0
​https://bugs.webkit.org/show_bug.cgi?id=83584

Reviewed by Alexey Proskuryakov.

Source/WebCore:

No new tests needed.

• Target.pri: Disable Werror on the ANGLE code since it has several recurring issues

because older versions of flex (<2.5.35) and bison (<2.5) generate code which
triggers warnings. This generated code is committed on each version update of ANGLE,
and it is very likely that the code is generated with older versions of the mentioned
tools.

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra

• platform/graphics/TiledBackingStoreClient.h: Fails because -Werror=delete-non-virtual-dtor,

gcc requires classes which have virtual methods to have a virtual destructor, if their instances
or the instances of their subclasses are deleted.
(WebCore::TiledBackingStoreClient::~TiledBackingStoreClient):

• platform/graphics/texmap/TextureMapperPlatformLayer.h: Ditto.

(WebCore::TextureMapperPlatformLayer::~TextureMapperPlatformLayer):

Tools:

• qmake/mkspecs/features/unix/default_post.prf:

The -fuse-ld=gold option is not supported with upstream gcc.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Target.pri (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/TiledBackingStoreClient.h (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/qmake/mkspecs/features/unix/default_post.prf (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-11  Andras Becsi  <andras.becsi@nokia.com>
+
+        Fix the build with gcc 4.7.0
+        https://bugs.webkit.org/show_bug.cgi?id=83584
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests needed.
+
+        * Target.pri: Disable Werror on the ANGLE code since it has several recurring issues
+        because older versions of flex (<2.5.35) and bison (<2.5) generate code which
+        triggers warnings. This generated code is committed on each version update of ANGLE,
+        and it is very likely that the code is generated with older versions of the mentioned
+        tools.
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra
+        * platform/graphics/TiledBackingStoreClient.h: Fails because -Werror=delete-non-virtual-dtor,
+        gcc requires classes which have virtual methods to have a virtual destructor, if their instances
+        or the instances of their subclasses are deleted.
+        (WebCore::TiledBackingStoreClient::~TiledBackingStoreClient):
+        * platform/graphics/texmap/TextureMapperPlatformLayer.h: Ditto.
+        (WebCore::TextureMapperPlatformLayer::~TextureMapperPlatformLayer):
+
 2012-04-11  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/Target.pri

@@ -3959 +3959 @@
             ANGLE_CFLAGS += -Wno-unused-function
             ANGLE_CFLAGS += -Wno-reorder
+            ANGLE_CFLAGS += -Wno-error
 
             angle_cxx.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$ANGLE_CFLAGS $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -74 +74 @@
     if (optionalWidth)
         image->setWidth(*optionalWidth);
-    if (optionalHeight > 0)
+    if (optionalHeight)
         image->setHeight(*optionalHeight);
     return image.release();

trunk/Source/WebCore/platform/graphics/TiledBackingStoreClient.h

@@ -30 +30 @@
 class TiledBackingStoreClient {
 public:
+    virtual ~TiledBackingStoreClient() { }
     virtual void tiledBackingStorePaintBegin() = 0;
     virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h

@@ -30 +30 @@
 class TextureMapperPlatformLayer {
 public:
+    virtual ~TextureMapperPlatformLayer() { }
     virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0, BitmapTexture* mask = 0) = 0;
     virtual void swapBuffers() { }

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-11  Andras Becsi  <andras.becsi@nokia.com>
+
+        Fix the build with gcc 4.7.0
+        https://bugs.webkit.org/show_bug.cgi?id=83584
+
+        Reviewed by Alexey Proskuryakov.
+
+        * qmake/mkspecs/features/unix/default_post.prf:
+        The -fuse-ld=gold option is not supported with upstream gcc.
+
 2012-04-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/qmake/mkspecs/features/unix/default_post.prf

@@ -41 +41 @@
 } else {
   # Use gold if available
-  !scratchbox:!mac:exists(/usr/bin/ld.gold): QMAKE_LFLAGS += -fuse-ld=gold
+  !scratchbox:!mac:exists(/usr/bin/ld.gold) {
+      # Upstream gcc 4.7 does not support the -fuse-ld=gold option ( see: http://sourceware.org/ml/binutils/2011-01/msg00178.html )
+      isEqual(QT_GCC_MAJOR_VERSION, 4):lessThan(QT_GCC_MINOR_VERSION, 7):QMAKE_LFLAGS += -fuse-ld=gold
+  }
 }