2010-06-20 Jessie Berlin <jberlin@apple.com>
authorjberlin@webkit.org <jberlin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jun 2010 23:15:58 +0000 (23:15 +0000)
committerjberlin@webkit.org <jberlin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jun 2010 23:15:58 +0000 (23:15 +0000)
        Reviewed by Dan Bernstein.

        Add #if USE(PLATFORM_STRATEGIES) where WebPlatformStrategies is being used.

        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
        * WebProcess/WebProcess.cpp:
        (WebKit::WebProcess::WebProcess):
        Only initialize the web platform strategies if PLATFORM_STRATEGIES is being used.

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

WebKit2/ChangeLog
WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
WebKit2/WebProcess/WebProcess.cpp

index d900ce4..f134e9d 100644 (file)
@@ -1,3 +1,15 @@
+2010-06-20  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add #if USE(PLATFORM_STRATEGIES) where WebPlatformStrategies is being used.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        Only initialize the web platform strategies if PLATFORM_STRATEGIES is being used.
+
 2010-06-19  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
index 7f77279..eaf9445 100644 (file)
@@ -25,6 +25,8 @@
 
 #include "WebPlatformStrategies.h"
 
+#if USE(PLATFORM_STRATEGIES)
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -57,3 +59,5 @@ void WebPlatformStrategies::getPluginInfo(Vector<WebCore::PluginInfo>& plugins)
 }
 
 } // namespace WebKit
+
+#endif // USE(PLATFORM_STRATEGIES)
index f712f55..49051fd 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef WebPlatformStrategies_h
 #define WebPlatformStrategies_h
 
+#if USE(PLATFORM_STRATEGIES)
+
 #include <WebCore/PlatformStrategies.h>
 #include <WebCore/PluginStrategy.h>
 
@@ -48,4 +50,6 @@ private:
 
 } // namespace WebKit
 
+#endif // USE(PLATFORM_STRATEGIES)
+
 #endif // WebPlatformStrategies_h
index 8bb8ebd..3431c1a 100644 (file)
@@ -53,8 +53,10 @@ WebProcess& WebProcess::shared()
 WebProcess::WebProcess()
     : m_inDidClose(false)
 {
+#if USE(PLATFORM_STRATEGIES)
     // Initialize our platform strategies.
     WebPlatformStrategies::initialize();
+#endif // USE(PLATFORM_STRATEGIES)
 }
 
 void WebProcess::initialize(CoreIPC::Connection::Identifier serverIdentifier, RunLoop* runLoop)