Changeset 76466 in webkit

Timestamp:

Jan 23, 2011 11:28:41 AM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

2011-01-23 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][Symbian] Fix --minimal build
​https://bugs.webkit.org/show_bug.cgi?id=52839

Some of the plugins' functionality is reimplemented in
Symbian specific files.
Some of this functionality should be compiled in even if
the guard NETSCAPE_PLUGIN_API is turned off.
This patch moves that functionality out of the
NETSCAPE_PLUGIN_API guard.

Build fix so no new tests.

• WebCore.pro:
• plugins/symbian/PluginPackageSymbian.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (2 diffs)
• plugins/symbian/PluginPackageSymbian.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-23  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Some of the plugins' functionality is reimplemented in
+        Symbian specific files.
+        Some of this functionality should be compiled in even if 
+        the guard NETSCAPE_PLUGIN_API is turned off.
+        This patch moves that functionality out of the
+        NETSCAPE_PLUGIN_API guard.
+
+        Build fix so no new tests.
+
+        * WebCore.pro:
+        * plugins/symbian/PluginPackageSymbian.cpp:
+
 2011-01-23  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/WebCore.pro

@@ -2843 +2843 @@
 }
 
+symbian {
+    SOURCES += \
+        plugins/symbian/PluginDatabaseSymbian.cpp \
+        plugins/symbian/PluginPackageSymbian.cpp
+}
+
 contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
 
@@ -2849 +2855 @@
     symbian {
         SOURCES += \
-        plugins/symbian/PluginPackageSymbian.cpp \
-        plugins/symbian/PluginDatabaseSymbian.cpp \
         plugins/symbian/PluginViewSymbian.cpp \
         plugins/symbian/PluginContainerSymbian.cpp

trunk/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp

@@ -30 +30 @@
 namespace WebCore {
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 bool PluginPackage::fetchInfo()
 {
@@ -170 +171 @@
     return true;
 }
+#endif
 
 void PluginPackage::unload()
@@ -187 +189 @@
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 uint16_t PluginPackage::NPVersion() const
 {
     return NP_VERSION_MINOR;
 }
+#endif
 }