Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (130214 => 130215)
--- trunk/Source/WebKit/mac/ChangeLog 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-10-02 22:04:08 UTC (rev 130215)
@@ -1,3 +1,22 @@
+2012-10-02 Anders Carlsson <ander...@apple.com>
+
+ Build fixes.
+
+ * Plugins/Hosted/NetscapePluginHostManager.mm:
+ (WebKit::NetscapePluginHostManager::spawnPluginHost):
+ (WebKit::NetscapePluginHostManager::didCreateWindow):
+ * Plugins/Hosted/NetscapePluginHostProxy.h:
+ (NetscapePluginHostProxy):
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WebKit::NetscapePluginHostProxy::didEnterFullscreen):
+ (WebKit::NetscapePluginHostProxy::didExitFullscreen):
+ (WebKit::NetscapePluginHostProxy::applicationDidBecomeActive):
+ (WebKit::NetscapePluginHostProxy::endModal):
+ (WebKit):
+ (WebKit::NetscapePluginHostProxy::makeCurrentProcessFrontProcess):
+ (WebKit::NetscapePluginHostProxy::makePluginHostProcessFrontProcess):
+ (WebKit::NetscapePluginHostProxy::isPluginHostProcessFrontProcess):
+
2012-10-01 Brady Eidson <beid...@apple.com>
Remove the Safari 2 -> Safari 3 icon database import code.
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm (130214 => 130215)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2012-10-02 22:04:08 UTC (rev 130215)
@@ -161,9 +161,17 @@
[hostProperties release];
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,
+ kr = _WKPHCheckInWithPluginHost(pluginHostPort, (uint8_t*)[data bytes], [data length], clientPort, psn.highLongOfPSN, psn.lowLongOfPSN, renderServerPort,
&pluginHostPSN.highLongOfPSN, &pluginHostPSN.lowLongOfPSN);
if (kr != KERN_SUCCESS) {
@@ -291,8 +299,15 @@
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.h (130214 => 130215)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h 2012-10-02 22:04:08 UTC (rev 130215)
@@ -65,8 +65,13 @@
static bool isProcessingRequests() { return s_processingRequests; }
bool shouldCacheMissingPropertiesAndMethods() const { return m_shouldCacheMissingPropertiesAndMethods; }
-
+
+ static void makeCurrentProcessFrontProcess();
+ void makePluginHostProcessFrontProcess() const;
+ bool isPluginHostProcessFrontProcess() const;
+
private:
+
~NetscapePluginHostProxy();
void pluginHostDied();
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (130214 => 130215)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2012-10-02 22:04:08 UTC (rev 130215)
@@ -197,23 +197,14 @@
void NetscapePluginHostProxy::didEnterFullscreen() const
{
- SetFrontProcess(&m_pluginHostPSN);
+ makePluginHostProcessFrontProcess();
}
void NetscapePluginHostProxy::didExitFullscreen() const
{
// If the plug-in host is the current application then we should bring ourselves to the front when it exits full-screen mode.
-
- ProcessSerialNumber frontProcess;
- GetFrontProcess(&frontProcess);
- Boolean isSameProcess = 0;
- SameProcess(&frontProcess, &m_pluginHostPSN, &isSameProcess);
- if (!isSameProcess)
- return;
-
- ProcessSerialNumber currentProcess;
- GetCurrentProcess(¤tProcess);
- SetFrontProcess(¤tProcess);
+ if (isPluginHostProcessFrontProcess())
+ makeCurrentProcessFrontProcess();
}
void NetscapePluginHostProxy::setFullscreenWindowIsShowing(bool isShowing)
@@ -231,7 +222,7 @@
void NetscapePluginHostProxy::applicationDidBecomeActive()
{
- SetFrontProcess(&m_pluginHostPSN);
+ makePluginHostProcessFrontProcess();
}
void NetscapePluginHostProxy::beginModal()
@@ -264,14 +255,11 @@
CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_clientPortSource.get(), (CFStringRef)NSModalPanelRunLoopMode);
[NSApp stopModal];
-
- // Make ourselves the front process.
- ProcessSerialNumber psn;
- GetCurrentProcess(&psn);
- SetFrontProcess(&psn);
+
+ makeCurrentProcessFrontProcess();
}
-
+
void NetscapePluginHostProxy::setModal(bool modal)
{
if (modal == m_isModal)
@@ -337,6 +325,50 @@
return false;
}
+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;
+}
+
} // namespace WebKit
using namespace WebKit;
Modified: trunk/Source/WebKit2/ChangeLog (130214 => 130215)
--- trunk/Source/WebKit2/ChangeLog 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-02 22:04:08 UTC (rev 130215)
@@ -1,3 +1,15 @@
+2012-10-02 Anders Carlsson <ander...@apple.com>
+
+ Build fixes.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::beginModal):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::getPluginProcessSerialNumber):
+ (WebKit::PluginProcessProxy::makePluginProcessTheFrontProcess):
+ (WebKit::PluginProcessProxy::makeUIProcessTheFrontProcess):
+ (WebKit::PluginProcessProxy::exitFullscreen):
+
2012-10-02 Alexey Proskuryakov <a...@apple.com>
<rdar://problem/12407139> WebKit2 should provide API that returns all pages in the same process as a given page
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (130214 => 130215)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-10-02 22:04:08 UTC (rev 130215)
@@ -189,11 +189,18 @@
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/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (130214 => 130215)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2012-10-02 21:49:33 UTC (rev 130214)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2012-10-02 22:04:08 UTC (rev 130215)
@@ -145,7 +145,14 @@
bool PluginProcessProxy::getPluginProcessSerialNumber(ProcessSerialNumber& pluginProcessSerialNumber)
{
pid_t pluginProcessPID = m_processLauncher->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()
@@ -154,14 +161,28 @@
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)
@@ -193,7 +214,14 @@
{
// 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();
@@ -206,9 +234,24 @@
// 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 (!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
+ }
}
void PluginProcessProxy::setModalWindowIsShowing(bool modalWindowIsShowing)
