[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:15:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ef118386e9d2c67518b96dbc116532314129aa32
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 16 22:33:35 2002 +0000
Reviewed by Darin.
- fixed 3125412 - HOMEPAGE: 2nd load of html in the same div fails.
- fixed 3052113 - HOMEPAGE: "site menu" part of .mac home page editing doesn't work
- fixed 3075392 - HOMEPAGE: "pages" section of mac.com homepage editing is missing
* khtml/html/html_baseimpl.h:
* khtml/html/html_baseimpl.cpp:
(HTMLFrameElementImpl::updateForNewURL): Function that loads new URL,
to be called if src attribute is set explicitly and the element is already
attached.
(HTMLFrameElementImpl::parseAttribute): Call updateForNewURL when src
attrinute is set.
(HTMLFrameElementImpl::contentDocument): Don't involve render widget
in getting the content document.
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::createContextualFragment): Allow contextual
fragments to be created (and therefore innerHTML to be set on) TR
and HTML elements.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3090 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 720edb0..4c1786c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,25 @@
+2002-12-16 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3125412 - HOMEPAGE: 2nd load of html in the same div fails.
+ - fixed 3052113 - HOMEPAGE: "site menu" part of .mac home page editing doesn't work
+ - fixed 3075392 - HOMEPAGE: "pages" section of mac.com homepage editing is missing
+
+ * khtml/html/html_baseimpl.h:
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLFrameElementImpl::updateForNewURL): Function that loads new URL,
+ to be called if src attribute is set explicitly and the element is already
+ attached.
+ (HTMLFrameElementImpl::parseAttribute): Call updateForNewURL when src
+ attrinute is set.
+ (HTMLFrameElementImpl::contentDocument): Don't involve render widget
+ in getting the content document.
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::createContextualFragment): Allow contextual
+ fragments to be created (and therefore innerHTML to be set on) TR
+ and HTML elements.
+
2002-12-16 David Hyatt <hyatt at apple.com>
Use the layer's bounds as the damage rect not the object's.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 720edb0..4c1786c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,25 @@
+2002-12-16 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3125412 - HOMEPAGE: 2nd load of html in the same div fails.
+ - fixed 3052113 - HOMEPAGE: "site menu" part of .mac home page editing doesn't work
+ - fixed 3075392 - HOMEPAGE: "pages" section of mac.com homepage editing is missing
+
+ * khtml/html/html_baseimpl.h:
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLFrameElementImpl::updateForNewURL): Function that loads new URL,
+ to be called if src attribute is set explicitly and the element is already
+ attached.
+ (HTMLFrameElementImpl::parseAttribute): Call updateForNewURL when src
+ attrinute is set.
+ (HTMLFrameElementImpl::contentDocument): Don't involve render widget
+ in getting the content document.
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::createContextualFragment): Allow contextual
+ fragments to be created (and therefore innerHTML to be set on) TR
+ and HTML elements.
+
2002-12-16 David Hyatt <hyatt at apple.com>
Use the layer's bounds as the damage rect not the object's.
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 32189b0..4033aa6 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -227,12 +227,37 @@ NodeImpl::Id HTMLFrameElementImpl::id() const
return ID_FRAME;
}
+void HTMLFrameElementImpl::updateForNewURL()
+{
+ if (attached()) {
+ // ignore display: none for this element!
+ KHTMLView* w = getDocument()->view();
+ // avoid endless recursion
+ KURL u;
+ if (!url.isEmpty()) u = getDocument()->completeURL( url.string() );
+ bool selfreference = false;
+ for (KHTMLPart* part = w->part(); part; part = part->parentPart())
+ if (part->url() == u) {
+ selfreference = true;
+ break;
+ }
+
+ // load the frame contents
+ if ( !url.isEmpty() && !(w->part()->onlyLocalReferences() && u.protocol() != "file")) {
+ KHTMLPart *part = w->part()->findFrame( name.string() );
+ part->openURL(u);
+ }
+ }
+}
+
+
void HTMLFrameElementImpl::parseAttribute(AttributeImpl *attr)
{
switch(attr->id())
{
case ATTR_SRC:
url = khtml::parseURL(attr->val());
+ updateForNewURL();
break;
case ATTR_ID:
case ATTR_NAME:
@@ -363,12 +388,12 @@ void HTMLFrameElementImpl::setFocus(bool received)
DocumentImpl* HTMLFrameElementImpl::contentDocument() const
{
- if ( !m_render ) return 0;
-
- RenderPart* render = static_cast<RenderPart*>( m_render );
+ KHTMLView* w = getDocument()->view();
- if(render->widget() && render->widget()->inherits("KHTMLView"))
- return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl();
+ if (w) {
+ KHTMLPart *part = w->part()->findFrame( name.string() );
+ return part->xmlDocImpl();
+ }
return 0;
}
diff --git a/WebCore/khtml/html/html_baseimpl.h b/WebCore/khtml/html/html_baseimpl.h
index 55b1e0c..a17f041 100644
--- a/WebCore/khtml/html/html_baseimpl.h
+++ b/WebCore/khtml/html/html_baseimpl.h
@@ -112,6 +112,9 @@ protected:
bool frameBorder : 1;
bool frameBorderSet : 1;
bool noresize : 1;
+
+ private:
+ void updateForNewURL();
};
// -------------------------------------------------------------------------
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index ba2c54a..e6fad97 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -301,14 +301,12 @@ DocumentFragmentImpl *HTMLElementImpl::createContextualFragment( const DOMString
case ID_COLGROUP:
case ID_FRAMESET:
case ID_HEAD:
- case ID_HTML:
case ID_STYLE:
case ID_TABLE:
case ID_TBODY:
case ID_TFOOT:
case ID_THEAD:
case ID_TITLE:
- case ID_TR:
return NULL;
default:
break;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list