[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 06:30:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 75107556f41b430525f366f638a75c5af6e872ba
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 9 05:32:09 2002 +0000
Fix to get onLoad to fire, so the iBench test works.
* khtml/khtml_part.cpp:
(KHTMLPart::checkCompleted): Put back some needed code that was
ifdef'd out (the part that emits completed()).
(KHTMLPart::slotChildCompleted): Enabled; ifdef'd out part.
(KHTMLPart::frame): Enabled.
* khtml/khtml_part.h:
* kwq/KWQKHTMLPartImpl.mm:
(KHTMLPart::completed): Hack to get completed signal delivered to
parent.
(KWQKHTMLPartImpl::requestFrame): Initialize m_part
* kwq/WebCoreBridge.h: createChildFrameNamed method now returns
the bridge for the child frame.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a9ed3ef..f2d3d02 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-08-08 Maciej Stachowiak <mjs at apple.com>
+
+ Fix to get onLoad to fire, so the iBench test works.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::checkCompleted): Put back some needed code that was
+ ifdef'd out (the part that emits completed()).
+ (KHTMLPart::slotChildCompleted): Enabled; ifdef'd out part.
+ (KHTMLPart::frame): Enabled.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KHTMLPart::completed): Hack to get completed signal delivered to
+ parent.
+ (KWQKHTMLPartImpl::requestFrame): Initialize m_part
+ * kwq/WebCoreBridge.h: createChildFrameNamed method now returns
+ the bridge for the child frame.
+
2002-08-08 Richard Williamson (Local) <rjw at apple.com>
Move stuff out of core into kit.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a9ed3ef..f2d3d02 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2002-08-08 Maciej Stachowiak <mjs at apple.com>
+
+ Fix to get onLoad to fire, so the iBench test works.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::checkCompleted): Put back some needed code that was
+ ifdef'd out (the part that emits completed()).
+ (KHTMLPart::slotChildCompleted): Enabled; ifdef'd out part.
+ (KHTMLPart::frame): Enabled.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KHTMLPart::completed): Hack to get completed signal delivered to
+ parent.
+ (KWQKHTMLPartImpl::requestFrame): Initialize m_part
+ * kwq/WebCoreBridge.h: createChildFrameNamed method now returns
+ the bridge for the child frame.
+
2002-08-08 Richard Williamson (Local) <rjw at apple.com>
Move stuff out of core into kit.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9ed3ef..f2d3d02 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2002-08-08 Maciej Stachowiak <mjs at apple.com>
+
+ Fix to get onLoad to fire, so the iBench test works.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::checkCompleted): Put back some needed code that was
+ ifdef'd out (the part that emits completed()).
+ (KHTMLPart::slotChildCompleted): Enabled; ifdef'd out part.
+ (KHTMLPart::frame): Enabled.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KHTMLPart::completed): Hack to get completed signal delivered to
+ parent.
+ (KWQKHTMLPartImpl::requestFrame): Initialize m_part
+ * kwq/WebCoreBridge.h: createChildFrameNamed method now returns
+ the bridge for the child frame.
+
2002-08-08 Richard Williamson (Local) <rjw at apple.com>
Move stuff out of core into kit.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 1d30a7d..4b620a8 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1616,7 +1616,6 @@ void KHTMLPart::checkCompleted()
d->m_view->complete();
-#ifndef APPLE_CHANGES
if ( !d->m_redirectURL.isEmpty() )
{
// Do not start redirection for frames here! That action is
@@ -1633,7 +1632,6 @@ void KHTMLPart::checkCompleted()
else
emit completed();
}
-#endif
// find the alternate stylesheets
QStringList sheets;
@@ -3195,6 +3193,8 @@ void KHTMLPart::slotChildStarted( KIO::Job *job )
}
}
+#endif
+
void KHTMLPart::slotChildCompleted()
{
slotChildCompleted( false );
@@ -3202,19 +3202,22 @@ void KHTMLPart::slotChildCompleted()
void KHTMLPart::slotChildCompleted( bool complete )
{
+#ifndef APPLE_CHANGES
khtml::ChildFrame *child = frame( sender() );
assert( child );
child->m_bCompleted = true;
child->m_args = KParts::URLArgs();
-
+#endif
if ( parentPart() == 0 )
d->m_bPendingChildRedirection = (d->m_bPendingChildRedirection || complete);
checkCompleted();
}
+#ifndef APPLE_CHANGES
+
void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
{
khtml::ChildFrame *child = frame( sender()->parent() );
@@ -3273,6 +3276,8 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
}
}
+#endif // APPLE_CHANGES
+
khtml::ChildFrame *KHTMLPart::frame( const QObject *obj )
{
assert( obj->inherits( "KParts::ReadOnlyPart" ) );
@@ -3287,8 +3292,6 @@ khtml::ChildFrame *KHTMLPart::frame( const QObject *obj )
return 0L;
}
-#endif // APPLE_CHANGES
-
KHTMLPart *KHTMLPart::findFrame( const QString &f )
{
#ifdef APPLE_CHANGES
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 66a2f77..961eb79 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -740,6 +740,11 @@ signals:
*/
void nodeActivated(const DOM::Node &);
+#ifdef APPLE_CHANGES
+ void completed();
+ void completed(bool);
+#endif
+
protected:
/**
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3587805..931816e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -68,6 +68,24 @@ static void redirectionTimerMonitor(void *context)
impl->redirectionTimerStartedOrStopped();
}
+void KHTMLPart::completed()
+{
+ if (parentPart() != 0) {
+ KWQ_ASSERT (parentPart()->frame(this) != NULL);
+ parentPart()->frame(this)->m_bCompleted = true;
+ parentPart()->slotChildCompleted();
+ }
+}
+
+void KHTMLPart::completed(bool arg)
+{
+ if (parentPart() != 0) {
+ KWQ_ASSERT (parentPart()->frame(this) != NULL);
+ parentPart()->frame(this)->m_bCompleted = true;
+ parentPart()->slotChildCompleted(arg);
+ }
+}
+
KWQKHTMLPartImpl::KWQKHTMLPartImpl(KHTMLPart *p)
: part(p), d(part->d)
{
@@ -187,9 +205,11 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "name %s\n", frameName.ascii());
HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(frame->element());
- if (![bridge createChildFrameNamed:frameName.getNSString() withURL:childURL
- renderPart:frame allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
- marginWidth:o->getMarginWidth() marginHeight:o->getMarginHeight()]) {
+ WebCoreBridge *childBridge = [bridge createChildFrameNamed:frameName.getNSString() withURL:childURL
+ renderPart:frame allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
+ marginWidth:o->getMarginWidth() marginHeight:o->getMarginHeight()];
+
+ if (!childBridge) {
return false;
}
@@ -198,6 +218,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
childFrame.m_type = isIFrame ? khtml::ChildFrame::IFrame : khtml::ChildFrame::Frame;
childFrame.m_frame = frame;
childFrame.m_params = params;
+ childFrame.m_part = [childBridge part];
d->m_frames.append(childFrame);
#ifdef _SUPPORT_JAVASCRIPT_URL_
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 3587805..931816e 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -68,6 +68,24 @@ static void redirectionTimerMonitor(void *context)
impl->redirectionTimerStartedOrStopped();
}
+void KHTMLPart::completed()
+{
+ if (parentPart() != 0) {
+ KWQ_ASSERT (parentPart()->frame(this) != NULL);
+ parentPart()->frame(this)->m_bCompleted = true;
+ parentPart()->slotChildCompleted();
+ }
+}
+
+void KHTMLPart::completed(bool arg)
+{
+ if (parentPart() != 0) {
+ KWQ_ASSERT (parentPart()->frame(this) != NULL);
+ parentPart()->frame(this)->m_bCompleted = true;
+ parentPart()->slotChildCompleted(arg);
+ }
+}
+
KWQKHTMLPartImpl::KWQKHTMLPartImpl(KHTMLPart *p)
: part(p), d(part->d)
{
@@ -187,9 +205,11 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "name %s\n", frameName.ascii());
HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(frame->element());
- if (![bridge createChildFrameNamed:frameName.getNSString() withURL:childURL
- renderPart:frame allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
- marginWidth:o->getMarginWidth() marginHeight:o->getMarginHeight()]) {
+ WebCoreBridge *childBridge = [bridge createChildFrameNamed:frameName.getNSString() withURL:childURL
+ renderPart:frame allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
+ marginWidth:o->getMarginWidth() marginHeight:o->getMarginHeight()];
+
+ if (!childBridge) {
return false;
}
@@ -198,6 +218,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
childFrame.m_type = isIFrame ? khtml::ChildFrame::IFrame : khtml::ChildFrame::Frame;
childFrame.m_frame = frame;
childFrame.m_params = params;
+ childFrame.m_part = [childBridge part];
d->m_frames.append(childFrame);
#ifdef _SUPPORT_JAVASCRIPT_URL_
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 5423adc..9abcbfb 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -145,7 +145,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)setIconURL:(NSURL *)URL;
- (void)setIconURL:(NSURL *)URL withType:(NSString *)string;
-- (BOOL)createChildFrameNamed:(NSString *)frameName
+- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName
withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)renderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list