[webkit-changes] cvs commit: WebCore/khtml/html html_objectimpl.cpp
Vicki
vicki at opensource.apple.com
Mon Oct 24 12:36:38 PDT 2005
vicki 05/10/24 12:36:37
Modified: . ChangeLog
khtml/html html_objectimpl.cpp
Log:
Changes by Mitz Pettel, reviewed by Maciej.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5306 (KHTMLPart::requestObject
doesn't destroy old plugin content)
* khtml/html/html_objectimpl.cpp:
(DOM::HTMLObjectElementImpl::recalcStyle):
Revision Changes Path
1.271 +10 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- ChangeLog 24 Oct 2005 18:58:48 -0000 1.270
+++ ChangeLog 24 Oct 2005 19:36:30 -0000 1.271
@@ -1,5 +1,15 @@
2005-10-24 Vicki Murley <vicki at apple.com>
+ Changes by Mitz Pettel, reviewed by Maciej.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5306 (KHTMLPart::requestObject
+ doesn't destroy old plugin content)
+
+ * khtml/html/html_objectimpl.cpp:
+ (DOM::HTMLObjectElementImpl::recalcStyle):
+
+2005-10-24 Vicki Murley <vicki at apple.com>
+
Changes by Alexey Proskuryakov, reviewed by Maciej.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5140 (CachedObject loading
1.83 +2 -5 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- html_objectimpl.cpp 16 Oct 2005 03:36:05 -0000 1.82
+++ html_objectimpl.cpp 24 Oct 2005 19:36:36 -0000 1.83
@@ -802,11 +802,8 @@
void HTMLObjectElementImpl::recalcStyle(StyleChange ch)
{
if (!m_useFallbackContent && needWidgetUpdate && m_render && !isImageType()) {
- // Set needWidgetUpdate to false before calling updateWidget because updateWidget may cause
- // this method or attach (which also calls updateWidget) to be called.
- needWidgetUpdate = false;
- static_cast<RenderPartObject*>(m_render)->updateWidget();
- dispatchHTMLEvent(loadEvent,false,false);
+ detach();
+ attach();
}
HTMLElementImpl::recalcStyle(ch);
}
More information about the webkit-changes
mailing list