Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (159436 => 159437)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-18 18:54:21 UTC (rev 159437)
@@ -1,5 +1,20 @@
2013-11-18 Anders Carlsson <[email protected]>
+ Remove unnecessary COMPILER(CLANG) #ifdefs in Mac-only code
+ https://bugs.webkit.org/show_bug.cgi?id=124523
+
+ Reviewed by Dan Bernstein.
+
+ * Plugins/Hosted/NetscapePluginHostManager.mm:
+ (WebKit::NetscapePluginHostManager::spawnPluginHost):
+ (WebKit::NetscapePluginHostManager::didCreateWindow):
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WebKit::NetscapePluginHostProxy::makeCurrentProcessFrontProcess):
+ (WebKit::NetscapePluginHostProxy::makePluginHostProcessFrontProcess):
+ (WebKit::NetscapePluginHostProxy::isPluginHostProcessFrontProcess):
+
+2013-11-18 Anders Carlsson <[email protected]>
+
Ignore deprecation warnings for now.
* History/WebHistory.h:
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm (159436 => 159437)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -161,14 +161,10 @@
ProcessSerialNumber psn;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
GetCurrentProcess(&psn);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
kr = _WKPHCheckInWithPluginHost(pluginHostPort, (uint8_t*)[data bytes], [data length], clientPort, psn.highLongOfPSN, psn.lowLongOfPSN, renderServerPort,
&pluginHostPSN.highLongOfPSN, &pluginHostPSN.lowLongOfPSN);
@@ -299,15 +295,11 @@
if (!hostProxy->isMenuBarVisible()) {
// Make ourselves the front process.
ProcessSerialNumber psn;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
GetCurrentProcess(&psn);
SetFrontProcess(&psn);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
return;
}
}
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (159436 => 159437)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -326,44 +326,32 @@
void NetscapePluginHostProxy::makeCurrentProcessFrontProcess()
{
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
ProcessSerialNumber psn;
GetCurrentProcess(&psn);
SetFrontProcess(&psn);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
void NetscapePluginHostProxy::makePluginHostProcessFrontProcess() const
{
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
SetFrontProcess(&m_pluginHostPSN);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
bool NetscapePluginHostProxy::isPluginHostProcessFrontProcess() const
{
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
ProcessSerialNumber frontProcess;
GetFrontProcess(&frontProcess);
Boolean isSameProcess = 0;
SameProcess(&frontProcess, &m_pluginHostPSN, &isSameProcess);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
return isSameProcess;
}
Modified: trunk/Source/WebKit2/ChangeLog (159436 => 159437)
--- trunk/Source/WebKit2/ChangeLog 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-18 18:54:21 UTC (rev 159437)
@@ -1,3 +1,22 @@
+2013-11-18 Anders Carlsson <[email protected]>
+
+ Remove unnecessary COMPILER(CLANG) #ifdefs in Mac-only code
+ https://bugs.webkit.org/show_bug.cgi?id=124523
+
+ Reviewed by Dan Bernstein.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::beginModal):
+ * PluginProcess/mac/PluginProcessShim.mm:
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::NetscapePluginModule::tryLoad):
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::getPluginProcessSerialNumber):
+ (WebKit::PluginProcessProxy::makePluginProcessTheFrontProcess):
+ (WebKit::PluginProcessProxy::makeUIProcessTheFrontProcess):
+ (WebKit::PluginProcessProxy::exitFullscreen):
+
2013-11-18 Ryuan Choi <[email protected]>
[EFL] Add EWebKitConfig.cmake and EWebKit2Config.cmake
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (159436 => 159437)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -208,17 +208,13 @@
static void beginModal()
{
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
// Make sure to make ourselves the front process
ProcessSerialNumber psn;
GetCurrentProcess(&psn);
SetFrontProcess(&psn);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
if (!modalCount++)
setModal(true);
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (159436 => 159437)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -55,10 +55,8 @@
#ifndef __LP64__
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
static void shimDebugger(void)
{
@@ -129,9 +127,7 @@
DYLD_INTERPOSE(shimHideWindow, HideWindow);
DYLD_INTERPOSE(shimLSOpenCFURLRef, LSOpenCFURLRef);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
#endif
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (159436 => 159437)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2013-11-18 18:54:21 UTC (rev 159437)
@@ -225,10 +225,8 @@
#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();
@@ -243,9 +241,7 @@
// Restore the resource file.
UseResFile(currentResourceFile);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
#endif
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (159436 => 159437)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -213,10 +213,8 @@
return true;
}
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
class ResourceMap {
public:
@@ -286,9 +284,7 @@
return true;
}
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
static const ResID PluginNameOrDescriptionStringNumber = 126;
static const ResID MIMEDescriptionStringNumber = 127;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (159436 => 159437)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-11-18 18:46:11 UTC (rev 159436)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-11-18 18:54:21 UTC (rev 159437)
@@ -167,14 +167,10 @@
bool PluginProcessProxy::getPluginProcessSerialNumber(ProcessSerialNumber& pluginProcessSerialNumber)
{
pid_t pluginProcessPID = processIdentifier();
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
return GetProcessForPID(pluginProcessPID, &pluginProcessSerialNumber) == noErr;
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
void PluginProcessProxy::makePluginProcessTheFrontProcess()
@@ -183,28 +179,20 @@
if (!getPluginProcessSerialNumber(pluginProcessSerialNumber))
return;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
SetFrontProcess(&pluginProcessSerialNumber);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
void PluginProcessProxy::makeUIProcessTheFrontProcess()
{
ProcessSerialNumber processSerialNumber;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
GetCurrentProcess(&processSerialNumber);
SetFrontProcess(&processSerialNumber);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
void PluginProcessProxy::setFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
@@ -236,14 +224,10 @@
{
// If the plug-in host is the current application then we should bring ourselves to the front when it exits full-screen mode.
ProcessSerialNumber frontProcessSerialNumber;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
GetFrontProcess(&frontProcessSerialNumber);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
// The UI process must be the front process in order to change the presentation mode.
makeUIProcessTheFrontProcess();
@@ -256,23 +240,15 @@
// If the plug-in process was not the front process, switch back to the previous front process.
// (Otherwise we'll keep the UI process as the front process).
Boolean isPluginProcessFrontProcess;
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
SameProcess(&frontProcessSerialNumber, &pluginProcessSerialNumber, &isPluginProcessFrontProcess);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
if (!isPluginProcessFrontProcess) {
-#if COMPILER(CLANG)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
SetFrontProcess(&frontProcessSerialNumber);
-#if COMPILER(CLANG)
#pragma clang diagnostic pop
-#endif
}
}
