[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:54:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ba812dc922794570576c2a3861d1a3bf5fe0da15
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 24 22:34:58 2002 +0000
WebCore:
Removed didAddSubview calls because that can easily be done in WebKit. Duh!
* khtml/rendering/render_frames.cpp:
(RenderPart::setWidget):
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
* kwq/KWQKJavaAppletWidget.mm:
(KJavaAppletWidget::showApplet):
* kwq/WebCoreBridge.h:
WebKit:
Some clean-up and bug fixes for new plug-in support.
* Plugins.subproj/WebPluginController.m:
(-[WebPluginController initWithWebFrame:]): need a colon after windowWillClose
(-[WebPluginController addPluginView:]): added logging
(-[WebPluginController didAddPluginView:]): added logging
(-[WebPluginController startAllPlugins]): added logging
(-[WebPluginController stopAllPlugins]): added logging
(-[WebPluginController destroyAllPlugins]): added logging
* Plugins.subproj/WebPluginPackage.m:
(-[WebPluginPackage getMIMEInformation]): use correct dict key for getting MIME descriptions
* WebCoreSupport.subproj/WebBridge.m: no more didAddSubview
* WebView.subproj/WebFramePrivate.h: no more didAddSubview
* WebView.subproj/WebFramePrivate.m: no more didAddSubview
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView addSubview:]): call didAddPluginView on WebPluginController
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2459 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ccb3a8f..f6d826f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-24 Chris Blumenberg <cblu at apple.com>
+
+ Removed didAddSubview calls because that can easily be done in WebKit. Duh!
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderPart::setWidget):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet):
+ * kwq/WebCoreBridge.h:
+
2002-10-24 Darin Adler <darin at apple.com>
A step in the direction of making KWQ headers much nicer.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ccb3a8f..f6d826f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-10-24 Chris Blumenberg <cblu at apple.com>
+
+ Removed didAddSubview calls because that can easily be done in WebKit. Duh!
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderPart::setWidget):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet):
+ * kwq/WebCoreBridge.h:
+
2002-10-24 Darin Adler <darin at apple.com>
A step in the direction of making KWQ headers much nicer.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ccb3a8f..f6d826f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-10-24 Chris Blumenberg <cblu at apple.com>
+
+ Removed didAddSubview calls because that can easily be done in WebKit. Duh!
+
+ * khtml/rendering/render_frames.cpp:
+ (RenderPart::setWidget):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet):
+ * kwq/WebCoreBridge.h:
+
2002-10-24 Darin Adler <darin at apple.com>
A step in the direction of making KWQ headers much nicer.
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index bb93202..19f0db4 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -575,11 +575,6 @@ void RenderPart::setWidget( QWidget *widget )
// make sure the scrollbars are set correctly for restore
// ### find better fix
slotViewCleared();
-#ifdef APPLE_CHANGES
- if(widget){
- static_cast<KHTMLView *>(m_view)->part()->impl->didAddWidget(widget);
- }
-#endif
}
bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KURL& , const QString& )
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index e33a827..2d7c01d 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -136,8 +136,6 @@ public:
int selectionEndOffset() const;
DOM::NodeImpl *selectionStart() const;
DOM::NodeImpl *selectionEnd() const;
-
- void didAddWidget(QWidget *);
private:
void setPolicyBaseURL(const DOM::DOMString &);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 53075d6..78c7fcf 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -496,7 +496,3 @@ QString KWQKHTMLPartImpl::referrer() const
return d->m_referrer;
}
-void KWQKHTMLPartImpl::didAddWidget(QWidget *widget)
-{
- [_bridge didAddSubview:widget->getView()];
-}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index e33a827..2d7c01d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -136,8 +136,6 @@ public:
int selectionEndOffset() const;
DOM::NodeImpl *selectionStart() const;
DOM::NodeImpl *selectionEnd() const;
-
- void didAddWidget(QWidget *);
private:
void setPolicyBaseURL(const DOM::DOMString &);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 53075d6..78c7fcf 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -496,7 +496,3 @@ QString KWQKHTMLPartImpl::referrer() const
return d->m_referrer;
}
-void KWQKHTMLPartImpl::didAddWidget(QWidget *widget)
-{
- [_bridge didAddSubview:widget->getView()];
-}
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 74e85ee..5244b5e 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -72,5 +72,4 @@ void KJavaAppletWidget::showApplet()
viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
attributes:m_parameters
baseURL:m_baseURL]);
-
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index cf31bd4..aea843e 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -230,8 +230,6 @@ enum FrameBorderStyle {
- (NSView *)viewForPluginWithURL:(NSURL *)URL attributes:(NSArray *)attributesArray baseURL:(NSURL *)baseURL MIMEType:(NSString *)MIMEType;
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame attributes:(NSDictionary *)attributes baseURL:(NSURL *)baseURL;
-- (void)didAddSubview:(NSView *)view;
-
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4f9ea9e..9b522e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2002-10-24 Chris Blumenberg <cblu at apple.com>
+
+ Some clean-up and bug fixes for new plug-in support.
+
+ * Plugins.subproj/WebPluginController.m:
+ (-[WebPluginController initWithWebFrame:]): need a colon after windowWillClose
+ (-[WebPluginController addPluginView:]): added logging
+ (-[WebPluginController didAddPluginView:]): added logging
+ (-[WebPluginController startAllPlugins]): added logging
+ (-[WebPluginController stopAllPlugins]): added logging
+ (-[WebPluginController destroyAllPlugins]): added logging
+ * Plugins.subproj/WebPluginPackage.m:
+ (-[WebPluginPackage getMIMEInformation]): use correct dict key for getting MIME descriptions
+ * WebCoreSupport.subproj/WebBridge.m: no more didAddSubview
+ * WebView.subproj/WebFramePrivate.h: no more didAddSubview
+ * WebView.subproj/WebFramePrivate.m: no more didAddSubview
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addSubview:]): call didAddPluginView on WebPluginController
+
2002-10-24 John Sullivan <sullivan at apple.com>
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4f9ea9e..9b522e9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-10-24 Chris Blumenberg <cblu at apple.com>
+
+ Some clean-up and bug fixes for new plug-in support.
+
+ * Plugins.subproj/WebPluginController.m:
+ (-[WebPluginController initWithWebFrame:]): need a colon after windowWillClose
+ (-[WebPluginController addPluginView:]): added logging
+ (-[WebPluginController didAddPluginView:]): added logging
+ (-[WebPluginController startAllPlugins]): added logging
+ (-[WebPluginController stopAllPlugins]): added logging
+ (-[WebPluginController destroyAllPlugins]): added logging
+ * Plugins.subproj/WebPluginPackage.m:
+ (-[WebPluginPackage getMIMEInformation]): use correct dict key for getting MIME descriptions
+ * WebCoreSupport.subproj/WebBridge.m: no more didAddSubview
+ * WebView.subproj/WebFramePrivate.h: no more didAddSubview
+ * WebView.subproj/WebFramePrivate.m: no more didAddSubview
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addSubview:]): call didAddPluginView on WebPluginController
+
2002-10-24 John Sullivan <sullivan at apple.com>
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 50b3371..9db06c2 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -9,6 +9,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebKitLogging.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginController.h>
#import <WebKit/WebWindowOperationsDelegate.h>
@@ -29,7 +30,7 @@
views = [[NSMutableArray array] retain];
[[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(windowWillClose)
+ selector:@selector(windowWillClose:)
name:NSWindowWillCloseNotification
object:nil];
@@ -47,27 +48,37 @@
- (void)addPluginView:(NSView <WebPlugin> *)view
{
+ LOG(Plugins, "addPluginView: %s: pluginInitialize", [[view className] lossyCString]);
+
[views addObject:view];
[view pluginInitialize];
}
- (void)didAddPluginView:(NSView <WebPlugin> *)view
{
+ LOG(Plugins, "didAddPluginView: %s: pluginStart", [[view className] lossyCString]);
+
[view pluginStart];
}
- (void)startAllPlugins
{
+ LOG(Plugins, "startAllPlugins: pluginStart");
+
[views makeObjectsPerformSelector:@selector(pluginStart)];
}
- (void)stopAllPlugins
{
+ LOG(Plugins, "stopAllPlugins: pluginStop");
+
[views makeObjectsPerformSelector:@selector(pluginStop)];
}
- (void)destroyAllPlugins
{
+ LOG(Plugins, "destroyAllPlugins: pluginDestroy");
+
[self stopAllPlugins];
[views makeObjectsPerformSelector:@selector(pluginDestroy)];
[views removeAllObjects];
diff --git a/WebKit/Plugins.subproj/WebPluginPackage.m b/WebKit/Plugins.subproj/WebPluginPackage.m
index eee8c73..5cab266 100644
--- a/WebKit/Plugins.subproj/WebPluginPackage.m
+++ b/WebKit/Plugins.subproj/WebPluginPackage.m
@@ -40,7 +40,7 @@
[MIMEToExtensionsDictionary setObject:extensions forKey:MIME];
- description = [MIMEDictionary objectForKey:WebPluginDescriptionKey];
+ description = [MIMEDictionary objectForKey:WebPluginTypeDescriptionKey];
if(!description){
description = @"";
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 8d29ee8..dff40d3 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -525,10 +525,4 @@
}
}
-
-- (void)didAddSubview:(NSView *)view
-{
- [frame _didAddSubview:view];
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 0f6e75c..c8ac1b5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -109,6 +109,4 @@ typedef enum {
- (WebPluginController *)pluginController;
-- (void)_didAddSubview:(NSView *)view;
-
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index a62f13b..6278329 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -816,11 +816,4 @@ static const char * const stateNames[] = {
return _private->pluginController;
}
-- (void)_didAddSubview:(NSView *)view
-{
- if([view conformsToProtocol:@protocol(WebPlugin)]){
- [_private->pluginController didAddPluginView:view];
- }
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index de19448..9a0d54c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -14,6 +14,7 @@
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebException.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconLoader.h>
@@ -22,6 +23,7 @@
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPreferences.h>
+#import <WebKit/WebPluginController.h>
#import <WebKit/WebStringTruncator.h>
#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebTextRendererFactory.h>
@@ -232,6 +234,15 @@
[super viewDidMoveToWindow];
}
+- (void)addSubview:(NSView *)view
+{
+ [super addSubview:view];
+
+ if([view conformsToProtocol:@protocol(WebPlugin)]){
+ [[[self _frame] pluginController] didAddPluginView:view];
+ }
+}
+
- (void)reapplyStyles
{
if (!_private->needsToApplyStyles) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list