Search
j0ke.net Open Build Service
>
Projects
>
home:netmax
:
playground
>
opt-qtwebkit
> gcc-4.7-fixes.diff
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File gcc-4.7-fixes.diff of Package opt-qtwebkit
--- a/Source/WebCore/platform/graphics/TiledBackingStoreClient.h +++ b/Source/WebCore/platform/graphics/TiledBackingStoreClient.h @@ -30,4 +30,5 @@ class TiledBackingStoreClient { public: + virtual ~TiledBackingStoreClient() { } virtual void tiledBackingStorePaintBegin() = 0; virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; --- a/Source/WebCore/dom/Element.cpp (revision 93620) +++ b/Source/WebCore/dom/Element.cpp (working copy) @@ -1097,7 +1097,7 @@ void Element::recalcStyle(StyleChange ch { // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. RefPtr<RenderStyle> currentStyle(renderStyle()); - bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; + bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false; bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); --- a/Source/WebCore/html/HTMLImageElement.cpp +++ b/Source/WebCore/html/HTMLImageElement.cpp @@ -74,5 +74,5 @@ if (optionalWidth) image->setWidth(*optionalWidth); - if (optionalHeight > 0) + if (optionalHeight) image->setHeight(*optionalHeight); return image.release(); --- a/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp.me 2012-01-24 15:26:33.000000000 +0100 +++ b/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-01-24 15:27:01.000000000 +0100 @@ -28,6 +28,7 @@ #include "PluginObject.h" #include <assert.h> #include <string.h> +#include <unistd.h> using namespace std; extern NPNetscapeFuncs *browser;