[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:29:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d80ba6e1ddd8a69788409745df1b1965c0191622
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 6 23:28:11 2002 +0000
WebCore:
Removed some APPLE_CHANGES no longer needed after the part change.
* khtml/khtml_part.cpp:
(KHTMLPart::openedByJS): Don't call impl version.
(KHTMLPart::setOpenedByJS): Don't call impl version.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm: Removed openedByJS and setOpenedByJS.
* kwq/WebCoreBridge.h: Don't prototype setOpenedByScript: and
openedByScript methods now that they are not needed.
WebKit:
Removed some APPLE_CHANGES no longer needed after the part change.
* WebCoreSupport.subproj/WebBridge.m: Remove setOpenedByScript: and
openedByScript methods now that they are not needed.
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m: Remove setOpenedByScript: and
openedByScript methods now that they are not needed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 95d83c5..02ae6e2 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-08-06 Maciej Stachowiak <mjs at apple.com>
+
+ Removed some APPLE_CHANGES no longer needed after the part change.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openedByJS): Don't call impl version.
+ (KHTMLPart::setOpenedByJS): Don't call impl version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed openedByJS and setOpenedByJS.
+ * kwq/WebCoreBridge.h: Don't prototype setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+
2002-08-06 David Hyatt <hyatt at apple.com>
Make checkboxes and radio buttons use the small control
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 95d83c5..02ae6e2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-08-06 Maciej Stachowiak <mjs at apple.com>
+
+ Removed some APPLE_CHANGES no longer needed after the part change.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openedByJS): Don't call impl version.
+ (KHTMLPart::setOpenedByJS): Don't call impl version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed openedByJS and setOpenedByJS.
+ * kwq/WebCoreBridge.h: Don't prototype setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+
2002-08-06 David Hyatt <hyatt at apple.com>
Make checkboxes and radio buttons use the small control
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 95d83c5..02ae6e2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-08-06 Maciej Stachowiak <mjs at apple.com>
+
+ Removed some APPLE_CHANGES no longer needed after the part change.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::openedByJS): Don't call impl version.
+ (KHTMLPart::setOpenedByJS): Don't call impl version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed openedByJS and setOpenedByJS.
+ * kwq/WebCoreBridge.h: Don't prototype setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+
2002-08-06 David Hyatt <hyatt at apple.com>
Make checkboxes and radio buttons use the small control
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 0438856..35341d2 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4621,20 +4621,12 @@ void KHTMLPart::setOpener(KHTMLPart *_opener)
bool KHTMLPart::openedByJS()
{
-#ifdef APPLE_CHANGES
- return impl->openedByJS();
-#else
return d->m_openedByJS;
-#endif
}
void KHTMLPart::setOpenedByJS(bool _openedByJS)
{
-#ifdef APPLE_CHANGES
- impl->setOpenedByJS(_openedByJS);
-#else
d->m_openedByJS = _openedByJS;
-#endif
}
void KHTMLPart::preloadStyleSheet(const QString &url, const QString &stylesheet)
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index a46dfe8..46c7022 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -84,9 +84,6 @@ public:
void submitForm(const char *action, const QString &url, const QByteArray &formData, const QString &_target, const QString& contentType, const QString& boundary);
- bool openedByJS();
- void setOpenedByJS(bool _openedByJS);
-
void scheduleClose();
void unfocusWindow();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2370b0d..ad2a12d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -382,16 +382,6 @@ void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
[bridge setStatusText:status.getNSString()];
}
-bool KWQKHTMLPartImpl::openedByJS()
-{
- return [bridge openedByScript];
-}
-
-void KWQKHTMLPartImpl::setOpenedByJS(bool _openedByJS)
-{
- [bridge setOpenedByScript:_openedByJS];
-}
-
void KWQKHTMLPartImpl::scheduleClose()
{
[[bridge window] performSelector:@selector(close) withObject:nil afterDelay:0.0];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index a46dfe8..46c7022 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -84,9 +84,6 @@ public:
void submitForm(const char *action, const QString &url, const QByteArray &formData, const QString &_target, const QString& contentType, const QString& boundary);
- bool openedByJS();
- void setOpenedByJS(bool _openedByJS);
-
void scheduleClose();
void unfocusWindow();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2370b0d..ad2a12d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -382,16 +382,6 @@ void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
[bridge setStatusText:status.getNSString()];
}
-bool KWQKHTMLPartImpl::openedByJS()
-{
- return [bridge openedByScript];
-}
-
-void KWQKHTMLPartImpl::setOpenedByJS(bool _openedByJS)
-{
- [bridge setOpenedByScript:_openedByJS];
-}
-
void KWQKHTMLPartImpl::scheduleClose()
{
[[bridge window] performSelector:@selector(close) withObject:nil afterDelay:0.0];
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 918b321..012f5db 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -162,9 +162,6 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date;
- (void)reportClientRedirectCancelled;
-- (BOOL)openedByScript;
-- (void)setOpenedByScript:(BOOL)openedByScript;
-
- (void)unfocusWindow;
- (BOOL)modifierTrackingEnabled;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 20212b2..0b49c08 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-06 Maciej Stachowiak <mjs at apple.com>
+
+ Removed some APPLE_CHANGES no longer needed after the part change.
+
+ * WebCoreSupport.subproj/WebBridge.m: Remove setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m: Remove setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+
2002-08-06 Darin Adler <darin at apple.com>
- fixed 3017761 -- dataSource != nil assertion navigating at yahoo.com
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 20212b2..0b49c08 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-08-06 Maciej Stachowiak <mjs at apple.com>
+
+ Removed some APPLE_CHANGES no longer needed after the part change.
+
+ * WebCoreSupport.subproj/WebBridge.m: Remove setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m: Remove setOpenedByScript: and
+ openedByScript methods now that they are not needed.
+
2002-08-06 Darin Adler <darin at apple.com>
- fixed 3017761 -- dataSource != nil assertion navigating at yahoo.com
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index cab535b..68ead39 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -230,18 +230,6 @@
return dataSource;
}
-- (BOOL)openedByScript
-{
- WEBKIT_ASSERT(frame != nil);
- return [[frame controller] _openedByScript];
-}
-
-- (void)setOpenedByScript:(BOOL)openedByScript
-{
- WEBKIT_ASSERT(frame != nil);
- [[frame controller] _setOpenedByScript:openedByScript];
-}
-
- (void)unfocusWindow
{
if ([[self window] isKeyWindow] || [[[self window] attachedSheet] isKeyWindow]) {
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index ae8fd46..139e6a2 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -22,7 +22,6 @@
id<WebLocationChangeHandler> locationChangeHandler;
WebBackForwardList *backForwardList;
float textSizeMultiplier;
- BOOL openedByScript;
BOOL useBackForwardList;
}
@end
@@ -36,7 +35,5 @@
- (void)_didStartLoading: (NSURL *)URL;
- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
-- (BOOL)_openedByScript;
-- (void)_setOpenedByScript:(BOOL)openedByScript;
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path;
@end
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index df6c057..5345028 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -170,16 +170,6 @@
return [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
-- (BOOL)_openedByScript
-{
- return _private->openedByScript;
-}
-
-- (void)_setOpenedByScript:(BOOL)openedByScript
-{
- _private->openedByScript = openedByScript;
-}
-
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path
{
WebDataSource *dataSource = [[WebDataSource alloc] initWithURL:URL];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index ae8fd46..139e6a2 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -22,7 +22,6 @@
id<WebLocationChangeHandler> locationChangeHandler;
WebBackForwardList *backForwardList;
float textSizeMultiplier;
- BOOL openedByScript;
BOOL useBackForwardList;
}
@end
@@ -36,7 +35,5 @@
- (void)_didStartLoading: (NSURL *)URL;
- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
-- (BOOL)_openedByScript;
-- (void)_setOpenedByScript:(BOOL)openedByScript;
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path;
@end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index df6c057..5345028 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -170,16 +170,6 @@
return [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
-- (BOOL)_openedByScript
-{
- return _private->openedByScript;
-}
-
-- (void)_setOpenedByScript:(BOOL)openedByScript
-{
- _private->openedByScript = openedByScript;
-}
-
- (void)_downloadURL:(NSURL *)URL toPath:(NSString *)path
{
WebDataSource *dataSource = [[WebDataSource alloc] initWithURL:URL];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list