[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit eea2b0becc83d42bfcc33455afac442ef9c5859e
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 01:07:09 2010 +0000

    <rdar://problem/8369736> WebKit build fails.
    
    Reviewed by Darin Adler.
    
    Temporarily add some extra includes in order to get things building again until <rdar://problem/8374711> is addressed.
    
    * Carbon/HIViewAdapter.m:
    * Carbon/HIWebView.mm:
    * Plugins/WebNetscapePluginView.mm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/Carbon/HIViewAdapter.m b/WebKit/mac/Carbon/HIViewAdapter.m
index d11bea4..39ff426 100644
--- a/WebKit/mac/Carbon/HIViewAdapter.m
+++ b/WebKit/mac/Carbon/HIViewAdapter.m
@@ -33,6 +33,12 @@
 #import "WebNSObjectExtras.h"
 #import <wtf/Assertions.h>
 
+// FIXME: Remove this when we have a solution for <rdar://problem/8374711>.
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#define __LP64__ 0
+#include <QD/QuickdrawPriv.h>
+#endif
+
 static void SetViewNeedsDisplay(HIViewRef inView, RgnHandle inRegion, Boolean inNeedsDisplay);
 
 #define WATCH_INVALIDATION 0
diff --git a/WebKit/mac/Carbon/HIWebView.mm b/WebKit/mac/Carbon/HIWebView.mm
index b461394..dc3ca31 100644
--- a/WebKit/mac/Carbon/HIWebView.mm
+++ b/WebKit/mac/Carbon/HIWebView.mm
@@ -34,9 +34,14 @@
 #import "HIViewAdapter.h"
 #import "WebHTMLViewInternal.h"
 #import "WebKit.h"
-
-#import <objc/objc-runtime.h>
 #import <WebKitSystemInterface.h>
+#import <objc/objc-runtime.h>
+
+// FIXME: Remove this when we have a solution for <rdar://problem/8374711>.
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#define __LP64__ 0
+#include <QD/QuickdrawPriv.h>
+#endif
 
 @interface NSWindow (AppKitSecretsHIWebViewKnows)
 - (void)_removeWindowRef;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d791071..3130435 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-30  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/8369736> WebKit build fails.
+
+        Temporarily add some extra includes in order to get things building again until <rdar://problem/8374711> is addressed.
+
+        * Carbon/HIViewAdapter.m:
+        * Carbon/HIWebView.mm:
+        * Plugins/WebNetscapePluginView.mm:
+
 2010-08-30  Andy Estes  <aestes at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index 10a3187..7f34d95 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -80,6 +80,14 @@
 #import <wtf/Threading.h>
 #import <wtf/text/CString.h>
 
+// FIXME: Remove this when we have a solution for <rdar://problem/8374711>.
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#ifndef __LP64__
+#define __LP64__ 0
+#endif
+#include <QD/QuickdrawPriv.h>
+#endif
+
 #define LoginWindowDidSwitchFromUserNotification    @"WebLoginWindowDidSwitchFromUserNotification"
 #define LoginWindowDidSwitchToUserNotification      @"WebLoginWindowDidSwitchToUserNotification"
 #define WKNVSupportsCompositingCoreAnimationPluginsBool 74656  /* TRUE if the browser supports hardware compositing of Core Animation plug-ins  */

-- 
WebKit Debian packaging