Code drop from //branches/cupcake/...@124589

1 files changed, 8 insertions, 14 deletions

diff --git a/WebKit/win/ForEachCoClass.h b/WebKit/win/ForEachCoClass.h
index e60a1ff..94976e6 100644
--- a/WebKit/win/ForEachCoClass.h
+++ b/WebKit/win/ForEachCoClass.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
 
 #include "ProgIDMacros.h"
 
+// Items may only be added to the end of this macro. No items may be removed from it.
 #define FOR_EACH_COCLASS(macro) \
     macro(CFDictionaryPropertyBag) \
     macro(WebCache) \
@@ -53,8 +54,13 @@
     macro(WebURLRequest) \
     macro(WebURLResponse) \
     macro(WebView) \
+    macro(WebArchive) \
+    macro(WebCoreStatistics) \
+    macro(WebCookieManager) \
     // end of macro
 
+// Everything below this point is deprecated. Please do not use.
+
 #define WEBKITCLASS_MEMBER(cls) cls##Class,
 enum WebKitClass {
     FOR_EACH_COCLASS(WEBKITCLASS_MEMBER)
@@ -62,29 +68,17 @@ enum WebKitClass {
 };
 #undef WEBKITCLASS_MEMBER
 
-#define PRODUCTION_PROGID(cls) VERSION_INDEPENDENT_PRODUCTION_PROGID(cls),
-static LPCOLESTR productionProgIDs[WebKitClassSentinel] = {
-    FOR_EACH_COCLASS(PRODUCTION_PROGID)
-};
-#undef PRODUCTION_PROGID
-
 #define OPENSOURCE_PROGID(cls) VERSION_INDEPENDENT_OPENSOURCE_PROGID(cls),
 static LPCOLESTR openSourceProgIDs[WebKitClassSentinel] = {
     FOR_EACH_COCLASS(OPENSOURCE_PROGID)
 };
 #undef OPENSOURCE_PROGID
 
-#if __PRODUCTION__
-    static LPCOLESTR* s_progIDs = productionProgIDs;
-#else
-    static LPCOLESTR* s_progIDs = openSourceProgIDs;
-#endif
+static LPCOLESTR* s_progIDs = openSourceProgIDs;
 
 #define PROGID(className) progIDForClass(className##Class)
 
 void setUseOpenSourceWebKit(bool);
 LPCOLESTR progIDForClass(WebKitClass);
 
-
-
 #endif // !defined(ForEachCoClass_h)