Diff
Modified: trunk/ChangeLog (111838 => 111839)
--- trunk/ChangeLog 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/ChangeLog 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,3 +1,10 @@
+2012-03-23 Ryosuke Niwa <[email protected]>
+
+ REGRESSION(r111754): plugins/reloadplugins-and-pages.html fails on all platforms
+ https://bugs.webkit.org/show_bug.cgi?id=82035
+
+ * Source/autotools/symbols.filter:
+
2012-03-22 Raphael Kubo da Costa <[email protected]>
[CMake] Unreviewed build fix after r111778.
Modified: trunk/LayoutTests/ChangeLog (111838 => 111839)
--- trunk/LayoutTests/ChangeLog 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/LayoutTests/ChangeLog 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,5 +1,13 @@
2012-03-23 Ryosuke Niwa <[email protected]>
+ REGRESSION(r111754): plugins/reloadplugins-and-pages.html fails on all platforms
+ https://bugs.webkit.org/show_bug.cgi?id=82035
+
+ * plugins/netscape-dom-access-and-reload-expected.txt: Removed.
+ * plugins/netscape-dom-access-and-reload.html: Removed.
+
+2012-03-23 Ryosuke Niwa <[email protected]>
+
GTK rebaselines.
* platform/gtk/editing/selection/select-across-readonly-input-5-expected.txt:
Deleted: trunk/LayoutTests/plugins/netscape-dom-access-and-reload-expected.txt (111838 => 111839)
--- trunk/LayoutTests/plugins/netscape-dom-access-and-reload-expected.txt 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/LayoutTests/plugins/netscape-dom-access-and-reload-expected.txt 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,3 +0,0 @@
-This page tests reloading a Netscape plug-in that accesses its own DOM element. See https://bugs.webkit.org/show_bug.cgi?id=80428, "HTMLPluginElement is not destroyed on reload or navigation if getNPObject is called". If it succeeds, you should see SUCCESS below.
-
-SUCCESS
Deleted: trunk/LayoutTests/plugins/netscape-dom-access-and-reload.html (111838 => 111839)
--- trunk/LayoutTests/plugins/netscape-dom-access-and-reload.html 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/LayoutTests/plugins/netscape-dom-access-and-reload.html 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-function runTest()
-{
- // Make the plugin retrieve a DOM element to itself. This exercises
- // https://bugs.webkit.org/show_bug.cgi?id=80428
- document.getElementById("testPlugin").testDOMAccess();
-
- var callReload = true;
- if (window.sessionStorage) {
- if (window.sessionStorage.reloadPluginsAndPagesCalled)
- callReload = false;
- else
- window.sessionStorage.reloadPluginsAndPagesCalled = 1;
- }
-
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- if (callReload) {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
- location.reload();
- } else {
- window.GCController.collect();
- // Note we could also collect the number of live nodes, but that seems
- // more likely to give spurious failures. When an HTMLPluginElement is
- // improperly retained, its owning Document also survives, so we'll
- // detect an excess Document.
- if (internals && internals.numberOfLiveDocuments) {
- var numberOfLiveDocuments = internals.numberOfLiveDocuments();
- if (numberOfLiveDocuments == 1) {
- document.getElementById("result").innerHTML = "SUCCESS";
- }
- } else {
- document.getElementById("result").innerHTML = "FAILED; This test is only valid in DumpRenderTree, and only when the Inspector is enabled.";
- }
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.notifyDone();
- }
- }
-}
-</script>
-</head>
-<body _onload_="runTest();">
-<p>This page tests reloading a Netscape plug-in that accesses its own DOM element. See https://bugs.webkit.org/show_bug.cgi?id=80428, "HTMLPluginElement is not destroyed on reload or navigation if getNPObject is called".
-
-If it succeeds, you should see SUCCESS below.
-<embed id="testPlugin" type="application/x-webkit-test-netscape" width="200" height="200"></embed>
-<div id="result">FAILURE</div>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (111838 => 111839)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,3 +1,23 @@
+2012-03-23 Ryosuke Niwa <[email protected]>
+
+ REGRESSION(r111754): plugins/reloadplugins-and-pages.html fails on all platforms
+ https://bugs.webkit.org/show_bug.cgi?id=82035
+
+ Rollout r111754 since it caused a test to fail and the test added by the patch
+ is failing on Mac WebKit 2.
+
+ * WebCore.exp.in:
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::detach):
+ (WebCore):
+ (WebCore::HTMLPlugInElement::removedFromDocument):
+ * html/HTMLPlugInElement.h:
+ (HTMLPlugInElement):
+ * testing/Internals.cpp:
+ * testing/Internals.h:
+ (Internals):
+ * testing/Internals.idl:
+
2012-03-23 Adam Barth <[email protected]>
Move Notifications APIs from DOMWindow.idl to DOMWindowNotifications.idl (Part 2)
Modified: trunk/Source/WebCore/WebCore.exp.in (111838 => 111839)
--- trunk/Source/WebCore/WebCore.exp.in 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1748,7 +1748,6 @@
#if ENABLE(INSPECTOR)
__ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
-__ZN7WebCore17InspectorCounters12counterValueENS0_11CounterTypeE
__ZN7WebCore19InspectorController14enableProfilerEv
__ZN7WebCore19InspectorController15disableProfilerEv
__ZN7WebCore19InspectorController15profilerEnabledEv
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (111838 => 111839)
--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2012-03-23 09:04:08 UTC (rev 111839)
@@ -78,6 +78,11 @@
m_isCapturingMouseEvents = false;
}
+ HTMLFrameOwnerElement::detach();
+}
+
+void HTMLPlugInElement::removedFromDocument()
+{
#if ENABLE(NETSCAPE_PLUGIN_API)
if (m_NPObject) {
_NPN_ReleaseObject(m_NPObject);
@@ -85,7 +90,7 @@
}
#endif
- HTMLFrameOwnerElement::detach();
+ HTMLFrameOwnerElement::removedFromDocument();
}
PassScriptInstance HTMLPlugInElement::getInstance()
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (111838 => 111839)
--- trunk/Source/WebCore/html/HTMLPlugInElement.h 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h 2012-03-23 09:04:08 UTC (rev 111839)
@@ -57,6 +57,7 @@
HTMLPlugInElement(const QualifiedName& tagName, Document*);
virtual void detach();
+ virtual void removedFromDocument();
virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
virtual void collectStyleForAttribute(Attribute*, StylePropertySet*) OVERRIDE;
Modified: trunk/Source/WebCore/testing/Internals.cpp (111838 => 111839)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-03-23 09:04:08 UTC (rev 111839)
@@ -42,7 +42,6 @@
#include "HTMLNames.h"
#include "HTMLTextAreaElement.h"
#include "InspectorController.h"
-#include "InspectorCounters.h"
#include "InspectorInstrumentation.h"
#include "InternalSettings.h"
#include "IntRect.h"
@@ -771,18 +770,6 @@
return document->frame()->editor()->selectionStartHasMarkerFor(DocumentMarker::Spelling, from, length);
}
-#if ENABLE(INSPECTOR)
-unsigned Internals::numberOfLiveNodes() const
-{
- return InspectorCounters::counterValue(InspectorCounters::NodeCounter);
-}
-
-unsigned Internals::numberOfLiveDocuments() const
-{
- return InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
-}
-#endif // ENABLE(INSPECTOR)
-
bool Internals::hasGrammarMarker(Document* document, int from, int length, ExceptionCode&)
{
if (!document || !document->frame())
Modified: trunk/Source/WebCore/testing/Internals.h (111838 => 111839)
--- trunk/Source/WebCore/testing/Internals.h 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/testing/Internals.h 2012-03-23 09:04:08 UTC (rev 111839)
@@ -146,11 +146,6 @@
void setBatteryStatus(Document*, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode&);
-#if ENABLE(INSPECTOR)
- unsigned numberOfLiveNodes() const;
- unsigned numberOfLiveDocuments() const;
-#endif
-
private:
explicit Internals(Document*);
DocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/Internals.idl (111838 => 111839)
--- trunk/Source/WebCore/testing/Internals.idl 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-03-23 09:04:08 UTC (rev 111839)
@@ -120,10 +120,7 @@
#if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS
void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException);
-#endif
-
- [Conditional=INSPECTOR] unsigned long numberOfLiveNodes();
- [Conditional=INSPECTOR] unsigned long numberOfLiveDocuments();
+#endif
};
}
Modified: trunk/Source/WebKit2/ChangeLog (111838 => 111839)
--- trunk/Source/WebKit2/ChangeLog 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-23 09:04:08 UTC (rev 111839)
@@ -1,3 +1,11 @@
+2012-03-23 Ryosuke Niwa <[email protected]>
+
+ REGRESSION(r111754): plugins/reloadplugins-and-pages.html fails on all platforms
+ https://bugs.webkit.org/show_bug.cgi?id=82035
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-03-22 Anders Carlsson <[email protected]>
Remove the Flash NPRuntime short-circuit hacks
Modified: trunk/Source/WebKit2/win/WebKit2.def (111838 => 111839)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-03-23 09:04:08 UTC (rev 111839)
@@ -115,7 +115,6 @@
??1ThreadCondition@WTF@@QAE@XZ
?broadcast@ThreadCondition@WTF@@QAEXXZ
?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
- ?counterValue@InspectorCounters@WebCore@@SAHW4CounterType@12@@Z
?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z
?createThread@WTF@@YAIP6AXPAX@Z0PBD@Z
?currentThread@WTF@@YAIXZ
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (111838 => 111839)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-23 09:04:08 UTC (rev 111839)
@@ -108,7 +108,6 @@
??1ThreadCondition@WTF@@QAE@XZ
?broadcast@ThreadCondition@WTF@@QAEXXZ
?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
- ?counterValue@InspectorCounters@WebCore@@SAHW4CounterType@12@@Z
?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z
?createThread@WTF@@YAIP6AXPAX@Z0PBD@Z
?currentThread@WTF@@YAIXZ
Modified: trunk/Source/autotools/symbols.filter (111838 => 111839)
--- trunk/Source/autotools/symbols.filter 2012-03-23 08:35:32 UTC (rev 111838)
+++ trunk/Source/autotools/symbols.filter 2012-03-23 09:04:08 UTC (rev 111839)
@@ -59,7 +59,6 @@
_ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_EEEES6_;
_ZN7WebCore16scriptNameToCodeERKN3WTF6StringE;
_ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE;
-_ZN7WebCore17InspectorCounters12counterValueENS0_11CounterTypeE;
_ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE;
_ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii;
_ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE;
