[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:20:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6785c938d462f879674aa87cb7a13a32c0243a0a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 17 20:23:40 2002 +0000
Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
view. This was a regression that would impact all DHTML.
* khtml/khtmlview.cpp:
(KHTMLView::timerEvent):
* kwq/KWQScrollView.mm:
(QScrollView::updateContents):
* kwq/KWQWidget.mm:
(QWidget::QWidget):
(QWidget::endEditing):
* kwq/qt/qwidget.h:
Added explicit complete check for resources, rather
than depend on bytesSoFar == totalToLoad.
* WebCoreSupport.subproj/IFResourceURLHandleClient.m:
(-[IFResourceURLHandleClient receivedProgressWithHandle:complete:]):
(-[IFResourceURLHandleClient IFURLHandleResourceDidBeginLoading:]):
(-[IFResourceURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
(-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
(-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
* WebView.subproj/IFWebControllerPrivate.h:
* WebView.subproj/IFWebControllerPrivate.mm:
(-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1391 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c149c20..4579ef0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-06-17 Richard Williamson <rjw at apple.com>
+
+ Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
+ view. This was a regression that would impact all DHTML.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::timerEvent):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::QWidget):
+ (QWidget::endEditing):
+ * kwq/qt/qwidget.h:
+
2002-06-17 Darin Adler <darin at apple.com>
Fixed bug where some images would get left behind when scrolling. Turned out it
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c149c20..4579ef0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-06-17 Richard Williamson <rjw at apple.com>
+
+ Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
+ view. This was a regression that would impact all DHTML.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::timerEvent):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::QWidget):
+ (QWidget::endEditing):
+ * kwq/qt/qwidget.h:
+
2002-06-17 Darin Adler <darin at apple.com>
Fixed bug where some images would get left behind when scrolling. Turned out it
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c149c20..4579ef0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-06-17 Richard Williamson <rjw at apple.com>
+
+ Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
+ view. This was a regression that would impact all DHTML.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::timerEvent):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::updateContents):
+ * kwq/KWQWidget.mm:
+ (QWidget::QWidget):
+ (QWidget::endEditing):
+ * kwq/qt/qwidget.h:
+
2002-06-17 Darin Adler <darin at apple.com>
Fixed bug where some images would get left behind when scrolling. Turned out it
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 229ba6c..81598ad 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1491,11 +1491,7 @@ void KHTMLView::timerEvent ( QTimerEvent *e )
// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl;
killTimer(d->repaintTimerId);
-#ifdef APPLE_CHANGES
- _displayRect (d->updateRect);
-#else
updateContents( d->updateRect );
-#endif
d->repaintTimerId = 0;
}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 12e3177..9cf3ea2 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -242,7 +242,12 @@ void QScrollView::resizeContents(int w, int h)
void QScrollView::updateContents(int x, int y, int w, int h)
{
- KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
+ NSView *view = getView();
+
+ if ([view _IF_isScrollView])
+ view = [view _IF_getDocumentView];
+
+ [view displayRect: NSMakeRect (x, y, w, h)];
}
void QScrollView::updateContents(const QRect &rect)
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index ed5130f..21a2e3c 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -132,8 +132,6 @@ public:
void setAcceptDrops(bool) { }
virtual void paint(void *);
-
- void _displayRect(QRect rect);
NSView *getView() const;
void setView(NSView *aView);
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index eb0dc51..ef37679 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -47,7 +47,6 @@ public:
QCursor cursor;
QPalette pal;
NSView *view;
- int lockCount;
};
QWidget::QWidget(QWidget *parent, const char *name, int f)
@@ -55,7 +54,6 @@ QWidget::QWidget(QWidget *parent, const char *name, int f)
static QStyle defaultStyle;
data = new QWidgetPrivate;
- data->lockCount = 0;
data->view = [[KWQView alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this];
data->style = &defaultStyle;
}
@@ -380,8 +378,3 @@ void QWidget::endEditing()
if ([firstResponder isKindOfClass: [NSText class]])
[window makeFirstResponder: nil];
}
-
-void QWidget::_displayRect(QRect rect)
-{
- [getView() displayRect: NSMakeRect (rect.x(), rect.y(), rect.width(), rect.height())];
-}
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index ed5130f..21a2e3c 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -132,8 +132,6 @@ public:
void setAcceptDrops(bool) { }
virtual void paint(void *);
-
- void _displayRect(QRect rect);
NSView *getView() const;
void setView(NSView *aView);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0ccacef..ba96fdb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-06-17 Richard Williamson <rjw at apple.com>
+
+ Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong view.
+ This was a regression that would impact all DHTML.
+
+ Added explicit complete check for resources, rather
+ than depend on bytesSoFar == totalToLoad.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient receivedProgressWithHandle:complete:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidBeginLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ * WebView.subproj/IFWebControllerPrivate.h:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+
2002-06-17 Chris Blumenberg <cblu at apple.com>
Fix for 2939881. No more overwritting of one's files.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0ccacef..ba96fdb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-06-17 Richard Williamson <rjw at apple.com>
+
+ Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong view.
+ This was a regression that would impact all DHTML.
+
+ Added explicit complete check for resources, rather
+ than depend on bytesSoFar == totalToLoad.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (-[IFResourceURLHandleClient receivedProgressWithHandle:complete:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidBeginLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+ (-[IFResourceURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ * WebView.subproj/IFWebControllerPrivate.h:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+
2002-06-17 Chris Blumenberg <cblu at apple.com>
Fix for 2939881. No more overwritting of one's files.
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
index 8b3898e..a84f6d6 100644
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
@@ -74,10 +74,10 @@
}
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle
+- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete: (BOOL)isComplete
{
[[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
}
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
@@ -86,14 +86,14 @@
currentURL = [[handle url] retain];
[[dataSource controller] _didStartLoading:[handle url]];
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
}
- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
[loader addData:data];
}
@@ -112,7 +112,7 @@
[loader cancel];
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
[currentURL release];
@@ -135,7 +135,7 @@
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
}
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 8b3898e..a84f6d6 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -74,10 +74,10 @@
}
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle
+- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete: (BOOL)isComplete
{
[[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
}
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
@@ -86,14 +86,14 @@
currentURL = [[handle url] retain];
[[dataSource controller] _didStartLoading:[handle url]];
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
}
- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
[loader addData:data];
}
@@ -112,7 +112,7 @@
[loader cancel];
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
[currentURL release];
@@ -135,7 +135,7 @@
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
}
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 8b3898e..a84f6d6 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -74,10 +74,10 @@
}
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle
+- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete: (BOOL)isComplete
{
[[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
}
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
@@ -86,14 +86,14 @@
currentURL = [[handle url] retain];
[[dataSource controller] _didStartLoading:[handle url]];
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
}
- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: NO];
[loader addData:data];
}
@@ -112,7 +112,7 @@
[loader cancel];
[[dataSource controller] _receivedProgress:[IFLoadProgress progress]
- forResourceHandle:handle fromDataSource:dataSource];
+ forResourceHandle:handle fromDataSource:dataSource complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
[currentURL release];
@@ -135,7 +135,7 @@
partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
}
- [self receivedProgressWithHandle:handle];
+ [self receivedProgressWithHandle:handle complete: YES];
[[dataSource controller] _didStopLoading:[handle url]];
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.h b/WebKit/WebView.subproj/IFWebControllerPrivate.h
index 9f1465f..bc7cf25 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.h
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.h
@@ -18,7 +18,7 @@
@end
@interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 87d7fb5..69938d4 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -63,7 +63,7 @@
@implementation IFWebController (IFPrivate)
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
{
IFWebFrame *frame = [dataSource webFrame];
@@ -84,7 +84,7 @@
[[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
// This resouce has completed, so check if the load is complete for all frames.
- if (progress->bytesSoFar == progress->totalToLoad){
+ if (isComplete){
if (frame != nil){
[frame _transitionProvisionalToLayoutAcceptable];
[frame _checkLoadComplete];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 9f1465f..bc7cf25 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -18,7 +18,7 @@
@end
@interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 87d7fb5..69938d4 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -63,7 +63,7 @@
@implementation IFWebController (IFPrivate)
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
{
IFWebFrame *frame = [dataSource webFrame];
@@ -84,7 +84,7 @@
[[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
// This resouce has completed, so check if the load is complete for all frames.
- if (progress->bytesSoFar == progress->totalToLoad){
+ if (isComplete){
if (frame != nil){
[frame _transitionProvisionalToLayoutAcceptable];
[frame _checkLoadComplete];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 9f1465f..bc7cf25 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -18,7 +18,7 @@
@end
@interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 87d7fb5..69938d4 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -63,7 +63,7 @@
@implementation IFWebController (IFPrivate)
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
{
IFWebFrame *frame = [dataSource webFrame];
@@ -84,7 +84,7 @@
[[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
// This resouce has completed, so check if the load is complete for all frames.
- if (progress->bytesSoFar == progress->totalToLoad){
+ if (isComplete){
if (frame != nil){
[frame _transitionProvisionalToLayoutAcceptable];
[frame _checkLoadComplete];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list