Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 129 insertions, 4 deletions

diff --git a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
index 5a54719..3a3586a 100644
--- a/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
+++ b/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
@@ -28,17 +28,98 @@
 
 #if ENABLE(PLUGIN_PROCESS)
 
-// FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized
-#define UI_STRING(__str, __desc) [NSString stringWithUTF8String:__str]
-
 #import "NetscapePlugin.h"
 #import "PluginProcessShim.h"
+#import "PluginProcessProxyMessages.h"
 #import "PluginProcessCreationParameters.h"
+#import <WebCore/LocalizedStrings.h>
 #import <WebKitSystemInterface.h>
 #import <dlfcn.h>
+#import <wtf/HashSet.h>
 
 namespace WebKit {
 
+class FullscreenWindowTracker {
+    WTF_MAKE_NONCOPYABLE(FullscreenWindowTracker);
+
+public:
+    FullscreenWindowTracker() { }
+    
+    template<typename T> void windowShown(T window);
+    template<typename T> void windowHidden(T window);
+
+private:
+    typedef HashSet<void*> WindowSet;
+    WindowSet m_windows;
+};
+
+static bool rectCoversAnyScreen(NSRect rect)
+{
+    for (NSScreen *screen in [NSScreen screens]) {
+        if (NSContainsRect(rect, [screen frame]))
+            return YES;
+    }
+    return NO;
+}
+
+#ifndef NP_NO_CARBON
+static bool windowCoversAnyScreen(WindowRef window)
+{
+    HIRect bounds;
+    HIWindowGetBounds(window, kWindowStructureRgn, kHICoordSpaceScreenPixel, &bounds);
+
+    // Convert to Cocoa-style screen coordinates that use a Y offset relative to the zeroth screen's origin.
+    bounds.origin.y = NSHeight([[[NSScreen screens] objectAtIndex:0] frame]) - CGRectGetMaxY(bounds);
+
+    return rectCoversAnyScreen(NSRectFromCGRect(bounds));
+}
+#endif
+
+static bool windowCoversAnyScreen(NSWindow* window)
+{
+    return rectCoversAnyScreen([window frame]);
+}
+
+template<typename T> void FullscreenWindowTracker::windowShown(T window)
+{
+    // If this window is already visible then there is nothing to do.
+    WindowSet::iterator it = m_windows.find(window);
+    if (it != m_windows.end())
+        return;
+    
+    // If the window is not full-screen then we're not interested in it.
+    if (!windowCoversAnyScreen(window))
+        return;
+
+    bool windowSetWasEmpty = m_windows.isEmpty();
+
+    m_windows.add(window);
+    
+    // If this is the first full screen window to be shown, notify the UI process.
+    if (windowSetWasEmpty)
+        PluginProcess::shared().setFullscreenWindowIsShowing(true);
+}
+
+template<typename T> void FullscreenWindowTracker::windowHidden(T window)
+{
+    // If this is not a window that we're tracking then there is nothing to do.
+    WindowSet::iterator it = m_windows.find(window);
+    if (it == m_windows.end())
+        return;
+
+    m_windows.remove(it);
+
+    // If this was the last full screen window that was visible, notify the UI process.
+    if (m_windows.isEmpty())
+        PluginProcess::shared().setFullscreenWindowIsShowing(false);
+}
+
+static FullscreenWindowTracker& fullscreenWindowTracker()
+{
+    DEFINE_STATIC_LOCAL(FullscreenWindowTracker, fullscreenWindowTracker, ());
+    return fullscreenWindowTracker;
+}
+
 static bool isUserbreakSet = false;
 
 static void initShouldCallRealDebugger()
@@ -78,18 +159,62 @@ static UInt32 getCurrentEventButtonState()
 #endif
 }
     
+static void cocoaWindowShown(NSWindow *window)
+{
+    fullscreenWindowTracker().windowShown(window);
+}
+
+static void cocoaWindowHidden(NSWindow *window)
+{
+    fullscreenWindowTracker().windowHidden(window);
+}
+
+static void carbonWindowShown(WindowRef window)
+{
+#ifndef NP_NO_CARBON
+    fullscreenWindowTracker().windowShown(window);
+#endif
+}
+
+static void carbonWindowHidden(WindowRef window)
+{
+#ifndef NP_NO_CARBON
+    fullscreenWindowTracker().windowHidden(window);
+#endif
+}
+
+static void setModal(bool modalWindowIsShowing)
+{
+    PluginProcess::shared().setModalWindowIsShowing(modalWindowIsShowing);
+}
+
 void PluginProcess::initializeShim()
 {
     const PluginProcessShimCallbacks callbacks = {
         shouldCallRealDebugger,
         isWindowActive,
-        getCurrentEventButtonState
+        getCurrentEventButtonState,
+        cocoaWindowShown,
+        cocoaWindowHidden,
+        carbonWindowShown,
+        carbonWindowHidden,
+        setModal,
     };
 
     PluginProcessShimInitializeFunc initFunc = reinterpret_cast<PluginProcessShimInitializeFunc>(dlsym(RTLD_DEFAULT, "WebKitPluginProcessShimInitialize"));
     initFunc(callbacks);
 }
 
+void PluginProcess::setModalWindowIsShowing(bool modalWindowIsShowing)
+{
+    m_connection->send(Messages::PluginProcessProxy::SetModalWindowIsShowing(modalWindowIsShowing), 0);
+}
+
+void PluginProcess::setFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
+{
+    m_connection->send(Messages::PluginProcessProxy::SetFullscreenWindowIsShowing(fullscreenWindowIsShowing), 0);
+}
+
 void PluginProcess::platformInitialize(const PluginProcessCreationParameters& parameters)
 {
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();