Title: [102319] trunk/Source
- Revision
- 102319
- Author
- [email protected]
- Date
- 2011-12-07 23:33:51 -0800 (Wed, 07 Dec 2011)
Log Message
Fix the 32-bit build.
Ignore some warnings that only occur in 32-bit.
Source/WebKit/mac:
* Plugins/WebNetscapePluginPackage.mm:
Source/WebKit2:
* PluginProcess/mac/PluginProcessShim.mm:
* Shared/Plugins/Netscape/NetscapePluginModule.cpp:
(WebKit::NetscapePluginModule::tryLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (102318 => 102319)
--- trunk/Source/WebKit/mac/ChangeLog 2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-12-08 07:33:51 UTC (rev 102319)
@@ -1,3 +1,11 @@
+2011-12-07 Mark Rowe <[email protected]>
+
+ Fix the 32-bit build.
+
+ Ignore some warnings that only occur in 32-bit.
+
+ * Plugins/WebNetscapePluginPackage.mm:
+
2011-12-07 Mary Wu <[email protected]>
Change function name InitializeLoggingChannelsIfNecessary to follow coding style guideline
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (102318 => 102319)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2011-12-08 07:33:51 UTC (rev 102319)
@@ -67,6 +67,12 @@
@implementation WebNetscapePluginPackage
#ifndef __LP64__
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+ (void)initialize
{
// The Shockwave plugin requires a valid file in CurApRefNum.
@@ -92,8 +98,13 @@
UseResFile(savedCurResFile);
}
}
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
#endif
+#endif
+
- (ResFileRefNum)openResourceFile
{
#ifdef SUPPORT_CFM
Modified: trunk/Source/WebKit2/ChangeLog (102318 => 102319)
--- trunk/Source/WebKit2/ChangeLog 2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-08 07:33:51 UTC (rev 102319)
@@ -1,3 +1,13 @@
+2011-12-07 Mark Rowe <[email protected]>
+
+ Fix the 32-bit build.
+
+ Ignore some warnings that only occur in 32-bit.
+
+ * PluginProcess/mac/PluginProcessShim.mm:
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::NetscapePluginModule::tryLoad):
+
2011-12-07 Balazs Kelemen <[email protected]>
ShareableBitmapGtk.cpp has no reason to exist
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (102318 => 102319)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2011-12-08 07:33:51 UTC (rev 102319)
@@ -72,6 +72,12 @@
}
#ifndef __LP64__
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
static void shimDebugger(void)
{
if (!pluginProcessShimCallbacks.shouldCallRealDebugger())
@@ -130,8 +136,12 @@
DYLD_INTERPOSE(shimShowWindow, ShowWindow);
DYLD_INTERPOSE(shimHideWindow, HideWindow);
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
#endif
+#endif
+
__attribute__((visibility("default")))
void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks& callbacks)
{
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (102318 => 102319)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2011-12-08 07:31:08 UTC (rev 102318)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2011-12-08 07:33:51 UTC (rev 102319)
@@ -227,19 +227,31 @@
// in Flash and QuickTime on Windows).
#if PLUGIN_ARCHITECTURE(MAC)
#ifndef NP_NO_CARBON
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
// Plugins (at least QT) require that you call UseResFile on the resource file before loading it.
ResFileRefNum currentResourceFile = CurResFile();
ResFileRefNum pluginResourceFile = m_module->bundleResourceMap();
UseResFile(pluginResourceFile);
+
#endif
bool result = initializeFuncPtr(netscapeBrowserFuncs()) == NPERR_NO_ERROR && getEntryPointsFuncPtr(&m_pluginFuncs) == NPERR_NO_ERROR;
#ifndef NP_NO_CARBON
// Restore the resource file.
UseResFile(currentResourceFile);
+
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
#endif
+#endif
+
return result;
#elif PLUGIN_ARCHITECTURE(WIN)
if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
