81263 2012-03-15 13:49:06 -0700 [CSS Filters] Drop-shadow and blur can avoid using full source image 2012-04-18 11:56:53 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achicu achicu dino rafael.lobo senorblanco oldest_to_newest 579700 0 achicu 2012-03-15 13:49:06 -0700 Calculate the exact rectangle that's needed to paint the blur or the drop-shadow and use just that to compute the filters. 604485 1 137638 achicu 2012-04-17 16:56:25 -0700 Created attachment 137638 Patch V1 604499 2 137638 dino 2012-04-17 17:09:19 -0700 Comment on attachment 137638 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=137638&action=review Just one small question on naming, and some typos. > Source/WebCore/ChangeLog:10 > + Even if the element is completely offscreen, but it's shadow is in the viewport, we can still compute the source typo it's -> its > Source/WebCore/ChangeLog:14 > + No new tests, this change doesn't have visible results and the functionality should > + already be covered by previous filter tests. We couldn't have a repaint test specifically for this? I'm not worried if not. > Source/WebCore/rendering/FilterEffectRenderer.cpp:370 > + // Note that the outsets are reveresed here because we are going backwards -> we have the dirty rect and Typo - reveresed -> reversed. > Source/WebCore/rendering/FilterEffectRenderer.cpp:379 > +bool FilterEffectRendererHelper::prepareFilterEffect(RenderLayer* renderLayer, const LayoutRect& filterBoxRect, const LayoutRect& dirtyRect, const LayoutRect& layerRepaintRect) Unless I'm missing something, but this method no longer calls prepare(), so maybe it should be renamed? 604505 3 achicu 2012-04-17 17:18:27 -0700 (In reply to comment #2) Thanks for the review. > Unless I'm missing something, but this method no longer calls prepare(), so maybe it should be renamed? It's not calling prepare anymore, but it's preparing the "repaint" rectangle and updating the backing store size. I actually think that we should rename the other functions: FilterEffectRenderer::updateBackingStore -> updateBackingStoreRect FilterEffectRenderer:: prepare -> allocateBackingStoreIfNeeded FilterEffectRenderer:: prepare should not be required to call clearIntermediateResults() anymore, because we do that when we finish in FilterEffectRendererHelper::applyFilterEffect, so next time it should already be cleaned up. What do you think? 604542 4 dino 2012-04-17 18:31:56 -0700 (In reply to comment #3) > (In reply to comment #2) > Thanks for the review. > > > Unless I'm missing something, but this method no longer calls prepare(), so maybe it should be renamed? > > It's not calling prepare anymore, but it's preparing the "repaint" rectangle and updating the backing store size. > > I actually think that we should rename the other functions: > > FilterEffectRenderer::updateBackingStore -> updateBackingStoreRect > FilterEffectRenderer:: prepare -> allocateBackingStoreIfNeeded > > FilterEffectRenderer:: prepare should not be required to call clearIntermediateResults() anymore, because we do that when we finish in FilterEffectRendererHelper::applyFilterEffect, so next time it should already be cleaned up. > > What do you think? Sounds good. 604863 5 achicu 2012-04-18 10:30:44 -0700 (In reply to comment #2) > (From update of attachment 137638 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=137638&action=review > > > Source/WebCore/ChangeLog:14 > > + No new tests, this change doesn't have visible results and the functionality should > > + already be covered by previous filter tests. > > We couldn't have a repaint test specifically for this? I'm not worried if not. There's already a test that makes sure that memory is not exploding for offscreen buffers. Also, blur repaints are already covered. I'm not sure what else could we do for it. I think we need something in DRT to dump the intermediate filter bitmaps. I will add a bug for that http://svn.webkit.org/repository/webkit/trunk/LayoutTests/css3/filters/offscreen-filters-memory-usage.html 604874 6 achicu 2012-04-18 10:38:18 -0700 Landed in http://trac.webkit.org/changeset/114529 . 604949 7 rafael.lobo 2012-04-18 11:42:09 -0700 (In reply to comment #6) > Landed in http://trac.webkit.org/changeset/114529 . Build fix for Qt was landed in http://trac.webkit.org/changeset/114534 604966 8 137736 achicu 2012-04-18 11:56:53 -0700 Created attachment 137736 QT Fix I've already committed this, unreviewed. QT build is also using FilterEffectRenderer::prepare and I've updated it to the new name. 137638 2012-04-17 16:56:25 -0700 2012-04-17 17:09:33 -0700 Patch V1 bug81263.patch text/plain 12942 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZWRiMWUxLi5iZjFmMDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDQtMTcgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFtDU1MgRmlsdGVyc10gRHJvcC1zaGFkb3cgYW5kIGJsdXIgY2FuIGF2b2lkIHVz aW5nIGZ1bGwgc291cmNlIGltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04MTI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEluc3RlYWQgb2YgdXNpbmcgdGhlIGZ1bGwgYm91bmRpbmcgYm94IG9mIHRo ZSBSZW5kZXJMYXllciB3ZSBub3cgY29tcHV0ZSB0aGUgZXhhY3QgcmVjdGFuZ2xlIHRoYXQgaXMg bmVlZGVkIHRvIAorICAgICAgICBjb21wdXRlIGZpbHRlciBpbnNpZGUgdGhlIGRpcnR5IHJlY3Rh bmdsZSBvbiBzY3JlZW4uIFRoYXQncyBlYXN5IHRvIGNhbGN1bGF0ZSBieSByZXZlcnNpbmcgdGhl IGZpbHRlciBvdXRzZXRzLgorICAgICAgICBFdmVuIGlmIHRoZSBlbGVtZW50IGlzIGNvbXBsZXRl bHkgb2Zmc2NyZWVuLCBidXQgaXQncyBzaGFkb3cgaXMgaW4gdGhlIHZpZXdwb3J0LCB3ZSBjYW4g c3RpbGwgY29tcHV0ZSB0aGUgc291cmNlIAorICAgICAgICByZWN0YW5nbGUgdGhhdCBuZWVkcyB0 byBiZSBkcmF3biBpbiBvcmRlciB0byB1cGRhdGUgdGhlIHNoYWRvdyBjb3JyZWN0bHkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIGNoYW5nZSBkb2Vzbid0IGhhdmUgdmlzaWJsZSByZXN1 bHRzIGFuZCB0aGUgZnVuY3Rpb25hbGl0eSBzaG91bGQKKyAgICAgICAgYWxyZWFkeSBiZSBjb3Zl cmVkIGJ5IHByZXZpb3VzIGZpbHRlciB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9GaWx0 ZXJFZmZlY3RSZW5kZXJlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWx0ZXJFZmZlY3RSZW5k ZXJlcjo6RmlsdGVyRWZmZWN0UmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6RmlsdGVyRWZm ZWN0UmVuZGVyZXI6OmJ1aWxkKTogU2F2ZSB0aGUgb3V0c2V0cyBvZiB0aGUgZmlsdGVycywgc28g dGhhdCB3ZSBjYW4gdXNlIHRoZW0gaW4gY29tcHV0ZVNvdXJjZUltYWdlUmVjdEZvckRpcnR5UmVj dC4KKyAgICAgICAgKFdlYkNvcmU6OkZpbHRlckVmZmVjdFJlbmRlcmVyOjpwcmVwYXJlKTogT25s eSBhbGxvY2F0ZSBhIG5ldyBzb3VyY2UgaW1hZ2UgaWYgdGhlIHNpemUgb2YgdGhlIHNvdXJjZSBy ZWN0YW5nbGUgY2hhbmdlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZpbHRlckVmZmVjdFJlbmRlcmVy Ojpjb21wdXRlU291cmNlSW1hZ2VSZWN0Rm9yRGlydHlSZWN0KToKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAoV2ViQ29yZTo6RmlsdGVyRWZmZWN0UmVuZGVyZXJIZWxwZXI6OnByZXBhcmVG aWx0ZXJFZmZlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RmlsdGVyRWZmZWN0UmVuZGVyZXJIZWxw ZXI6OmJlZ2luRmlsdGVyRWZmZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvRmlsdGVyRWZmZWN0 UmVuZGVyZXIuaDoKKyAgICAgICAgKEZpbHRlckVmZmVjdFJlbmRlcmVySGVscGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkZpbHRlckVmZmVjdFJlbmRlcmVySGVscGVyOjpyZXBhaW50UmVjdCk6Cisg ICAgICAgIChGaWx0ZXJFZmZlY3RSZW5kZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyQ29u dGVudHMpOgorCiAyMDEyLTA0LTE3ICBMdWtlIE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBDbGVhbiB1cCBDU1NQYXJzZXI6OnBhcnNlRmlsbFJlcGVhdCgp LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZpbHRlckVmZmVjdFJlbmRl cmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GaWx0ZXJFZmZlY3RSZW5kZXJlci5j cHAKaW5kZXggN2I3Y2M0Zi4uZmU2MTg1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0ZpbHRlckVmZmVjdFJlbmRlcmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIuY3BwCkBAIC04Niw2ICs4NiwxMCBAQCBzdGF0aWMg Ym9vbCBpc0NTU0N1c3RvbUZpbHRlckVuYWJsZWQoRG9jdW1lbnQqIGRvY3VtZW50KQogCiBGaWx0 ZXJFZmZlY3RSZW5kZXJlcjo6RmlsdGVyRWZmZWN0UmVuZGVyZXIoRmlsdGVyRWZmZWN0T2JzZXJ2 ZXIqIG9ic2VydmVyKQogICAgIDogbV9vYnNlcnZlcihvYnNlcnZlcikKKyAgICAsIG1fdG9wT3V0 c2V0KDApCisgICAgLCBtX3JpZ2h0T3V0c2V0KDApCisgICAgLCBtX2JvdHRvbU91dHNldCgwKQor ICAgICwgbV9sZWZ0T3V0c2V0KDApCiAgICAgLCBtX2dyYXBoaWNzQnVmZmVyQXR0YWNoZWQoZmFs c2UpCiAgICAgLCBtX2hhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscyhmYWxzZSkKIHsKQEAgLTExNCw2 ICsxMTgsOCBAQCBib29sIEZpbHRlckVmZmVjdFJlbmRlcmVyOjpidWlsZChEb2N1bWVudCogZG9j dW1lbnQsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIG9wZQogI2VuZGlmCiAKICAgICBtX2hhc0Zp bHRlclRoYXRNb3Zlc1BpeGVscyA9IG9wZXJhdGlvbnMuaGFzRmlsdGVyVGhhdE1vdmVzUGl4ZWxz KCk7CisgICAgaWYgKG1faGFzRmlsdGVyVGhhdE1vdmVzUGl4ZWxzKQorICAgICAgICBvcGVyYXRp b25zLmdldE91dHNldHMobV90b3BPdXRzZXQsIG1fcmlnaHRPdXRzZXQsIG1fYm90dG9tT3V0c2V0 LCBtX2xlZnRPdXRzZXQpOwogICAgIG1fZWZmZWN0cy5jbGVhcigpOwogCiAgICAgUmVmUHRyPEZp bHRlckVmZmVjdD4gcHJldmlvdXNFZmZlY3Q7CkBAIC0zMzcsNyArMzQzLDggQEAgdm9pZCBGaWx0 ZXJFZmZlY3RSZW5kZXJlcjo6cHJlcGFyZSgpCiAgICAgLy8gYnVmZmVyIGlmIHdlIGhhdmUgbm90 IHlldCBkb25lIHNvLgogICAgIGlmICghbV9ncmFwaGljc0J1ZmZlckF0dGFjaGVkKSB7CiAgICAg ICAgIEludFNpemUgbG9naWNhbFNpemUobV9zb3VyY2VEcmF3aW5nUmVnaW9uLndpZHRoKCksIG1f c291cmNlRHJhd2luZ1JlZ2lvbi5oZWlnaHQoKSk7Ci0gICAgICAgIHNldFNvdXJjZUltYWdlKElt YWdlQnVmZmVyOjpjcmVhdGUobG9naWNhbFNpemUsIDEsIENvbG9yU3BhY2VEZXZpY2VSR0IsIHJl bmRlcmluZ01vZGUoKSkpOworICAgICAgICBpZiAoIXNvdXJjZUltYWdlKCkgfHwgc291cmNlSW1h Z2UoKS0+bG9naWNhbFNpemUoKSAhPSBsb2dpY2FsU2l6ZSkKKyAgICAgICAgICAgIHNldFNvdXJj ZUltYWdlKEltYWdlQnVmZmVyOjpjcmVhdGUobG9naWNhbFNpemUsIDEsIENvbG9yU3BhY2VEZXZp Y2VSR0IsIHJlbmRlcmluZ01vZGUoKSkpOwogICAgICAgICBtX2dyYXBoaWNzQnVmZmVyQXR0YWNo ZWQgPSB0cnVlOwogICAgIH0KICAgICBjbGVhckludGVybWVkaWF0ZVJlc3VsdHMoKTsKQEAgLTM1 NSwzMCArMzYyLDQ2IEBAIHZvaWQgRmlsdGVyRWZmZWN0UmVuZGVyZXI6OmFwcGx5KCkKICAgICBs YXN0RWZmZWN0KCktPmFwcGx5KCk7CiB9CiAKLWNvbnN0IExheW91dFJlY3QmIEZpbHRlckVmZmVj dFJlbmRlcmVySGVscGVyOjpwcmVwYXJlRmlsdGVyRWZmZWN0KFJlbmRlckxheWVyKiByZW5kZXJM YXllciwgY29uc3QgTGF5b3V0UmVjdCYgZmlsdGVyQm94UmVjdCwgY29uc3QgTGF5b3V0UmVjdCYg ZGlydHlSZWN0LCBjb25zdCBMYXlvdXRSZWN0JiBsYXllclJlcGFpbnRSZWN0KQorTGF5b3V0UmVj dCBGaWx0ZXJFZmZlY3RSZW5kZXJlcjo6Y29tcHV0ZVNvdXJjZUltYWdlUmVjdEZvckRpcnR5UmVj dChjb25zdCBMYXlvdXRSZWN0JiBmaWx0ZXJCb3hSZWN0LCBjb25zdCBMYXlvdXRSZWN0JiBkaXJ0 eVJlY3QpCit7CisgICAgLy8gVGhlIHJlc3VsdCBvZiB0aGlzIGZ1bmN0aW9uIGlzIHRoZSBhcmVh IGluIHRoZSAiZmlsdGVyQm94UmVjdCIgdGhhdCBuZWVkcyB0byBiZSByZXBhaW50ZWQsIHNvIHRo YXQgd2UgZnVsbHkgY292ZXIgdGhlICJkaXJ0eVJlY3QiLgorICAgIExheW91dFJlY3QgcmVjdEZv clJlcGFpbnQgPSBkaXJ0eVJlY3Q7CisgICAgaWYgKGhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscygp KSB7CisgICAgICAgIC8vIE5vdGUgdGhhdCB0aGUgb3V0c2V0cyBhcmUgcmV2ZXJlc2VkIGhlcmUg YmVjYXVzZSB3ZSBhcmUgZ29pbmcgYmFja3dhcmRzIC0+IHdlIGhhdmUgdGhlIGRpcnR5IHJlY3Qg YW5kCisgICAgICAgIC8vIG5lZWQgdG8gZmluZCBvdXQgd2hhdCBpcyB0aGUgcmVjdGFuZ2xlIHRo YXQgbWlnaHQgaW5mbHVlbmNlIHRoZSByZXN1bHQgaW5zaWRlIHRoYXQgZGlydHkgcmVjdC4KKyAg ICAgICAgcmVjdEZvclJlcGFpbnQubW92ZSgtbV9yaWdodE91dHNldCwgLW1fYm90dG9tT3V0c2V0 KTsKKyAgICAgICAgcmVjdEZvclJlcGFpbnQuZXhwYW5kKG1fbGVmdE91dHNldCArIG1fcmlnaHRP dXRzZXQsIG1fdG9wT3V0c2V0ICsgbV9ib3R0b21PdXRzZXQpOworICAgIH0KKyAgICByZWN0Rm9y UmVwYWludC5pbnRlcnNlY3QoZmlsdGVyQm94UmVjdCk7CisgICAgcmV0dXJuIHJlY3RGb3JSZXBh aW50OworfQorCitib29sIEZpbHRlckVmZmVjdFJlbmRlcmVySGVscGVyOjpwcmVwYXJlRmlsdGVy RWZmZWN0KFJlbmRlckxheWVyKiByZW5kZXJMYXllciwgY29uc3QgTGF5b3V0UmVjdCYgZmlsdGVy Qm94UmVjdCwgY29uc3QgTGF5b3V0UmVjdCYgZGlydHlSZWN0LCBjb25zdCBMYXlvdXRSZWN0JiBs YXllclJlcGFpbnRSZWN0KQogewogICAgIEFTU0VSVChtX2hhdmVGaWx0ZXJFZmZlY3QgJiYgcmVu ZGVyTGF5ZXItPmZpbHRlcigpKTsKICAgICBtX3JlbmRlckxheWVyID0gcmVuZGVyTGF5ZXI7Ci0g ICAgbV9kaXJ0eVJlY3QgPSBkaXJ0eVJlY3Q7Ci0gICAgbV9kaXJ0eVJlY3QuaW50ZXJzZWN0KGZp bHRlckJveFJlY3QpOworICAgIG1fcmVwYWludFJlY3QgPSBkaXJ0eVJlY3Q7CiAKICAgICBGaWx0 ZXJFZmZlY3RSZW5kZXJlciogZmlsdGVyID0gcmVuZGVyTGF5ZXItPmZpbHRlcigpOwotCi0gICAg Ly8gU29tZSBmaWx0ZXJzIG5lZWQgdGhlIHdob2xlIG9yaWdpbmFsIGFyZWEgaW4gb3JkZXIgdG8g cmVjYWxjdWxhdGUgY29ycmVjdGx5LgotICAgIC8vIFN1Y2ggZmlsdGVycyBpbmNsdWRlIGJsdXIs IGRyb3Atc2hhZG93IGFuZCBzaGFkZXJzLiBGb3IgdGhhdCByZWFzb24sCi0gICAgLy8gd2Uga2Vl cCB0aGUgd2hvbGUgaW1hZ2UgYnVmZmVyIGluIG1lbW9yeSBhbmQgcmVwYWludCBvbmx5IGRpcnR5 IGFyZWFzLgotICAgIGJvb2wgaGFzRmlsdGVyVGhhdE1vdmVzUGl4ZWxzID0gZmlsdGVyLT5oYXNG aWx0ZXJUaGF0TW92ZXNQaXhlbHMoKTsKLSAgICBMYXlvdXRSZWN0IGZpbHRlclNvdXJjZVJlY3Qg PSBoYXNGaWx0ZXJUaGF0TW92ZXNQaXhlbHMgPyBmaWx0ZXJCb3hSZWN0IDogbV9kaXJ0eVJlY3Q7 CisgICAgTGF5b3V0UmVjdCBmaWx0ZXJTb3VyY2VSZWN0ID0gZmlsdGVyLT5jb21wdXRlU291cmNl SW1hZ2VSZWN0Rm9yRGlydHlSZWN0KGZpbHRlckJveFJlY3QsIGRpcnR5UmVjdCk7CiAgICAgbV9w YWludE9mZnNldCA9IGZpbHRlclNvdXJjZVJlY3QubG9jYXRpb24oKTsKLSAgICBmaWx0ZXJTb3Vy Y2VSZWN0LnNldExvY2F0aW9uKExheW91dFBvaW50KCkpOwogCi0gICAgYm9vbCBoYXNVcGRhdGVk QmFja2luZ1N0b3JlID0gZmlsdGVyLT51cGRhdGVCYWNraW5nU3RvcmUoZmlsdGVyU291cmNlUmVj dCk7Ci0gICAgaWYgKGhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscykKLSAgICAgICAgbV9kaXJ0eVJl Y3QudW5pdGUoaGFzVXBkYXRlZEJhY2tpbmdTdG9yZSA/IGZpbHRlckJveFJlY3QgOiBsYXllclJl cGFpbnRSZWN0KTsKLSAgICAKLSAgICBmaWx0ZXItPnByZXBhcmUoKTsKKyAgICBpZiAoZmlsdGVy U291cmNlUmVjdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgLy8gVGhlIGRpcnR5IHJlY3QgaXMgbm90 IGluIHZpZXcsIGp1c3QgYmFpbCBvdXQuCisgICAgICAgIG1faGF2ZUZpbHRlckVmZmVjdCA9IGZh bHNlOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAotICAgIHJldHVybiBtX2Rp cnR5UmVjdDsKKyAgICBib29sIGhhc1VwZGF0ZWRCYWNraW5nU3RvcmUgPSBmaWx0ZXItPnVwZGF0 ZUJhY2tpbmdTdG9yZShmaWx0ZXJTb3VyY2VSZWN0KTsKKyAgICBpZiAoZmlsdGVyLT5oYXNGaWx0 ZXJUaGF0TW92ZXNQaXhlbHMoKSkgeworICAgICAgICBpZiAoaGFzVXBkYXRlZEJhY2tpbmdTdG9y ZSkKKyAgICAgICAgICAgIG1fcmVwYWludFJlY3QgPSBmaWx0ZXJTb3VyY2VSZWN0OworICAgICAg ICBlbHNlIHsKKyAgICAgICAgICAgIG1fcmVwYWludFJlY3QudW5pdGUobGF5ZXJSZXBhaW50UmVj dCk7CisgICAgICAgICAgICBtX3JlcGFpbnRSZWN0LmludGVyc2VjdChmaWx0ZXJTb3VyY2VSZWN0 KTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKIH0KICAgIAogR3JhcGhpY3ND b250ZXh0KiBGaWx0ZXJFZmZlY3RSZW5kZXJlckhlbHBlcjo6YmVnaW5GaWx0ZXJFZmZlY3QoR3Jh cGhpY3NDb250ZXh0KiBvbGRDb250ZXh0KQpAQCAtMzg2LDYgKzQwOSw3IEBAIEdyYXBoaWNzQ29u dGV4dCogRmlsdGVyRWZmZWN0UmVuZGVyZXJIZWxwZXI6OmJlZ2luRmlsdGVyRWZmZWN0KEdyYXBo aWNzQ29udGV4dCoKICAgICBBU1NFUlQobV9yZW5kZXJMYXllcik7CiAgICAgCiAgICAgRmlsdGVy RWZmZWN0UmVuZGVyZXIqIGZpbHRlciA9IG1fcmVuZGVyTGF5ZXItPmZpbHRlcigpOworICAgIGZp bHRlci0+cHJlcGFyZSgpOwogICAgIC8vIFBhaW50IGludG8gdGhlIGNvbnRleHQgdGhhdCByZXBy ZXNlbnRzIHRoZSBTb3VyY2VHcmFwaGljIG9mIHRoZSBmaWx0ZXIuCiAgICAgR3JhcGhpY3NDb250 ZXh0KiBzb3VyY2VHcmFwaGljc0NvbnRleHQgPSBmaWx0ZXItPmlucHV0Q29udGV4dCgpOwogICAg IGlmICghc291cmNlR3JhcGhpY3NDb250ZXh0IHx8ICFpc0ZpbHRlclNpemVWYWxpZChmaWx0ZXIt PmZpbHRlclJlZ2lvbigpKSkgewpAQCAtMzk5LDggKzQyMyw4IEBAIEdyYXBoaWNzQ29udGV4dCog RmlsdGVyRWZmZWN0UmVuZGVyZXJIZWxwZXI6OmJlZ2luRmlsdGVyRWZmZWN0KEdyYXBoaWNzQ29u dGV4dCoKICAgICAvLyBUcmFuc2xhdGUgdGhlIGNvbnRleHQgc28gdGhhdCB0aGUgY29udGVudHMg b2YgdGhlIGxheWVyIGlzIGNhcHR1dGVyZCBpbiB0aGUgb2Zmc2NyZWVuIG1lbW9yeSBidWZmZXIu CiAgICAgc291cmNlR3JhcGhpY3NDb250ZXh0LT5zYXZlKCk7CiAgICAgc291cmNlR3JhcGhpY3ND b250ZXh0LT50cmFuc2xhdGUoLW1fcGFpbnRPZmZzZXQueCgpLCAtbV9wYWludE9mZnNldC55KCkp OwotICAgIHNvdXJjZUdyYXBoaWNzQ29udGV4dC0+Y2xlYXJSZWN0KG1fZGlydHlSZWN0KTsKLSAg ICBzb3VyY2VHcmFwaGljc0NvbnRleHQtPmNsaXAobV9kaXJ0eVJlY3QpOworICAgIHNvdXJjZUdy YXBoaWNzQ29udGV4dC0+Y2xlYXJSZWN0KG1fcmVwYWludFJlY3QpOworICAgIHNvdXJjZUdyYXBo aWNzQ29udGV4dC0+Y2xpcChtX3JlcGFpbnRSZWN0KTsKICAgICAKICAgICByZXR1cm4gc291cmNl R3JhcGhpY3NDb250ZXh0OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0ZpbHRlckVmZmVjdFJlbmRlcmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVy RWZmZWN0UmVuZGVyZXIuaAppbmRleCA1YmEyODlkLi5lYzlmZTc1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIuaApAQCAtNjcsMTUgKzY3LDE2 IEBAIHB1YmxpYzoKICAgICBib29sIGhhdmVGaWx0ZXJFZmZlY3QoKSBjb25zdCB7IHJldHVybiBt X2hhdmVGaWx0ZXJFZmZlY3Q7IH0KICAgICBib29sIGhhc1N0YXJ0ZWRGaWx0ZXJFZmZlY3QoKSBj b25zdCB7IHJldHVybiBtX3NhdmVkR3JhcGhpY3NDb250ZXh0OyB9CiAKLSAgICBjb25zdCBMYXlv dXRSZWN0JiBwcmVwYXJlRmlsdGVyRWZmZWN0KFJlbmRlckxheWVyKiwgY29uc3QgTGF5b3V0UmVj dCYgZmlsdGVyQm94UmVjdCwgY29uc3QgTGF5b3V0UmVjdCYgZGlydHlSZWN0LCBjb25zdCBMYXlv dXRSZWN0JiBsYXllclJlcGFpbnRSZWN0KTsKKyAgICBib29sIHByZXBhcmVGaWx0ZXJFZmZlY3Qo UmVuZGVyTGF5ZXIqLCBjb25zdCBMYXlvdXRSZWN0JiBmaWx0ZXJCb3hSZWN0LCBjb25zdCBMYXlv dXRSZWN0JiBkaXJ0eVJlY3QsIGNvbnN0IExheW91dFJlY3QmIGxheWVyUmVwYWludFJlY3QpOwog ICAgIEdyYXBoaWNzQ29udGV4dCogYmVnaW5GaWx0ZXJFZmZlY3QoR3JhcGhpY3NDb250ZXh0KiBv bGRDb250ZXh0KTsKICAgICBHcmFwaGljc0NvbnRleHQqIGFwcGx5RmlsdGVyRWZmZWN0KCk7CiAK KyAgICBjb25zdCBMYXlvdXRSZWN0JiByZXBhaW50UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVw YWludFJlY3Q7IH0KIHByaXZhdGU6CiAgICAgR3JhcGhpY3NDb250ZXh0KiBtX3NhdmVkR3JhcGhp Y3NDb250ZXh0OwogICAgIFJlbmRlckxheWVyKiBtX3JlbmRlckxheWVyOwogICAgIExheW91dFBv aW50IG1fcGFpbnRPZmZzZXQ7Ci0gICAgTGF5b3V0UmVjdCBtX2RpcnR5UmVjdDsKKyAgICBMYXlv dXRSZWN0IG1fcmVwYWludFJlY3Q7CiAgICAgYm9vbCBtX2hhdmVGaWx0ZXJFZmZlY3Q7CiB9Owog CkBAIC0xMTUsNiArMTE2LDcgQEAgcHVibGljOgogICAgIEludFJlY3Qgb3V0cHV0UmVjdCgpIGNv bnN0IHsgcmV0dXJuIGxhc3RFZmZlY3QoKS0+aGFzUmVzdWx0KCkgPyBsYXN0RWZmZWN0KCktPnJl cXVlc3RlZFJlZ2lvbk9mSW5wdXRJbWFnZURhdGEoSW50UmVjdChtX2ZpbHRlclJlZ2lvbikpIDog SW50UmVjdCgpOyB9CiAKICAgICBib29sIGhhc0ZpbHRlclRoYXRNb3Zlc1BpeGVscygpIGNvbnN0 IHsgcmV0dXJuIG1faGFzRmlsdGVyVGhhdE1vdmVzUGl4ZWxzOyB9CisgICAgTGF5b3V0UmVjdCBj b21wdXRlU291cmNlSW1hZ2VSZWN0Rm9yRGlydHlSZWN0KGNvbnN0IExheW91dFJlY3QmIGZpbHRl ckJveFJlY3QsIGNvbnN0IExheW91dFJlY3QmIGRpcnR5UmVjdCk7CiAKIHByaXZhdGU6CiAjaWYg RU5BQkxFKENTU19TSEFERVJTKQpAQCAtMTUzLDYgKzE1NSwxMSBAQCBwcml2YXRlOgogICAgIEN1 c3RvbUZpbHRlclByb2dyYW1MaXN0IG1fY2FjaGVkQ3VzdG9tRmlsdGVyUHJvZ3JhbXM7CiAjZW5k aWYKICAgICAKKyAgICBpbnQgbV90b3BPdXRzZXQ7CisgICAgaW50IG1fcmlnaHRPdXRzZXQ7Cisg ICAgaW50IG1fYm90dG9tT3V0c2V0OworICAgIGludCBtX2xlZnRPdXRzZXQ7CisgICAgCiAgICAg Ym9vbCBtX2dyYXBoaWNzQnVmZmVyQXR0YWNoZWQ7CiAgICAgYm9vbCBtX2hhc0ZpbHRlclRoYXRN b3Zlc1BpeGVsczsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApp bmRleCA4YzA2ZjdiLi45YWNjMDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKQEAgLTI5ODMsMjEgKzI5ODMsMjQgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRM YXllckNvbnRlbnRzKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCogY28K ICAgICAgICAgTGF5b3V0UG9pbnQgcm9vdExheWVyT2Zmc2V0OwogICAgICAgICBjb252ZXJ0VG9M YXllckNvb3Jkcyhyb290TGF5ZXIsIHJvb3RMYXllck9mZnNldCk7CiAgICAgICAgIG1fZmlsdGVy UmVwYWludFJlY3QubW92ZShyb290TGF5ZXJPZmZzZXQueCgpLCByb290TGF5ZXJPZmZzZXQueSgp KTsKLSAgICAgICAgTGF5b3V0UmVjdCBmaWx0ZXJQYWludERpcnR5UmVjdCA9IGZpbHRlclBhaW50 ZXIucHJlcGFyZUZpbHRlckVmZmVjdCh0aGlzLCBjYWxjdWxhdGVMYXllckJvdW5kcyh0aGlzLCBy b290TGF5ZXIsIGZhbHNlLCBmYWxzZSksIHBhcmVudFBhaW50RGlydHlSZWN0LCBtX2ZpbHRlclJl cGFpbnRSZWN0KTsKLSAgICAgICAgbV9maWx0ZXJSZXBhaW50UmVjdCA9IEludFJlY3QoKTsKLSAg ICAgICAgLy8gUmV3aXJlIHRoZSBvbGQgY29udGV4dCB0byBhIG1lbW9yeSBidWZmZXIsIHNvIHRo YXQgd2UgY2FuIGNhcHR1cmUgdGhlIGNvbnRlbnRzIG9mIHRoZSBsYXllci4KLSAgICAgICAgLy8g Tk9URTogV2Ugc2F2ZWQgdGhlIG9sZCBjb250ZXh0IGluIHRoZSAidHJhbnNwYXJlbmN5TGF5ZXJD b250ZXh0IiBsb2NhbCB2YXJpYWJsZSwgdG8gYmUgYWJsZSB0byBzdGFydCBhIHRyYW5zcGFyZW5j eSBsYXllcgotICAgICAgICAvLyBvbiB0aGUgb3JpZ2luYWwgY29udGV4dCBhbmQgYXZvaWQgZHVw bGljYXRpbmcgImJlZ2luRmlsdGVyRWZmZWN0IiBhZnRlciBlYWNoIHRyYW5zcGFyZW55IGxheWVy IGNhbGwuIEFsc28sIG5vdGUgdGhhdCAKLSAgICAgICAgLy8gYmVnaW5UcmFuc3BhcmVuY3lMYXll cnMgd2lsbCBvbmx5IGNyZWF0ZSBhIHNpbmdsZSBsYXp5IHRyYW5zcGFyZW5jeSBsYXllciwgZXZl biB0aG91Z2ggaXQgaXMgY2FsbGVkIHR3aWNlIGluIHRoaXMgbWV0aG9kLgotICAgICAgICBjb250 ZXh0ID0gZmlsdGVyUGFpbnRlci5iZWdpbkZpbHRlckVmZmVjdChjb250ZXh0KTsKLSAgICAgICAg Ci0gICAgICAgIC8vIENoZWNrIHRoYXQgd2UgZGlkbid0IGZhaWwgdG8gYWxsb2NhdGUgdGhlIGdy YXBoaWNzIGNvbnRleHQgZm9yIHRoZSBvZmZzY3JlZW4gYnVmZmVyLgotICAgICAgICBpZiAoZmls dGVyUGFpbnRlci5oYXNTdGFydGVkRmlsdGVyRWZmZWN0KCkpIHsKLSAgICAgICAgICAgIHBhaW50 RGlydHlSZWN0ID0gZmlsdGVyUGFpbnREaXJ0eVJlY3Q7Ci0gICAgICAgICAgICAvLyBJZiB0aGUg ZmlsdGVyIG5lZWRzIHRoZSBmdWxsIHNvdXJjZSBpbWFnZSwgd2UgbmVlZCB0byBhdm9pZCB1c2lu ZyB0aGUgY2xpcCByZWN0YW5nbGVzLgotICAgICAgICAgICAgLy8gT3RoZXJ3aXNlLCBpZiBmb3Ig ZXhhbXBsZSB0aGlzIGxheWVyIGhhcyBvdmVyZmxvdzpoaWRkZW4sIGEgZHJvcCBzaGFkb3cgd2ls bCBub3QgY29tcHV0ZSBjb3JyZWN0bHkuCi0gICAgICAgICAgICAvLyBOb3RlIHRoYXQgd2Ugd2ls bCBzdGlsbCBhcHBseSB0aGUgY2xpcHBpbmcgb24gdGhlIGZpbmFsIHJlbmRlcmluZyBvZiB0aGUg ZmlsdGVyLgotICAgICAgICAgICAgdXNlQ2xpcFJlY3QgPSAhZmlsdGVyKCktPmhhc0ZpbHRlclRo YXRNb3Zlc1BpeGVscygpOworICAgICAgICBpZiAoZmlsdGVyUGFpbnRlci5wcmVwYXJlRmlsdGVy RWZmZWN0KHRoaXMsIGNhbGN1bGF0ZUxheWVyQm91bmRzKHRoaXMsIHJvb3RMYXllciwgZmFsc2Us IGZhbHNlKSwgcGFyZW50UGFpbnREaXJ0eVJlY3QsIG1fZmlsdGVyUmVwYWludFJlY3QpKSB7Cisg ICAgICAgICAgICAvLyBOb3cgd2Uga25vdyBmb3Igc3VyZSwgdGhhdCB0aGUgc291cmNlIGltYWdl IHdpbGwgYmUgdXBkYXRlZCwgc28gd2UgY2FuIHJldmVydCBvdXIgdHJhY2tpbmcgcmVwYWludCBy ZWN0IGJhY2sgdG8gemVyby4KKyAgICAgICAgICAgIG1fZmlsdGVyUmVwYWludFJlY3QgPSBJbnRS ZWN0KCk7CisKKyAgICAgICAgICAgIC8vIFJld2lyZSB0aGUgb2xkIGNvbnRleHQgdG8gYSBtZW1v cnkgYnVmZmVyLCBzbyB0aGF0IHdlIGNhbiBjYXB0dXJlIHRoZSBjb250ZW50cyBvZiB0aGUgbGF5 ZXIuCisgICAgICAgICAgICAvLyBOT1RFOiBXZSBzYXZlZCB0aGUgb2xkIGNvbnRleHQgaW4gdGhl ICJ0cmFuc3BhcmVuY3lMYXllckNvbnRleHQiIGxvY2FsIHZhcmlhYmxlLCB0byBiZSBhYmxlIHRv IHN0YXJ0IGEgdHJhbnNwYXJlbmN5IGxheWVyCisgICAgICAgICAgICAvLyBvbiB0aGUgb3JpZ2lu YWwgY29udGV4dCBhbmQgYXZvaWQgZHVwbGljYXRpbmcgImJlZ2luRmlsdGVyRWZmZWN0IiBhZnRl ciBlYWNoIHRyYW5zcGFyZW55IGxheWVyIGNhbGwuIEFsc28sIG5vdGUgdGhhdCAKKyAgICAgICAg ICAgIC8vIGJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzIHdpbGwgb25seSBjcmVhdGUgYSBzaW5nbGUg bGF6eSB0cmFuc3BhcmVuY3kgbGF5ZXIsIGV2ZW4gdGhvdWdoIGl0IGlzIGNhbGxlZCB0d2ljZSBp biB0aGlzIG1ldGhvZC4KKyAgICAgICAgICAgIGNvbnRleHQgPSBmaWx0ZXJQYWludGVyLmJlZ2lu RmlsdGVyRWZmZWN0KGNvbnRleHQpOworCisgICAgICAgICAgICAvLyBDaGVjayB0aGF0IHdlIGRp ZG4ndCBmYWlsIHRvIGFsbG9jYXRlIHRoZSBncmFwaGljcyBjb250ZXh0IGZvciB0aGUgb2Zmc2Ny ZWVuIGJ1ZmZlci4KKyAgICAgICAgICAgIGlmIChmaWx0ZXJQYWludGVyLmhhc1N0YXJ0ZWRGaWx0 ZXJFZmZlY3QoKSkgeworICAgICAgICAgICAgICAgIHBhaW50RGlydHlSZWN0ID0gZmlsdGVyUGFp bnRlci5yZXBhaW50UmVjdCgpOworICAgICAgICAgICAgICAgIC8vIElmIHRoZSBmaWx0ZXIgbmVl ZHMgdGhlIGZ1bGwgc291cmNlIGltYWdlLCB3ZSBuZWVkIHRvIGF2b2lkIHVzaW5nIHRoZSBjbGlw IHJlY3RhbmdsZXMuCisgICAgICAgICAgICAgICAgLy8gT3RoZXJ3aXNlLCBpZiBmb3IgZXhhbXBs ZSB0aGlzIGxheWVyIGhhcyBvdmVyZmxvdzpoaWRkZW4sIGEgZHJvcCBzaGFkb3cgd2lsbCBub3Qg Y29tcHV0ZSBjb3JyZWN0bHkuCisgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHdlIHdpbGwg c3RpbGwgYXBwbHkgdGhlIGNsaXBwaW5nIG9uIHRoZSBmaW5hbCByZW5kZXJpbmcgb2YgdGhlIGZp bHRlci4KKyAgICAgICAgICAgICAgICB1c2VDbGlwUmVjdCA9ICFmaWx0ZXIoKS0+aGFzRmlsdGVy VGhhdE1vdmVzUGl4ZWxzKCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAjZW5k aWYK 137736 2012-04-18 11:56:53 -0700 2012-04-18 11:56:53 -0700 QT Fix bug81263_qt_fix.patch text/plain 1528 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMmY5OWI1Li44NWU0NzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTItMDQtMTggIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgor CisgICAgICAgIFVucmV2aWV3ZWQsIHRyeWluZyB0byBmaXggUVQgYnVpbGQuCisgICAgICAgIAor ICAgICAgICBJdCB3YXMgdXNpbmcgYSBGaWx0ZXJFZmZlY3RSZW5kZXJlcjo6cHJlcGFyZSB0aGF0 IGNoYW5nZWQgdG8gYWxsb2NhdGVCYWNraW5nU3RvcmVJZk5lZWRlZCBpbiAxMTQ1MjkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckltYWdlQnVmZmVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVJbWFnZUJ1ZmZlcjo6YXBwbHlG aWx0ZXJzKToKKwogMjAxMi0wNC0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRyYWN0IHNjcmlwdCBuYXZpZ2F0b3Ig b3ZlcmxheSBsb2dpYyBpbnRvIHRoZSBzY3JpcHRzIG5hdmlnYXRvciBjb250cm9sbGVyLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJJbWFnZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckltYWdlQnVmZmVyLmNwcAppbmRleCA0YzI4MTc3Li4zYmQxZTcy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlckltYWdlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckltYWdlQnVmZmVyLmNwcApAQCAtMTE3LDcgKzEx Nyw3IEBAIHZvaWQgQml0bWFwVGV4dHVyZUltYWdlQnVmZmVyOjphcHBseUZpbHRlcnMoY29uc3Qg Qml0bWFwVGV4dHVyZSYgY29udGVudFRleHR1cmUsCiAKICAgICAvLyBUaGUgZG9jdW1lbnQgcGFy YW1ldGVyIGlzIG9ubHkgbmVlZGVkIGZvciBDU1Mgc2hhZGVycy4KICAgICByZW5kZXJlci0+YnVp bGQoMCAvKmRvY3VtZW50ICovLCBmaWx0ZXJzKTsKLSAgICByZW5kZXJlci0+cHJlcGFyZSgpOwor ICAgIHJlbmRlcmVyLT5hbGxvY2F0ZUJhY2tpbmdTdG9yZUlmTmVlZGVkKCk7CiAgICAgR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0ID0gcmVuZGVyZXItPmlucHV0Q29udGV4dCgpOwogICAgIGNvbnRl eHQtPmRyYXdJbWFnZUJ1ZmZlcihzdGF0aWNfY2FzdDxjb25zdCBCaXRtYXBUZXh0dXJlSW1hZ2VC dWZmZXImPihjb250ZW50VGV4dHVyZSkubV9pbWFnZS5nZXQoKSwgQ29sb3JTcGFjZURldmljZVJH QiwgSW50UG9pbnQ6Onplcm8oKSk7CiAgICAgcmVuZGVyZXItPmFwcGx5KCk7Cg==