Commit 54497512 authored by eric.carlson@apple.com's avatar eric.carlson@apple.com
Browse files

2010-02-16 Eric Carlson <eric.carlson@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
parent fafcaad3
2010-02-16 Eric Carlson <eric.carlson@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@apple.com>
Reviewed by Geoffrey Garen and Kevin Decker.
......
......@@ -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];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment