[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:26:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1f86d7a145d04c8f71f3c930acee1986f2ebc317
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 22 08:32:07 2002 +0000
WebCore:
Removed provisional/committed distinction from WebCore and the
WebCore SPI. WebCore will never see a provisional data source or
provisional anything, any more.
* kwq/KWQScrollView.mm: Remove mention of provisional widget from comment.
* kwq/WebCoreFrameBridge.h: Remove commitedBridge method, and remove comment
about provisionality from bridge method.
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::write): Remove bogus comment about provisional/committed
transition.
(KWQKHTMLPartImpl::findFrame): Call bridge, not committedBridge.
(KWQKHTMLPartImpl::frames): Likewise.
WebKit:
Removed provisional/committed distinction from WebCore and the
WebCore SPI. WebCore will never see a provisional data source or
provisional anything, any more.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge descendantFrameNamed:]): Don't bother with the provisional
bridge - no such thing.
(-[WebBridge setDataSource:]): Assert the data source is committed.
* WebCoreSupport.subproj/WebFrameBridge.m:
(-[WebFrameBridge bridge]): Return committed bridge always, and remove
committed bridge method.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1624 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index db1a945..9542515 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-07-21 Maciej Stachowiak <mjs at apple.com>
+
+ Removed provisional/committed distinction from WebCore and the
+ WebCore SPI. WebCore will never see a provisional data source or
+ provisional anything, any more.
+
+ * kwq/KWQScrollView.mm: Remove mention of provisional widget from comment.
+ * kwq/WebCoreFrameBridge.h: Remove commitedBridge method, and remove comment
+ about provisionality from bridge method.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::write): Remove bogus comment about provisional/committed
+ transition.
+ (KWQKHTMLPartImpl::findFrame): Call bridge, not committedBridge.
+ (KWQKHTMLPartImpl::frames): Likewise.
+
2002-07-21 Darin Adler <darin at apple.com>
* khtml/*: Roll KDE 3.0.2 changes in. Also switch to not using APPLE_CHANGES
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index db1a945..9542515 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-07-21 Maciej Stachowiak <mjs at apple.com>
+
+ Removed provisional/committed distinction from WebCore and the
+ WebCore SPI. WebCore will never see a provisional data source or
+ provisional anything, any more.
+
+ * kwq/KWQScrollView.mm: Remove mention of provisional widget from comment.
+ * kwq/WebCoreFrameBridge.h: Remove commitedBridge method, and remove comment
+ about provisionality from bridge method.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::write): Remove bogus comment about provisional/committed
+ transition.
+ (KWQKHTMLPartImpl::findFrame): Call bridge, not committedBridge.
+ (KWQKHTMLPartImpl::frames): Likewise.
+
2002-07-21 Darin Adler <darin at apple.com>
* khtml/*: Roll KDE 3.0.2 changes in. Also switch to not using APPLE_CHANGES
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index db1a945..9542515 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-07-21 Maciej Stachowiak <mjs at apple.com>
+
+ Removed provisional/committed distinction from WebCore and the
+ WebCore SPI. WebCore will never see a provisional data source or
+ provisional anything, any more.
+
+ * kwq/KWQScrollView.mm: Remove mention of provisional widget from comment.
+ * kwq/WebCoreFrameBridge.h: Remove commitedBridge method, and remove comment
+ about provisionality from bridge method.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::write): Remove bogus comment about provisional/committed
+ transition.
+ (KWQKHTMLPartImpl::findFrame): Call bridge, not committedBridge.
+ (KWQKHTMLPartImpl::frames): Likewise.
+
2002-07-21 Darin Adler <darin at apple.com>
* khtml/*: Roll KDE 3.0.2 changes in. Also switch to not using APPLE_CHANGES
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 07ccda0..8e0758a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -284,8 +284,6 @@ void KWQKHTMLPartImpl::write( const char *str, int len )
m_decodingStarted = true;
- // Transition from provisional to committed data source at this point.
-
#if FIGURE_OUT_WHAT_APPLY_CHANGES_DOES
d->m_doc->applyChanges();
#endif
@@ -585,7 +583,7 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge frameNamed:frameName.getNSString()] committedBridge] part];
+ return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
@@ -594,7 +592,7 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
WebCoreFrameBridge *childFrame;
while ((childFrame = [e nextObject])) {
- KHTMLPart *childPart = [[childFrame committedBridge] part];
+ KHTMLPart *childPart = [[childFrame bridge] part];
if (childPart)
parts.append(childPart);
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 07ccda0..8e0758a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -284,8 +284,6 @@ void KWQKHTMLPartImpl::write( const char *str, int len )
m_decodingStarted = true;
- // Transition from provisional to committed data source at this point.
-
#if FIGURE_OUT_WHAT_APPLY_CHANGES_DOES
d->m_doc->applyChanges();
#endif
@@ -585,7 +583,7 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge frameNamed:frameName.getNSString()] committedBridge] part];
+ return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
@@ -594,7 +592,7 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
WebCoreFrameBridge *childFrame;
while ((childFrame = [e nextObject])) {
- KHTMLPart *childPart = [[childFrame committedBridge] part];
+ KHTMLPart *childPart = [[childFrame bridge] part];
if (childPart)
parts.append(childPart);
}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 6421ba8..85bcbdc 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -34,10 +34,10 @@
It does provide an implementation that khtml will use to interact with
WebKit's WebView documentView and our NSScrollView subclass.
- QScrollView's view is a NSScrollView (or subclass of NSScrollView) in most
- cases (except for provisional widgets). That scrollview is a subview of an
- WebCoreFrameView. The WebCoreFrameView's documentView will also be the scroll view's
- documentView.
+ QScrollView's view is a NSScrollView (or subclass of NSScrollView)
+ in most cases. That scrollview is a subview of an
+ WebCoreFrameView. The WebCoreFrameView's documentView will also be
+ the scroll view's documentView.
The WebCoreFrameView's size is the frame size. The WebCoreFrameView's documentView
corresponds to the frame content size. The scrollview itself is autosized to the
diff --git a/WebCore/kwq/WebCoreFrameBridge.h b/WebCore/kwq/WebCoreFrameBridge.h
index 807acd9..955290b 100644
--- a/WebCore/kwq/WebCoreFrameBridge.h
+++ b/WebCore/kwq/WebCoreFrameBridge.h
@@ -48,8 +48,7 @@
- (void)loadURL:(NSURL *)URL;
- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
-- (WebCoreBridge *)bridge; // returns provisional bridge if present (avoid calling this for that reason)
-- (WebCoreBridge *)committedBridge; // always returns committed bridge, not provisional (avoid calling this for that reason)
+- (WebCoreBridge *)bridge;
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bf03da1..fe436dd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
2002-07-21 Maciej Stachowiak <mjs at apple.com>
+ Removed provisional/committed distinction from WebCore and the
+ WebCore SPI. WebCore will never see a provisional data source or
+ provisional anything, any more.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge descendantFrameNamed:]): Don't bother with the provisional
+ bridge - no such thing.
+ (-[WebBridge setDataSource:]): Assert the data source is committed.
+ * WebCoreSupport.subproj/WebFrameBridge.m:
+ (-[WebFrameBridge bridge]): Return committed bridge always, and remove
+ committed bridge method.
+
+2002-07-21 Maciej Stachowiak <mjs at apple.com>
+
Fix a regression in my recent refactoring that broke JavaScript
window opening, by doing some trickery to make a frame's initial
dummy data source committed.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bf03da1..fe436dd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-07-21 Maciej Stachowiak <mjs at apple.com>
+ Removed provisional/committed distinction from WebCore and the
+ WebCore SPI. WebCore will never see a provisional data source or
+ provisional anything, any more.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge descendantFrameNamed:]): Don't bother with the provisional
+ bridge - no such thing.
+ (-[WebBridge setDataSource:]): Assert the data source is committed.
+ * WebCoreSupport.subproj/WebFrameBridge.m:
+ (-[WebFrameBridge bridge]): Return committed bridge always, and remove
+ committed bridge method.
+
+2002-07-21 Maciej Stachowiak <mjs at apple.com>
+
Fix a regression in my recent refactoring that broke JavaScript
window opening, by doing some trickery to make a frame's initial
dummy data source committed.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index be3e347..342f5ac 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -66,10 +66,6 @@
- (WebCoreFrameBridge *)descendantFrameNamed:(NSString *)name
{
- WebCoreFrameBridge *provisionalBridge = [[[[[self dataSource] webFrame] provisionalDataSource] frameNamed:name] _frameBridge];
- if (provisionalBridge) {
- return provisionalBridge;
- }
return [[[[self dataSource] webFrame] frameNamed:name] _frameBridge];
}
@@ -191,7 +187,7 @@
- (void)setDataSource: (WebDataSource *)ds
{
WEBKIT_ASSERT(ds != nil);
- // WEBKIT_ASSERT([ds _isCommitted]);
+ WEBKIT_ASSERT([ds _isCommitted]);
if (dataSource == nil) {
// FIXME: non-retained because data source owns representation owns bridge
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
index ebbebdd..e6816ae 100644
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
@@ -42,15 +42,6 @@
- (WebCoreBridge *)bridge
{
- WebCoreBridge *bridge = [[frame provisionalDataSource] _bridge];
- if (bridge) {
- return bridge;
- }
- return [[frame dataSource] _bridge];
-}
-
-- (WebCoreBridge *)committedBridge
-{
return [[frame dataSource] _bridge];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list