[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4608e0acb35874b208c8e84ad1777f15810f00e4
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 20:22:52 2009 +0000

    Mac/Qt build fixes
    
    * platform/graphics/mac/Canvas3DLayer.mm:
    * platform/graphics/mac/GraphicsContext3DMac.cpp:
    * platform/qt/Localizations.cpp:
    Added missing #includes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e406d53..800836e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-17  Adam Roben  <aroben at apple.com>
+
+        Mac/Qt build fixes
+
+        * platform/graphics/mac/Canvas3DLayer.mm:
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        * platform/qt/Localizations.cpp:
+        Added missing #includes.
+
 2009-12-17  Benjamin Otte  <otte at gnome.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/mac/Canvas3DLayer.mm b/WebCore/platform/graphics/mac/Canvas3DLayer.mm
index 94819d4..01b5325 100644
--- a/WebCore/platform/graphics/mac/Canvas3DLayer.mm
+++ b/WebCore/platform/graphics/mac/Canvas3DLayer.mm
@@ -33,8 +33,9 @@
 #import "GraphicsLayer.h"
 #import <QuartzCore/QuartzCore.h>
 #import <OpenGL/OpenGL.h>
+#import <wtf/FastMalloc.h>
 #import <wtf/RetainPtr.h>
-#include <wtf/FastMalloc.h>
+#import <wtf/UnusedParam.h>
 
 using namespace WebCore;
 
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
index 98fd806..724f42c 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
@@ -48,9 +48,9 @@
 #include "ImageBuffer.h"
 #include "NotImplemented.h"
 #include "WebKitCSSMatrix.h"
-
 #include <CoreGraphics/CGBitmapContext.h>
 #include <OpenGL/CGLRenderers.h>
+#include <wtf/UnusedParam.h>
 
 namespace WebCore {
 
diff --git a/WebCore/platform/qt/Localizations.cpp b/WebCore/platform/qt/Localizations.cpp
index 1768502..e66f758 100644
--- a/WebCore/platform/qt/Localizations.cpp
+++ b/WebCore/platform/qt/Localizations.cpp
@@ -32,6 +32,7 @@
 #include "LocalizedStrings.h"
 #include "NotImplemented.h"
 #include "PlatformString.h"
+#include <wtf/MathExtras.h>
 
 #include <QCoreApplication>
 #include <QLocale>

-- 
WebKit Debian packaging