Diff
Modified: branches/safari-536.26-branch/LayoutTests/ChangeLog (127497 => 127498)
--- branches/safari-536.26-branch/LayoutTests/ChangeLog 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/LayoutTests/ChangeLog 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1,3 +1,7 @@
+2012-09-04 Lucas Forschler <[email protected]>
+
+ Rollout r127252.
+
2012-08-31 Brady Eidson <[email protected]>
Rename testRunner to layoutTestController for a test on the branch.
Deleted: branches/safari-536.26-branch/LayoutTests/platform/mac-wk2/plugins/npp-setwindow-called-on-scroll-expected.txt (127497 => 127498)
--- branches/safari-536.26-branch/LayoutTests/platform/mac-wk2/plugins/npp-setwindow-called-on-scroll-expected.txt 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/LayoutTests/platform/mac-wk2/plugins/npp-setwindow-called-on-scroll-expected.txt 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1,15 +0,0 @@
-a div
-
-another div
-Tests that netscape plugins get appropriate calls to NPP_SetWindow when scrolled out of view or back in to view.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS NPP_SetWindow called with expected parameters
-PASS NPP_SetWindow called with expected parameters
-PASS NPP_SetWindow called with expected parameters
-PASS NPP_SetWindow called with expected parameters
-PASS NPP_SetWindow called with expected parameters
-PASS NPP_SetWindow called with expected parameters
-
Modified: branches/safari-536.26-branch/Source/WebKit2/ChangeLog (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1,5 +1,9 @@
2012-09-04 Lucas Forschler <[email protected]>
+ Rollout r127252.
+
+2012-09-04 Lucas Forschler <[email protected]>
+
Rollout r127276.
2012-08-31 Timothy Hatcher <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1918,7 +1918,6 @@
[self _accessibilityRegisterUIProcessTokens];
} else {
- [self _updateWindowVisibility];
_data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
_data->_page->viewStateDidChange(WebPageProxy::ViewWindowIsActive | WebPageProxy::ViewIsInWindow);
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-09-04 20:35:10 UTC (rev 127498)
@@ -508,20 +508,6 @@
m_hasCalledSetWindow = true;
}
-void NetscapePlugin::callSetWindowInvisible()
-{
- NPWindow invisibleWindow = m_npWindow;
-
- invisibleWindow.window = 0;
- invisibleWindow.clipRect.top = 0;
- invisibleWindow.clipRect.left = 0;
- invisibleWindow.clipRect.bottom = 0;
- invisibleWindow.clipRect.right = 0;
-
- NPP_SetWindow(&invisibleWindow);
- m_hasCalledSetWindow = true;
-}
-
bool NetscapePlugin::shouldLoadSrcURL()
{
// Check if we should cancel the load
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-09-04 20:35:10 UTC (rev 127498)
@@ -141,7 +141,6 @@
NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule);
void callSetWindow();
- void callSetWindowInvisible();
bool shouldLoadSrcURL();
NetscapePluginStream* streamFromID(uint64_t streamID);
void stopAllStreams();
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-09-04 20:35:10 UTC (rev 127498)
@@ -912,12 +912,9 @@
}
}
-void NetscapePlugin::windowVisibilityChanged(bool visible)
+void NetscapePlugin::windowVisibilityChanged(bool)
{
- if (visible)
- callSetWindow();
- else
- callSetWindowInvisible();
+ // FIXME: Implement.
}
uint64_t NetscapePlugin::pluginComplexTextInputIdentifier() const
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (127497 => 127498)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-09-04 20:35:10 UTC (rev 127498)
@@ -404,7 +404,7 @@
if (!m_plugin)
return;
- m_plugin->windowVisibilityChanged(windowIsVisible);
+ // FIXME: Implement.
}
void PluginView::setWindowIsFocused(bool windowIsFocused)
@@ -756,13 +756,8 @@
transform.translate(scaledLocationInRootViewCoordinates.x(), scaledLocationInRootViewCoordinates.y());
transform.scale(pageScaleFactor);
- // FIXME: This clip rect isn't correct.
- // But it is still important distinguish between empty and non-empty rects so we can notify the plug-in when it becomes invisible.
- // Making the rect actually correct is covered by https://bugs.webkit.org/show_bug.cgi?id=95362
- IntRect clipRect = clipRectInWindowCoordinates();
- if (!clipRect.isEmpty())
- clipRect = boundsRect();
-
+ // FIXME: The clip rect isn't correct.
+ IntRect clipRect = boundsRect();
m_plugin->geometryDidChange(size(), clipRect, transform);
}
Modified: branches/safari-536.26-branch/Tools/ChangeLog (127497 => 127498)
--- branches/safari-536.26-branch/Tools/ChangeLog 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Tools/ChangeLog 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1,3 +1,7 @@
+2012-09-04 Lucas Forschler <[email protected]>
+
+ Rollout r127252.
+
2012-08-31 Timothy Hatcher <[email protected]>
Merge r127047.
Modified: branches/safari-536.26-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (127497 => 127498)
--- branches/safari-536.26-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2012-09-04 20:35:10 UTC (rev 127498)
@@ -536,7 +536,6 @@
1A5CC1F3137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp */,
1A3E28A91311D73B00501349 /* GetURLWithJavaScriptURLDestroyingPlugin.cpp */,
1AD4CB2012A6D1350027A7AF /* GetUserAgentWithNullNPPFromNPPNew.cpp */,
- 515C0CCF15EE785700F5A613 /* LogNPPSetWindow.cpp */,
1ACF898B132EF41C00E915D4 /* NPDeallocateCalledBeforeNPShutdown.cpp */,
C031182A134E4A2B00919757 /* NPPSetWindowCalledDuringDestruction.cpp */,
1A24BAA8120734EE00FBB059 /* NPRuntimeObjectFromDestroyedPlugin.cpp */,
Deleted: branches/safari-536.26-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/LogNPPSetWindow.cpp (127497 => 127498)
--- branches/safari-536.26-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/LogNPPSetWindow.cpp 2012-09-04 20:34:01 UTC (rev 127497)
+++ branches/safari-536.26-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/LogNPPSetWindow.cpp 2012-09-04 20:35:10 UTC (rev 127498)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "PluginTest.h"
-
-using namespace std;
-
-class LogNPPSetWindow : public PluginTest {
-public:
- LogNPPSetWindow(NPP, const string& identifier);
-
-private:
- virtual NPError NPP_SetWindow(NPWindow*);
-};
-
-LogNPPSetWindow::LogNPPSetWindow(NPP npp, const string& identifier)
- : PluginTest(npp, identifier)
-{
-}
-
-NPError LogNPPSetWindow::NPP_SetWindow(NPWindow* window)
-{
- char message[1024];
- snprintf(message, 1024, "NPP_SetWindow: %s window, Rect {%i, %i, %i, %i}, Clip Rect {%i, %i, %i, %i}, Type %i",
- window->window ? "non-NULL" : "NULL", window->x, window->y, window->width, window->height,
- window->clipRect.left, window->clipRect.top, window->clipRect.right, window->clipRect.bottom,
- window->type);
-
- char script[1536];
- snprintf(script, 1536, "window.setTimeout('windowWasSet(\"%s\");', 0);", message);
-
- executeScript(script);
-
- return NPERR_NO_ERROR;
-}
-
-static PluginTest::Register<LogNPPSetWindow> registrar("log-npp-set-window");
