The following commit has been merged in the webkit-1.1 branch:
commit f1c253ad9b7cb2d3916f3668818c0aa0c53b7333
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 16 22:44:21 2010 +0000
2010-02-16 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
https://bugs.webkit.org/show_bug.cgi?id=34988
WebHTMLView.mm has two -willRemoveSubview: methods
* WebView/WebHTMLView.mm:
(-[WebHTMLView willRemoveSubview:]): Consolidate the two copies of this method.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54832 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 13cc0ea..3a87d7a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34988
+ WebHTMLView.mm has two -willRemoveSubview: methods
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView willRemoveSubview:]): Consolidate the two copies of this method.
+
2010-02-16 Alexey Proskuryakov <ap at apple.com>
Reviewed by Geoffrey Garen and Kevin Decker.
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index 54a177e..f42c4ce 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -1239,15 +1239,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
if (_private->enumeratingSubviews)
LOG(View, "A view of class %s was added during subview enumeration for layout or printing mode change. This view might paint without first receiving layout.", object_getClassName([subview class]));
}
-
-- (void)willRemoveSubview:(NSView *)subview
-{
- // Have to null-check _private, since this can be called via -dealloc when
- // cleaning up the the layerHostingView.
- if (_private && _private->enumeratingSubviews)
- LOG(View, "A view of class %s was removed during subview enumeration for layout or printing mode change. We will still do layout or the printing mode change even though this view is no longer in the view hierarchy.", object_getClassName([subview class]));
-}
-
#endif
#ifdef BUILDING_ON_TIGER
@@ -2971,6 +2962,13 @@ WEBCORE_COMMAND(yankAndSelect)
- (void)willRemoveSubview:(NSView *)subview
{
+#ifndef NDEBUG
+ // Have to null-check _private, since this can be called via -dealloc when
+ // cleaning up the the layerHostingView.
+ if (_private && _private->enumeratingSubviews)
+ LOG(View, "A view of class %s was removed during subview enumeration for layout or printing mode change. We will still do layout or the printing mode change even though this view is no longer in the view hierarchy.", object_getClassName([subview class]));
+#endif
+
if ([WebPluginController isPlugInView:subview])
[[self _pluginController] destroyPlugin:subview];
--
WebKit Debian packaging