Menu
▾
▴
[HtmlUnit] SVN: [8189] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-03-22 19:32:33
|
Revision: 8189
http://sourceforge.net/p/htmlunit/code/8189
Author: rbri
Date: 2013-03-22 19:32:28 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
revert last change because of too many side effects
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElementTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/changes/changes.xml 2013-03-22 19:32:28 UTC (rev 8189)
@@ -8,9 +8,6 @@
<body>
<release version="2.13" date="???" description="Bugfixes">
- <action type="fix" dev="rbri" issue="1497">
- JavaScript: Removing frame tag removes the associated FrameWindow also.
- </action>
<action type="fix" dev="mguillem">
HtmlPage.getElementById: always return the first element in document order (and not the first parsed one).
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java 2013-03-22 19:32:28 UTC (rev 8189)
@@ -165,10 +165,7 @@
childWindows_.add(child);
}
- /**
- * Destroy our childs.
- */
- protected void destroyChildren() {
+ void destroyChildren() {
if (LOG.isDebugEnabled()) {
LOG.debug("destroyChildren");
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement.java 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement.java 2013-03-22 19:32:28 UTC (rev 8189)
@@ -408,14 +408,4 @@
((BaseFrameElement) node).init();
return node;
}
-
- /**
- * Remove our window also.
- * {@inheritDoc}
- */
- @Override
- protected void basicRemove() {
- super.basicRemove();
- ((FrameWindow) getEnclosedWindow()).close();
- }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2013-03-22 19:32:28 UTC (rev 8189)
@@ -1118,7 +1118,7 @@
/**
* Cuts off all relationships this node has with siblings and parents.
*/
- protected void basicRemove() {
+ private void basicRemove() {
if (parent_ != null && parent_.firstChild_ == this) {
parent_.firstChild_ = nextSibling_;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java 2013-03-22 19:32:28 UTC (rev 8189)
@@ -131,18 +131,4 @@
public String toString() {
return "FrameWindow[name=\"" + getName() + "\"]";
}
-
- /**
- * Closes this frame window.
- */
- public void close() {
- setClosed();
- final Page page = getEnclosedPage();
- if (page != null) {
- page.cleanUp();
- }
- getJobManager().shutdown();
- destroyChildren();
- getWebClient().deregisterWebWindow(this);
- }
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElementTest.java 2013-03-22 06:33:45 UTC (rev 8188)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElementTest.java 2013-03-22 19:32:28 UTC (rev 8189)
@@ -600,6 +600,7 @@
* @throws Exception if the test fails
*/
@Test
+ @NotYetImplemented
public void testRemoveFrameWindow() throws Exception {
final String index = "<html><head></head><body>"
+ "<div id='content'>"
|
