34661 2010-02-05 14:06:02 -0800 REGRESSION (Safari 4.0-> Safari 4.0.4) NPP_SetWindow no longer sets a clipRect of (0,0,0,0) when it becomes hidden 2010-02-05 14:56:24 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P1 Critical --- 1 kdecker kdecker oldest_to_newest 188294 0 kdecker 2010-02-05 14:06:02 -0800 When a Core Animation plug-in moves to a background tab or becomes minimized/hidden offscreen, it's supposed to provide the plug-in with a zero'd out clipRect. This is critically important for for CPU usage/power saving as the plug-in can throttle the timers in this case. <rdar://problem/7614067> 188298 1 48258 kdecker 2010-02-05 14:14:58 -0800 Created attachment 48258 Proposed fix that properly clips in-process and out-of-process Core Animation plug-ins 188317 2 48258 mrowe 2010-02-05 14:50:05 -0800 Comment on attachment 48258 Proposed fix that properly clips in-process and out-of-process Core Animation plug-ins > @@ -351,6 +333,13 @@ > > window.clipRect.bottom = window.clipRect.top; > window.clipRect.left = window.clipRect.right; > + > + // Core Animation plug-ins need to be updated (with a 0,0,0,0 clipRect) when > + // moved to a background tab. We don't do this for Core Graphics plug-ins as > + // older versions of Flash have historical WebKit-specific code that isn't > + // compatible with this behavior. This comment would be clearer if the parenthesized clause were part of the sentence. > + // Core Animation plug-ins need to be updated (with a 0,0,0,0 clipRect) when > + // moved to a background tab. We don't do this for Core Graphics plug-ins as > + // older versions of Flash have historical WebKit-specific code that isn't > + // compatible with this behavior. Same here. > +- (BOOL)superviewsHaveSuperviews > +{ > + NSView *contentView = [[self window] contentView]; > + NSView *view; > + for (view = self; view != nil; view = [view superview]) { > + if (view == contentView) { > + return YES; > + } > + } > + return NO; > +} You should clean up the style of this while you’re moving it -- move the declaration of view in to the loop, remove the explicit comparison with nil, and the extra braces. > +- (BOOL)shouldClipOutPlugin > +{ > + NSWindow *window = [self window]; > + return window == nil || [window isMiniaturized] || [NSApp isHidden] || ![self superviewsHaveSuperviews] || [self isHiddenOrHasHiddenAncestor]; > +} Same here with the explicit comparison with nil. r=me 188319 3 48258 darin 2010-02-05 14:50:41 -0800 Comment on attachment 48258 Proposed fix that properly clips in-process and out-of-process Core Animation plug-ins > +- (BOOL)superviewsHaveSuperviews > +{ > + NSView *contentView = [[self window] contentView]; > + NSView *view; > + for (view = self; view != nil; view = [view superview]) { > + if (view == contentView) { > + return YES; > + } > + } > + return NO; > +} > + > +- (BOOL)shouldClipOutPlugin > +{ > + NSWindow *window = [self window]; > + return window == nil || [window isMiniaturized] || [NSApp isHidden] || ![self superviewsHaveSuperviews] || [self isHiddenOrHasHiddenAncestor]; WebKit style for this is "!window" rather than "window == nil". But I know you just moved this. Also, WebKit style does not put braces around things like "return YES". Also, superviewsHaveSuperviews is a strangely named method you moved here. What the code implements is a check of whether this view is inside the contentView. It could be done more easily with -[NSView isDescendantOf:] -- we would not have to write a loop at all. Patch seems fine, r=me too 188323 4 kdecker 2010-02-05 14:56:24 -0800 Committed revision 54447. 48258 2010-02-05 14:14:58 -0800 2010-02-05 14:50:41 -0800 Proposed fix that properly clips in-process and out-of-process Core Animation plug-ins patch.txt text/plain 6758 kdecker SW5kZXg6IG1hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBtYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0JKHJldmlzaW9uIDU0NDQ0KQor KysgbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xOTcsMTkgKzE5Nyw2IEBACiAKICNwcmFnbWEgbWFyayBFVkVOVFMKIAotLSAoQk9PTClzdXBl cnZpZXdzSGF2ZVN1cGVydmlld3MKLXsKLSAgICBOU1ZpZXcgKmNvbnRlbnRWaWV3ID0gW1tzZWxm IHdpbmRvd10gY29udGVudFZpZXddOwotICAgIE5TVmlldyAqdmlldzsKLSAgICBmb3IgKHZpZXcg PSBzZWxmOyB2aWV3ICE9IG5pbDsgdmlldyA9IFt2aWV3IHN1cGVydmlld10pIHsgCi0gICAgICAg IGlmICh2aWV3ID09IGNvbnRlbnRWaWV3KSB7Ci0gICAgICAgICAgICByZXR1cm4gWUVTOwotICAg ICAgICB9Ci0gICAgfQotICAgIHJldHVybiBOTzsKLX0KLQotCiAvLyBUaGUgV2luZG93UmVmIGNy ZWF0ZWQgYnkgLVtOU1dpbmRvdyB3aW5kb3dSZWZdIGhhcyBhIFF1aWNrRHJhdyBHcmFmUG9ydCB0 aGF0IGNvdmVycyAKIC8vIHRoZSBlbnRpcmUgd2luZG93IGZyYW1lIChvciBzdHJ1Y3R1cmUgcmVn aW9uIHRvIHVzZSB0aGUgQ2FyYm9uIHRlcm0pIHJhdGhlciB0aGVuIGp1c3QgdGhlIHdpbmRvdyBj b250ZW50LgogLy8gV2UgY2FuIHJlbW92ZSB0aGlzIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzQyMDEw OTk+IGlzIGZpeGVkLgpAQCAtMzI5LDEyICszMTYsNyBAQAogICAgIC8vIDMpIHRoZSB3aW5kb3cg aXMgbWluaWF0dXJpemVkIG9yIHRoZSBhcHAgaXMgaGlkZGVuCiAgICAgLy8gNCkgd2UncmUgaW5z aWRlIG9mIHZpZXdXaWxsTW92ZVRvV2luZG93OiB3aXRoIGEgbmlsIHdpbmRvdy4gSW4gdGhpcyBj YXNlLCBzdXBlcnZpZXdzIG1heSBhbHJlYWR5IGhhdmUgbmlsIAogICAgIC8vIHN1cGVydmlld3Mg YW5kIG5pbCB3aW5kb3dzIGFuZCByZXN1bHRzIGZyb20gY29udmVydFJlY3Q6dG9WaWV3OiBhcmUg aW5jb3JyZWN0LgotICAgIE5TV2luZG93ICpyZWFsV2luZG93ID0gW3NlbGYgd2luZG93XTsKLSAg ICBpZiAod2luZG93LndpZHRoIDw9IDAgfHwgd2luZG93LmhlaWdodCA8PSAwIHx8IHdpbmRvdy54 IDwgLTEwMDAwMAotICAgICAgICAgICAgfHwgcmVhbFdpbmRvdyA9PSBuaWwgfHwgW3JlYWxXaW5k b3cgaXNNaW5pYXR1cml6ZWRdCi0gICAgICAgICAgICB8fCBbTlNBcHAgaXNIaWRkZW5dCi0gICAg ICAgICAgICB8fCAhW3NlbGYgc3VwZXJ2aWV3c0hhdmVTdXBlcnZpZXdzXQotICAgICAgICAgICAg fHwgW3NlbGYgaXNIaWRkZW5Pckhhc0hpZGRlbkFuY2VzdG9yXSkgeworICAgIGlmICh3aW5kb3cu d2lkdGggPD0gMCB8fCB3aW5kb3cuaGVpZ2h0IDw9IDAgfHwgd2luZG93LnggPCAtMTAwMDAwIHx8 IFtzZWxmIHNob3VsZENsaXBPdXRQbHVnaW5dKSB7CiAKICAgICAgICAgLy8gVGhlIGZvbGxvd2lu ZyBjb2RlIHRyaWVzIHRvIGdpdmUgcGx1Zy1pbnMgdGhlIHNhbWUgc2l6ZSB0aGV5IHdpbGwgZXZl bnR1YWxseSBoYXZlLgogICAgICAgICAvLyBUaGUgc3BlY2lmaWVkV2lkdGggYW5kIHNwZWNpZmll ZEhlaWdodCB2YXJpYWJsZXMgYXJlIHVzZWQgdG8gcHJlZGljdCB0aGUgc2l6ZSB0aGF0CkBAIC0z NTEsNiArMzMzLDEzIEBACiAKICAgICAgICAgd2luZG93LmNsaXBSZWN0LmJvdHRvbSA9IHdpbmRv dy5jbGlwUmVjdC50b3A7CiAgICAgICAgIHdpbmRvdy5jbGlwUmVjdC5sZWZ0ID0gd2luZG93LmNs aXBSZWN0LnJpZ2h0OworICAgICAgICAKKyAgICAgICAgLy8gQ29yZSBBbmltYXRpb24gcGx1Zy1p bnMgbmVlZCB0byBiZSB1cGRhdGVkICh3aXRoIGEgMCwwLDAsMCBjbGlwUmVjdCkgd2hlbgorICAg ICAgICAvLyBtb3ZlZCB0byBhIGJhY2tncm91bmQgdGFiLiBXZSBkb24ndCBkbyB0aGlzIGZvciBD b3JlIEdyYXBoaWNzIHBsdWctaW5zIGFzCisgICAgICAgIC8vIG9sZGVyIHZlcnNpb25zIG9mIEZs YXNoIGhhdmUgaGlzdG9yaWNhbCBXZWJLaXQtc3BlY2lmaWMgY29kZSB0aGF0IGlzbid0CisgICAg ICAgIC8vIGNvbXBhdGlibGUgd2l0aCB0aGlzIGJlaGF2aW9yLgorICAgICAgICBpZiAoZHJhd2lu Z01vZGVsID09IE5QRHJhd2luZ01vZGVsQ29yZUFuaW1hdGlvbikKKyAgICAgICAgICAgIGdldE5Q UmVjdChOU1plcm9SZWN0LCB3aW5kb3cuY2xpcFJlY3QpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IGdldE5QUmVjdCh2aXNpYmxlUmVjdEluV2luZG93LCB3aW5kb3cuY2xpcFJlY3QpOwogICAgIH0K SW5kZXg6IG1hYy9QbHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gbWFjL1BsdWdpbnMvSG9zdGVkL1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2lu Vmlldy5tbQkocmV2aXNpb24gNTQ0NDQpCisrKyBtYWMvUGx1Z2lucy9Ib3N0ZWQvV2ViSG9zdGVk TmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjEsMTIgKzE2MSwyNCBA QAogICAgIAogICAgIC8vIFVzZSBBcHBLaXQgdG8gY29udmVydCB2aWV3IGNvb3JkaW5hdGVzIHRv IE5TV2luZG93IGNvb3JkaW5hdGVzLgogICAgIE5TUmVjdCBib3VuZHNJbldpbmRvdyA9IFtzZWxm IGNvbnZlcnRSZWN0OltzZWxmIGJvdW5kc10gdG9WaWV3Om5pbF07Ci0gICAgTlNSZWN0IHZpc2li bGVSZWN0SW5XaW5kb3cgPSBbc2VsZiBjb252ZXJ0UmVjdDpbc2VsZiB2aXNpYmxlUmVjdF0gdG9W aWV3Om5pbF07CisgICAgTlNSZWN0IHZpc2libGVSZWN0SW5XaW5kb3c7CiAgICAgCisgICAgLy8g Q29yZSBBbmltYXRpb24gcGx1Zy1pbnMgbmVlZCB0byBiZSB1cGRhdGVkICh3aXRoIGEgMCwwLDAs MCBjbGlwUmVjdCkgd2hlbgorICAgIC8vIG1vdmVkIHRvIGEgYmFja2dyb3VuZCB0YWIuIFdlIGRv bid0IGRvIHRoaXMgZm9yIENvcmUgR3JhcGhpY3MgcGx1Zy1pbnMgYXMKKyAgICAvLyBvbGRlciB2 ZXJzaW9ucyBvZiBGbGFzaCBoYXZlIGhpc3RvcmljYWwgV2ViS2l0LXNwZWNpZmljIGNvZGUgdGhh dCBpc24ndAorICAgIC8vIGNvbXBhdGlibGUgd2l0aCB0aGlzIGJlaGF2aW9yLiAgICAKKyAgICBC T09MIHNob3VsZENsaXBPdXRQbHVnaW4gPSBfcGx1Z2luTGF5ZXIgJiYgW3NlbGYgc2hvdWxkQ2xp cE91dFBsdWdpbl07CisgICAgaWYgKCFzaG91bGRDbGlwT3V0UGx1Z2luKQorICAgICAgICB2aXNp YmxlUmVjdEluV2luZG93ID0gW3NlbGYgY29udmVydFJlY3Q6W3NlbGYgdmlzaWJsZVJlY3RdIHRv VmlldzpuaWxdOworICAgIGVsc2UKKyAgICAgICAgdmlzaWJsZVJlY3RJbldpbmRvdyA9IE5TWmVy b1JlY3Q7CisgICAgCiAgICAgLy8gRmxpcCBZIHRvIGNvbnZlcnQgTlNXaW5kb3cgY29vcmRpbmF0 ZXMgdG8gdG9wLWxlZnQtYmFzZWQgd2luZG93IGNvb3JkaW5hdGVzLgogICAgIGZsb2F0IGJvcmRl clZpZXdIZWlnaHQgPSBbW3NlbGYgY3VycmVudFdpbmRvd10gZnJhbWVdLnNpemUuaGVpZ2h0Owog ICAgIGJvdW5kc0luV2luZG93Lm9yaWdpbi55ID0gYm9yZGVyVmlld0hlaWdodCAtIE5TTWF4WShi b3VuZHNJbldpbmRvdyk7Ci0gICAgdmlzaWJsZVJlY3RJbldpbmRvdy5vcmlnaW4ueSA9IGJvcmRl clZpZXdIZWlnaHQgLSBOU01heFkodmlzaWJsZVJlY3RJbldpbmRvdyk7CisgICAgICAgIAorICAg IGlmICghc2hvdWxkQ2xpcE91dFBsdWdpbikKKyAgICAgICAgdmlzaWJsZVJlY3RJbldpbmRvdy5v cmlnaW4ueSA9IGJvcmRlclZpZXdIZWlnaHQgLSBOU01heFkodmlzaWJsZVJlY3RJbldpbmRvdyk7 CiAKICAgICBCT09MIHNpemVDaGFuZ2VkID0gIU5TRXF1YWxTaXplcyhfcHJldmlvdXNTaXplLCBi b3VuZHNJbldpbmRvdy5zaXplKTsKICAgICBfcHJldmlvdXNTaXplID0gYm91bmRzSW5XaW5kb3cu c2l6ZTsKSW5kZXg6IG1hYy9QbHVnaW5zL1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBtYWMvUGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3LmgJKHJldmlz aW9uIDU0NDQ0KQorKysgbWFjL1BsdWdpbnMvV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTksNiArMTE5LDcgQEAKIAogLSAodm9pZClhZGRXaW5kb3dPYnNl cnZlcnM7CiAtICh2b2lkKXJlbW92ZVdpbmRvd09ic2VydmVyczsKKy0gKEJPT0wpc2hvdWxkQ2xp cE91dFBsdWdpbjsKIAogLSAoQk9PTCljb252ZXJ0RnJvbVg6KGRvdWJsZSlzb3VyY2VYIGFuZFk6 KGRvdWJsZSlzb3VyY2VZIHNwYWNlOihOUENvb3JkaW5hdGVTcGFjZSlzb3VyY2VTcGFjZQogICAg ICAgICAgICAgICAgICB0b1g6KGRvdWJsZSAqKWRlc3RYIGFuZFk6KGRvdWJsZSAqKWRlc3RZIHNw YWNlOihOUENvb3JkaW5hdGVTcGFjZSlkZXN0U3BhY2U7CkluZGV4OiBtYWMvUGx1Z2lucy9XZWJC YXNlTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1hYy9QbHVnaW5zL1dlYkJh c2VOZXRzY2FwZVBsdWdpblZpZXcubW0JKHJldmlzaW9uIDU0NDQ0KQorKysgbWFjL1BsdWdpbnMv V2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTQ1LDYgKzU0 NSwyNCBAQAogICAgIHJldHVybiBfaXNIYWx0ZWQ7CiB9CiAKKy0gKEJPT0wpc3VwZXJ2aWV3c0hh dmVTdXBlcnZpZXdzCit7CisgICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtbc2VsZiB3aW5kb3dd IGNvbnRlbnRWaWV3XTsKKyAgICBOU1ZpZXcgKnZpZXc7CisgICAgZm9yICh2aWV3ID0gc2VsZjsg dmlldyAhPSBuaWw7IHZpZXcgPSBbdmlldyBzdXBlcnZpZXddKSB7IAorICAgICAgICBpZiAodmll dyA9PSBjb250ZW50VmlldykgeworICAgICAgICAgICAgcmV0dXJuIFlFUzsKKyAgICAgICAgfQor ICAgIH0KKyAgICByZXR1cm4gTk87Cit9CisKKy0gKEJPT0wpc2hvdWxkQ2xpcE91dFBsdWdpbgor eworICAgIE5TV2luZG93ICp3aW5kb3cgPSBbc2VsZiB3aW5kb3ddOworICAgIHJldHVybiB3aW5k b3cgPT0gbmlsIHx8IFt3aW5kb3cgaXNNaW5pYXR1cml6ZWRdIHx8IFtOU0FwcCBpc0hpZGRlbl0g fHwgIVtzZWxmIHN1cGVydmlld3NIYXZlU3VwZXJ2aWV3c10gfHwgW3NlbGYgaXNIaWRkZW5Pckhh c0hpZGRlbkFuY2VzdG9yXTsKK30KKyAgICAKIC0gKEJPT0wpaGFzQmVlbkhhbHRlZAogewogICAg IHJldHVybiBfaGFzQmVlbkhhbHRlZDsKSW5kZXg6IG1hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNTQ0NDQpCisrKyBtYWMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDItMDUgIEtldmluIERlY2tlciAgPGtk ZWNrZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDY2MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzYxNDA2Nz4gUkVHUkVTU0lPTiAoU2FmYXJpIDQuMC0+ IFNhZmFyaSA0LjAuNCk6IE5QUF9TZXRXaW5kb3cgbm8gbG9uZ2VyIHNldHMgYSBjbGlwUmVjdCBv ZiAoMCwwLDAsMCkgd2hlbiBpdCBiZWNvbWVzIGhpZGRlbgorICAgICAgICAKKyAgICAgICAgKiBQ bHVnaW5zL0hvc3RlZC9XZWJIb3N0ZWROZXRzY2FwZVBsdWdpblZpZXcubW06CisgICAgICAgICgt W1dlYkhvc3RlZE5ldHNjYXBlUGx1Z2luVmlldyB1cGRhdGVBbmRTZXRXaW5kb3ddKTogV2hlbiBj bGlwcGluZyBvdXQgTlBEcmF3aW5nTW9kZWxDb3JlQW5pbWF0aW9uIHBsdWctaW5zLCBwcm92aWRl IGEgemVybydkIG91dCBjbGlwUmVjdC4KKyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VOZXRzY2Fw ZVBsdWdpblZpZXcuaDogTW92ZWQgc3VwZXJ2aWV3c0hhdmVTdXBlcnZpZXdzIHRvIHRoZSBiYXNl IGNsYXNzLgorICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldy5tbToK KyAgICAgICAgKC1bV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBzdXBlcnZpZXdzSGF2ZVN1cGVy dmlld3NdKTogQWRkZWQgdG8gdGhlIGJhc2UgY2xhc3M7IGV4dHJhY3RlZCBmcm9tIFdlYk5ldHNj YXBlUGx1Z2luVmlldy4KKyAgICAgICAgKC1bV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldyBzaG91 bGRDbGlwT3V0UGx1Z2luXSk6IEFkZGVkIG5ldyBtZXRob2Qgd2l0aCBjb2RlIGV4dHJhY3RlZCBm cm9tIFdlYk5ldHNjYXBlUGx1Z2luVmlldy4KKyAgICAgICAgKiBQbHVnaW5zL1dlYk5ldHNjYXBl UGx1Z2luVmlldy5tbToKKyAgICAgICAgKC1bV2ViTmV0c2NhcGVQbHVnaW5WaWV3IHNhdmVBbmRT ZXROZXdQb3J0U3RhdGVGb3JVcGRhdGU6XSk6IFdoZW4gY2xpcHBpbmcgb3V0IE5QRHJhd2luZ01v ZGVsQ29yZUFuaW1hdGlvbiBwbHVnLWlucywgcHJvdmlkZSBhIHplcm8nZCBvdXQgY2xpcFJlY3Qu CisKIDIwMTAtMDItMDQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBS dWJiZXItc3RhbXBlZCBieSBEYW4gQmVybnN0ZWluLgo=