Reviewed by John.

        - some changes to prepare for converting more code to C++

        * bridge/mac/WebCoreFrameBridge.h: Added import of <Cocoa/Cocoa.h> so this header is
        self-sufficient.

        * bridge/mac/WebCoreViewFactory.h: Added forward declaration of the NSMenu class.
        Needed since the class is used in this header (for some work I have not landed yet).

        * loader/mac/LoaderNSURLExtras.h:
        * loader/mac/WebFormDataStream.h:
        Added extern "C" so this code can be used from C++.

        * loader/mac/LoaderNSURLExtras.m:
        * loader/mac/WebDataProtocol.mm:
        * loader/mac/WebDocumentLoader.mm:
        * loader/mac/WebFormDataStream.m:
        * loader/mac/WebLoader.mm:
        * loader/mac/WebMainResourceLoader.mm:
        * loader/mac/WebNetscapePlugInStreamLoader.mm:
        * loader/mac/WebPolicyDecider.mm:
        * loader/mac/WebSubresourceLoader.mm:
        Added missing includes of config.h.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 136799d5a4f4809f8387c905077687c5b857f1b4..d765623afa6cb2ef83277a6a99196678a7a29a8a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2006-10-11  Darin Adler  <darin@apple.com>
+
+        Reviewed by John.
+
+        - some changes to prepare for converting more code to C++
+
+        * bridge/mac/WebCoreFrameBridge.h: Added import of <Cocoa/Cocoa.h> so this header is
+        self-sufficient.
+
+        * bridge/mac/WebCoreViewFactory.h: Added forward declaration of the NSMenu class.
+        Needed since the class is used in this header (for some work I have not landed yet).
+
+        * loader/mac/LoaderNSURLExtras.h:
+        * loader/mac/WebFormDataStream.h:
+        Added extern "C" so this code can be used from C++.
+
+        * loader/mac/LoaderNSURLExtras.m:
+        * loader/mac/WebDataProtocol.mm:
+        * loader/mac/WebDocumentLoader.mm:
+        * loader/mac/WebFormDataStream.m:
+        * loader/mac/WebLoader.mm:
+        * loader/mac/WebMainResourceLoader.mm:
+        * loader/mac/WebNetscapePlugInStreamLoader.mm:
+        * loader/mac/WebPolicyDecider.mm:
+        * loader/mac/WebSubresourceLoader.mm:
+        Added missing includes of config.h.
+
 2006-10-11  John Sullivan  <sullivan@apple.com>
         
         Darin wrote this code; we tested it; I give it the thumbs up.

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.h b/WebCore/bridge/mac/WebCoreFrameBridge.h
index 9c38ee8be93c0c060fbba7d63b670da31d1de52e..737bd23a56fea0b518cd725959798e7cc5fcba8c 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.h
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#import <Cocoa/Cocoa.h>
 #import <JavaScriptCore/npruntime.h>
 #import <JavaVM/jni.h>
 #import <WebCore/WebCoreKeyboardAccess.h>

diff --git a/WebCore/bridge/mac/WebCoreViewFactory.h b/WebCore/bridge/mac/WebCoreViewFactory.h
index 67cbc24127fc1210e1dfb0f182c66e6b47f0034f..c32dfbfec5e7a005c3f56efafdd7dec1e88b802a 100644 (file)
--- a/WebCore/bridge/mac/WebCoreViewFactory.h
+++ b/WebCore/bridge/mac/WebCoreViewFactory.h
@@ -25,6 +25,7 @@
 
 @class NSArray;
 @class NSDictionary;
+@class NSMenu;
 @class NSString;
 @class NSView;
 @class WebCoreFrameBridge;

diff --git a/WebCore/loader/mac/LoaderNSURLExtras.h b/WebCore/loader/mac/LoaderNSURLExtras.h
index 2912de0d283721bac0b501320077314388ec9085..e3c06014fcfaca515acc5a6e6458b95a60f010d0 100644 (file)
--- a/WebCore/loader/mac/LoaderNSURLExtras.h
+++ b/WebCore/loader/mac/LoaderNSURLExtras.h
@@ -28,6 +28,10 @@
 
 #import <Foundation/Foundation.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 NSURL *urlByRemovingComponent(NSURL *url, CFURLComponentType component);
 NSURL *urlByRemovingFragment(NSURL *url);
 NSString *urlOriginalDataAsString(NSURL *url);
@@ -40,3 +44,6 @@ BOOL stringIsFileURL(NSString *urlString);
 BOOL urlIsEmpty(NSURL *url);
 NSURL *canonicalURL(NSURL *url);
 
+#ifdef __cplusplus
+}
+#endif

diff --git a/WebCore/loader/mac/LoaderNSURLExtras.m b/WebCore/loader/mac/LoaderNSURLExtras.m
index 7af8edc605852e13d59a104a6e56fffa7771c24a..9cf939de6a1965968c41f3eb7881d12be65b8741 100644 (file)
--- a/WebCore/loader/mac/LoaderNSURLExtras.m
+++ b/WebCore/loader/mac/LoaderNSURLExtras.m
@@ -27,6 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "LoaderNSURLExtras.h"
 
 #import <wtf/Assertions.h>

diff --git a/WebCore/loader/mac/WebDataProtocol.mm b/WebCore/loader/mac/WebDataProtocol.mm
index 558683edd078c042ec6a7d47c298bd0a92e564ee..72dae55af33fee0c0b5349fd7d4e0098200cf3a1 100644 (file)
--- a/WebCore/loader/mac/WebDataProtocol.mm
+++ b/WebCore/loader/mac/WebDataProtocol.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebDataProtocol.h"
 
 #import <Foundation/NSURLResponse.h>

diff --git a/WebCore/loader/mac/WebDocumentLoader.mm b/WebCore/loader/mac/WebDocumentLoader.mm
index 7caad93e5073b2d8345ad0d96908343b00db0e04..358d0e27be10651176430a47095a7981e2381e72 100644 (file)
--- a/WebCore/loader/mac/WebDocumentLoader.mm
+++ b/WebCore/loader/mac/WebDocumentLoader.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebDocumentLoader.h"
 
 #import <wtf/Assertions.h>

diff --git a/WebCore/loader/mac/WebFormDataStream.h b/WebCore/loader/mac/WebFormDataStream.h
index 575f4d461f2e64dcddad249cb3c4b53c92bb131e..caa84850eaf36b63fe730701a530913e3a46920e 100644 (file)
--- a/WebCore/loader/mac/WebFormDataStream.h
+++ b/WebCore/loader/mac/WebFormDataStream.h
@@ -29,4 +29,12 @@
 @class NSArray;
 @class NSMutableURLRequest;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void webSetHTTPBody(NSMutableURLRequest *request, NSArray *formData);
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/WebCore/loader/mac/WebFormDataStream.m b/WebCore/loader/mac/WebFormDataStream.m
index 1e41ca009c6f90a7770889e3e52600f621d0e6da..79f61cb4237a506e1bafbd9e2fe6d1aca96e89cc 100644 (file)
--- a/WebCore/loader/mac/WebFormDataStream.m
+++ b/WebCore/loader/mac/WebFormDataStream.m
@@ -28,6 +28,7 @@
 
 /* originally written by Becky Willrich, additional code by Darin Adler */
 
+#import "config.h"
 #import "WebFormDataStream.h"
 
 #import <sys/types.h>

diff --git a/WebCore/loader/mac/WebLoader.mm b/WebCore/loader/mac/WebLoader.mm
index 47de7bb70dd10745ab8eccafbff2501e22b0723c..95c6ed95ffb32569998a1e39885f6f245ebf96cd 100644 (file)
--- a/WebCore/loader/mac/WebLoader.mm
+++ b/WebCore/loader/mac/WebLoader.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebLoader.h"
 
 #import "WebDataProtocol.h"

diff --git a/WebCore/loader/mac/WebMainResourceLoader.mm b/WebCore/loader/mac/WebMainResourceLoader.mm
index bad10a7cbc460223c749695e3645d2c0105b42fd..f5ff08d3f23c5490badbfc53244115a4f6758cfa 100644 (file)
--- a/WebCore/loader/mac/WebMainResourceLoader.mm
+++ b/WebCore/loader/mac/WebMainResourceLoader.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebMainResourceLoader.h"
 
 #import "WebDataProtocol.h"

diff --git a/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm b/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
index 9b5cc95d00361d5782db733eb25bd64ffa329d99..b0ab095d9307b74638c98f714de4f9618ac4cafe 100644 (file)
--- a/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
+++ b/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebNetscapePlugInStreamLoader.h"
 
 #import "WebFrameLoader.h"

diff --git a/WebCore/loader/mac/WebPolicyDecider.mm b/WebCore/loader/mac/WebPolicyDecider.mm
index a191294f5769c998c9b8889f3b34cb5d08086baf..1d8df7638fac3092d103e3780075bd4be416e9e4 100644 (file)
--- a/WebCore/loader/mac/WebPolicyDecider.mm
+++ b/WebCore/loader/mac/WebPolicyDecider.mm
@@ -26,7 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebPolicyDecider.h"
+
 #import <wtf/Assertions.h>
 
 @implementation WebPolicyDecider

diff --git a/WebCore/loader/mac/WebSubresourceLoader.mm b/WebCore/loader/mac/WebSubresourceLoader.mm
index a7f4fab46ac9e8c2f4b5795aa36e93129323f8d9..3fca512ec12451bbfe4e018203355df40decf225 100644 (file)
--- a/WebCore/loader/mac/WebSubresourceLoader.mm
+++ b/WebCore/loader/mac/WebSubresourceLoader.mm
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "config.h"
 #import "WebSubresourceLoader.h"
 
 #import "WebFormDataStream.h"