88895 2012-06-12 11:30:29 -0700 [chromium] Don't set visible layer rect in CCLayerTreeHost paint iteration 2012-06-12 15:13:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne cc-bugs danakj enne epenner jamesr webkit.review.bot oldest_to_newest 647119 0 enne 2012-06-12 11:30:29 -0700 [chromium] Don't set visible layer rect in CCLayerTreeHost paint iteration 647123 1 147120 enne 2012-06-12 11:32:08 -0700 Created attachment 147120 Patch 647126 2 147120 danakj 2012-06-12 11:36:02 -0700 Comment on attachment 147120 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147120&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:840 > } else if (it.representsContributingRenderSurface()) { Can the root layer have a mask? (it won't be contributing) 647137 3 147126 enne 2012-06-12 11:46:19 -0700 Created attachment 147126 Handle root mask 647161 4 147126 danakj 2012-06-12 12:02:31 -0700 Comment on attachment 147126 Handle root mask View in context: https://bugs.webkit.org/attachment.cgi?id=147126&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:839 > + if (it.representsTargetRenderSurface()) { > + LayerType* maskLayer = it->maskLayer(); > + if (maskLayer) > + maskLayer->setVisibleLayerRect(IntRect(IntPoint(), it->contentBounds())); > + LayerType* replicaMaskLayer = it->replicaLayer() ? it->replicaLayer()->maskLayer() : 0; > + if (replicaMaskLayer) > + replicaMaskLayer->setVisibleLayerRect(IntRect(IntPoint(), it->contentBounds())); Cool, that's better. What do you think of a continue at the end of this block? The If/else situation is a bit confusing, and that might clear it up, letting us drop the else and un-nest that block below. Either way, the change looks correct to me. 647165 5 147132 enne 2012-06-12 12:12:25 -0700 Created attachment 147132 Conditional cleanup 647167 6 147132 danakj 2012-06-12 12:15:15 -0700 Comment on attachment 147132 Conditional cleanup This LGTM, thanks for the changes. The logic is changed a bit, and we won't have a visibleLayerRect set on layers that own a surface but don't drawContents themselves, but that is probably just fine. 647300 7 147132 jamesr 2012-06-12 14:08:20 -0700 Comment on attachment 147132 Conditional cleanup Nice! 647396 8 147132 webkit.review.bot 2012-06-12 15:13:07 -0700 Comment on attachment 147132 Conditional cleanup Clearing flags on attachment: 147132 Committed r120129: <http://trac.webkit.org/changeset/120129> 647397 9 webkit.review.bot 2012-06-12 15:13:12 -0700 All reviewed patches have been landed. Closing bug. 147120 2012-06-12 11:32:08 -0700 2012-06-12 11:46:15 -0700 Patch bug-88895-20120612113207.patch text/plain 3603 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBlMDQ0YWEwMWUzZjAx YjRhZDJjMTJhMDFmNzdjOTQwMTAwOTZkMS4uMmYxYjExYzNlZjMyOWY5MTExZGY5ODQxZGYwMzZh ZjkyM2U2ZjQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTEyICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBEb24n dCBzZXQgdmlzaWJsZSBsYXllciByZWN0IGluIENDTGF5ZXJUcmVlSG9zdCBwYWludCBpdGVyYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4ODk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hv dWxkIG9ubHkgc2V0IHZpc2libGUgbGF5ZXIgcmVjdHMgZHVyaW5nIHRoZSByZWN1cnNpb24gaW4K KyAgICAgICAgQ0NsYXllclRyZWVIb3N0Q29tbW9uIGFuZCBub3Qgd2hpbGUgd2UncmUgcGFpbnRp bmcuIFRoaXMgaXMgb25lIGxhc3QKKyAgICAgICAgc3RyYWdnbGluZyBwaWVjZSBvZiBjb2RlIHRo YXQgbmV2ZXIgZ290IG1vdmVkLgorCisgICAgICAgIFRlc3RlZCBieSBleGlzdGluZyBtYXNrLXJl bGF0ZWQgbGF5b3V0IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVl SG9zdDo6cGFpbnRNYXNrc0ZvclJlbmRlclN1cmZhY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjYWxjdWxhdGVWaXNpYmxlQW5kU2Npc3NvclJlY3RzSW50ZXJuYWwpOgorCiAyMDEy LTA2LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFsbG93IGNsZWFyaW5nIHJldmlzaW9uIGhpc3RvcnkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCBmNGY0ODJiZWE2N2M3NmI2YmUxNTA0NWUxN2Zl MWY5NjE3ODdiZjYxLi5hYmE0NTQ0Nzk1NTFiN2QxMGJmYTFiNWRhNmIxYjQyODQxZWZlMjFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTU4MywxNiArNTgzLDEyIEBAIHZv aWQgQ0NMYXllclRyZWVIb3N0OjpwYWludE1hc2tzRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9t aXVtKiByZW5kZXJTdXJmYWNlTGF5CiAgICAgLy8gbWFzayBhbmQgcmVwbGljYSBzaG91bGQgYmUg cGFpbnRlZC4KIAogICAgIExheWVyQ2hyb21pdW0qIG1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VM YXllci0+bWFza0xheWVyKCk7Ci0gICAgaWYgKG1hc2tMYXllcikgewotICAgICAgICBtYXNrTGF5 ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCByZW5kZXJTdXJmYWNl TGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgIGlmIChtYXNrTGF5ZXIpCiAgICAgICAgIHVw ZGF0ZShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgdXBkYXRlciwgMCk7Ci0gICAgfQogCiAgICAgTGF5 ZXJDaHJvbWl1bSogcmVwbGljYU1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VMYXllci0+cmVwbGlj YUxheWVyKCkgPyByZW5kZXJTdXJmYWNlTGF5ZXItPnJlcGxpY2FMYXllcigpLT5tYXNrTGF5ZXIo KSA6IDA7Ci0gICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpIHsKLSAgICAgICAgcmVwbGljYU1hc2tM YXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50KCksIHJlbmRlclN1cmZh Y2VMYXllci0+Y29udGVudEJvdW5kcygpKSk7CisgICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpCiAg ICAgICAgIHVwZGF0ZShyZXBsaWNhTWFza0xheWVyLCBwYWludFR5cGUsIHVwZGF0ZXIsIDApOwot ICAgIH0KIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnBhaW50TGF5ZXJDb250ZW50cyhjb25z dCBMYXllckxpc3QmIHJlbmRlclN1cmZhY2VMYXllckxpc3QsIFBhaW50VHlwZSBwYWludFR5cGUs IENDVGV4dHVyZVVwZGF0ZXImIHVwZGF0ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0Q29tbW9uLmNwcAppbmRleCA3ZGZjMjE2YzI4OGY5NTYwMjYxZGVkMGRhZDIzODdjZWUwMjgw MDEzLi4xNDM5ZmFhY2Y2YjE1NmY1MjZlYWUyZGRjNmVhYjFjMDJlNTk2NThkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKQEAgLTg0MCw2ICs4NDAsMTMgQEAg c3RhdGljIHZvaWQgY2FsY3VsYXRlVmlzaWJsZUFuZFNjaXNzb3JSZWN0c0ludGVybmFsKGNvbnN0 IExheWVyTGlzdCYgcmVuZGVyU3VyZmEKICAgICAgICAgfSBlbHNlIGlmIChpdC5yZXByZXNlbnRz Q29udHJpYnV0aW5nUmVuZGVyU3VyZmFjZSgpKSB7CiAgICAgICAgICAgICBJbnRSZWN0IHNjaXNz b3JSZWN0ID0gY2FsY3VsYXRlU3VyZmFjZVNjaXNzb3JSZWN0PExheWVyVHlwZSwgUmVuZGVyU3Vy ZmFjZVR5cGU+KCppdCwgcm9vdFNjaXNzb3JSZWN0KTsKICAgICAgICAgICAgIGl0LT5yZW5kZXJT dXJmYWNlKCktPnNldFNjaXNzb3JSZWN0KHNjaXNzb3JSZWN0KTsKKworICAgICAgICAgICAgTGF5 ZXJUeXBlKiBtYXNrTGF5ZXIgPSBpdC0+bWFza0xheWVyKCk7CisgICAgICAgICAgICBpZiAobWFz a0xheWVyKQorICAgICAgICAgICAgICAgIG1hc2tMYXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJ bnRSZWN0KEludFBvaW50KCksIGl0LT5jb250ZW50Qm91bmRzKCkpKTsKKyAgICAgICAgICAgIExh eWVyVHlwZSogcmVwbGljYU1hc2tMYXllciA9IGl0LT5yZXBsaWNhTGF5ZXIoKSA/IGl0LT5yZXBs aWNhTGF5ZXIoKS0+bWFza0xheWVyKCkgOiAwOworICAgICAgICAgICAgaWYgKHJlcGxpY2FNYXNr TGF5ZXIpCisgICAgICAgICAgICAgICAgcmVwbGljYU1hc2tMYXllci0+c2V0VmlzaWJsZUxheWVy UmVjdChJbnRSZWN0KEludFBvaW50KCksIGl0LT5jb250ZW50Qm91bmRzKCkpKTsKICAgICAgICAg fQogICAgIH0KIH0K 147126 2012-06-12 11:46:19 -0700 2012-06-12 12:12:22 -0700 Handle root mask bug-88895-20120612114618.patch text/plain 3788 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBlMDQ0YWEwMWUzZjAx YjRhZDJjMTJhMDFmNzdjOTQwMTAwOTZkMS4uMmYxYjExYzNlZjMyOWY5MTExZGY5ODQxZGYwMzZh ZjkyM2U2ZjQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTEyICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBEb24n dCBzZXQgdmlzaWJsZSBsYXllciByZWN0IGluIENDTGF5ZXJUcmVlSG9zdCBwYWludCBpdGVyYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4ODk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hv dWxkIG9ubHkgc2V0IHZpc2libGUgbGF5ZXIgcmVjdHMgZHVyaW5nIHRoZSByZWN1cnNpb24gaW4K KyAgICAgICAgQ0NsYXllclRyZWVIb3N0Q29tbW9uIGFuZCBub3Qgd2hpbGUgd2UncmUgcGFpbnRp bmcuIFRoaXMgaXMgb25lIGxhc3QKKyAgICAgICAgc3RyYWdnbGluZyBwaWVjZSBvZiBjb2RlIHRo YXQgbmV2ZXIgZ290IG1vdmVkLgorCisgICAgICAgIFRlc3RlZCBieSBleGlzdGluZyBtYXNrLXJl bGF0ZWQgbGF5b3V0IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVl SG9zdDo6cGFpbnRNYXNrc0ZvclJlbmRlclN1cmZhY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjYWxjdWxhdGVWaXNpYmxlQW5kU2Npc3NvclJlY3RzSW50ZXJuYWwpOgorCiAyMDEy LTA2LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFsbG93IGNsZWFyaW5nIHJldmlzaW9uIGhpc3RvcnkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCBmNGY0ODJiZWE2N2M3NmI2YmUxNTA0NWUxN2Zl MWY5NjE3ODdiZjYxLi5hYmE0NTQ0Nzk1NTFiN2QxMGJmYTFiNWRhNmIxYjQyODQxZWZlMjFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTU4MywxNiArNTgzLDEyIEBAIHZv aWQgQ0NMYXllclRyZWVIb3N0OjpwYWludE1hc2tzRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9t aXVtKiByZW5kZXJTdXJmYWNlTGF5CiAgICAgLy8gbWFzayBhbmQgcmVwbGljYSBzaG91bGQgYmUg cGFpbnRlZC4KIAogICAgIExheWVyQ2hyb21pdW0qIG1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VM YXllci0+bWFza0xheWVyKCk7Ci0gICAgaWYgKG1hc2tMYXllcikgewotICAgICAgICBtYXNrTGF5 ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCByZW5kZXJTdXJmYWNl TGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgIGlmIChtYXNrTGF5ZXIpCiAgICAgICAgIHVw ZGF0ZShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgdXBkYXRlciwgMCk7Ci0gICAgfQogCiAgICAgTGF5 ZXJDaHJvbWl1bSogcmVwbGljYU1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VMYXllci0+cmVwbGlj YUxheWVyKCkgPyByZW5kZXJTdXJmYWNlTGF5ZXItPnJlcGxpY2FMYXllcigpLT5tYXNrTGF5ZXIo KSA6IDA7Ci0gICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpIHsKLSAgICAgICAgcmVwbGljYU1hc2tM YXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50KCksIHJlbmRlclN1cmZh Y2VMYXllci0+Y29udGVudEJvdW5kcygpKSk7CisgICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpCiAg ICAgICAgIHVwZGF0ZShyZXBsaWNhTWFza0xheWVyLCBwYWludFR5cGUsIHVwZGF0ZXIsIDApOwot ICAgIH0KIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnBhaW50TGF5ZXJDb250ZW50cyhjb25z dCBMYXllckxpc3QmIHJlbmRlclN1cmZhY2VMYXllckxpc3QsIFBhaW50VHlwZSBwYWludFR5cGUs IENDVGV4dHVyZVVwZGF0ZXImIHVwZGF0ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0Q29tbW9uLmNwcAppbmRleCA3ZGZjMjE2YzI4OGY5NTYwMjYxZGVkMGRhZDIzODdjZWUwMjgw MDEzLi4yZTBmYjNkZWQ2YjcxNjQxNWE0MGQxYTVkMTI3OGI2ZWEzZTdiOTZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKQEAgLTgzMCw3ICs4MzAsMTQgQEAg c3RhdGljIHZvaWQgY2FsY3VsYXRlVmlzaWJsZUFuZFNjaXNzb3JSZWN0c0ludGVybmFsKGNvbnN0 IExheWVyTGlzdCYgcmVuZGVyU3VyZmEKIAogICAgIENDTGF5ZXJJdGVyYXRvclR5cGUgZW5kID0g Q0NMYXllckl0ZXJhdG9yVHlwZTo6ZW5kKCZyZW5kZXJTdXJmYWNlTGF5ZXJMaXN0KTsKICAgICBm b3IgKENDTGF5ZXJJdGVyYXRvclR5cGUgaXQgPSBDQ0xheWVySXRlcmF0b3JUeXBlOjpiZWdpbigm cmVuZGVyU3VyZmFjZUxheWVyTGlzdCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBpZiAo IWl0LnJlcHJlc2VudHNUYXJnZXRSZW5kZXJTdXJmYWNlKCkpIHsKKyAgICAgICAgaWYgKGl0LnJl cHJlc2VudHNUYXJnZXRSZW5kZXJTdXJmYWNlKCkpIHsKKyAgICAgICAgICAgIExheWVyVHlwZSog bWFza0xheWVyID0gaXQtPm1hc2tMYXllcigpOworICAgICAgICAgICAgaWYgKG1hc2tMYXllcikK KyAgICAgICAgICAgICAgICBtYXNrTGF5ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCBpdC0+Y29udGVudEJvdW5kcygpKSk7CisgICAgICAgICAgICBMYXllclR5cGUq IHJlcGxpY2FNYXNrTGF5ZXIgPSBpdC0+cmVwbGljYUxheWVyKCkgPyBpdC0+cmVwbGljYUxheWVy KCktPm1hc2tMYXllcigpIDogMDsKKyAgICAgICAgICAgIGlmIChyZXBsaWNhTWFza0xheWVyKQor ICAgICAgICAgICAgICAgIHJlcGxpY2FNYXNrTGF5ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50 UmVjdChJbnRQb2ludCgpLCBpdC0+Y29udGVudEJvdW5kcygpKSk7CisgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICBJbnRSZWN0IHZpc2libGVMYXllclJlY3QgPSBjYWxjdWxhdGVWaXNpYmxl TGF5ZXJSZWN0KCppdCk7CiAgICAgICAgICAgICBpdC0+c2V0VmlzaWJsZUxheWVyUmVjdCh2aXNp YmxlTGF5ZXJSZWN0KTsKICAgICAgICAgfQo= 147132 2012-06-12 12:12:25 -0700 2012-06-12 15:13:07 -0700 Conditional cleanup bug-88895-20120612121224.patch text/plain 4080 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBlMDQ0YWEwMWUzZjAx YjRhZDJjMTJhMDFmNzdjOTQwMTAwOTZkMS4uMmYxYjExYzNlZjMyOWY5MTExZGY5ODQxZGYwMzZh ZjkyM2U2ZjQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTEyICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBEb24n dCBzZXQgdmlzaWJsZSBsYXllciByZWN0IGluIENDTGF5ZXJUcmVlSG9zdCBwYWludCBpdGVyYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4ODk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2hv dWxkIG9ubHkgc2V0IHZpc2libGUgbGF5ZXIgcmVjdHMgZHVyaW5nIHRoZSByZWN1cnNpb24gaW4K KyAgICAgICAgQ0NsYXllclRyZWVIb3N0Q29tbW9uIGFuZCBub3Qgd2hpbGUgd2UncmUgcGFpbnRp bmcuIFRoaXMgaXMgb25lIGxhc3QKKyAgICAgICAgc3RyYWdnbGluZyBwaWVjZSBvZiBjb2RlIHRo YXQgbmV2ZXIgZ290IG1vdmVkLgorCisgICAgICAgIFRlc3RlZCBieSBleGlzdGluZyBtYXNrLXJl bGF0ZWQgbGF5b3V0IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVl SG9zdDo6cGFpbnRNYXNrc0ZvclJlbmRlclN1cmZhY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjYWxjdWxhdGVWaXNpYmxlQW5kU2Npc3NvclJlY3RzSW50ZXJuYWwpOgorCiAyMDEy LTA2LTEyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFsbG93IGNsZWFyaW5nIHJldmlzaW9uIGhpc3RvcnkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCBmNGY0ODJiZWE2N2M3NmI2YmUxNTA0NWUxN2Zl MWY5NjE3ODdiZjYxLi5hYmE0NTQ0Nzk1NTFiN2QxMGJmYTFiNWRhNmIxYjQyODQxZWZlMjFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTU4MywxNiArNTgzLDEyIEBAIHZv aWQgQ0NMYXllclRyZWVIb3N0OjpwYWludE1hc2tzRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9t aXVtKiByZW5kZXJTdXJmYWNlTGF5CiAgICAgLy8gbWFzayBhbmQgcmVwbGljYSBzaG91bGQgYmUg cGFpbnRlZC4KIAogICAgIExheWVyQ2hyb21pdW0qIG1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VM YXllci0+bWFza0xheWVyKCk7Ci0gICAgaWYgKG1hc2tMYXllcikgewotICAgICAgICBtYXNrTGF5 ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCByZW5kZXJTdXJmYWNl TGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgIGlmIChtYXNrTGF5ZXIpCiAgICAgICAgIHVw ZGF0ZShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgdXBkYXRlciwgMCk7Ci0gICAgfQogCiAgICAgTGF5 ZXJDaHJvbWl1bSogcmVwbGljYU1hc2tMYXllciA9IHJlbmRlclN1cmZhY2VMYXllci0+cmVwbGlj YUxheWVyKCkgPyByZW5kZXJTdXJmYWNlTGF5ZXItPnJlcGxpY2FMYXllcigpLT5tYXNrTGF5ZXIo KSA6IDA7Ci0gICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpIHsKLSAgICAgICAgcmVwbGljYU1hc2tM YXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50KCksIHJlbmRlclN1cmZh Y2VMYXllci0+Y29udGVudEJvdW5kcygpKSk7CisgICAgaWYgKHJlcGxpY2FNYXNrTGF5ZXIpCiAg ICAgICAgIHVwZGF0ZShyZXBsaWNhTWFza0xheWVyLCBwYWludFR5cGUsIHVwZGF0ZXIsIDApOwot ICAgIH0KIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnBhaW50TGF5ZXJDb250ZW50cyhjb25z dCBMYXllckxpc3QmIHJlbmRlclN1cmZhY2VMYXllckxpc3QsIFBhaW50VHlwZSBwYWludFR5cGUs IENDVGV4dHVyZVVwZGF0ZXImIHVwZGF0ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0Q29tbW9uLmNwcAppbmRleCA3ZGZjMjE2YzI4OGY5NTYwMjYxZGVkMGRhZDIzODdjZWUwMjgw MDEzLi43MDE5YTZkMjYzZjQ1ZTM5ZGE4NTlhMjQwNmQ3YzhiNzhlNzNiOTAwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKQEAgLTgzMCwxMSArODMwLDE3IEBA IHN0YXRpYyB2b2lkIGNhbGN1bGF0ZVZpc2libGVBbmRTY2lzc29yUmVjdHNJbnRlcm5hbChjb25z dCBMYXllckxpc3QmIHJlbmRlclN1cmZhCiAKICAgICBDQ0xheWVySXRlcmF0b3JUeXBlIGVuZCA9 IENDTGF5ZXJJdGVyYXRvclR5cGU6OmVuZCgmcmVuZGVyU3VyZmFjZUxheWVyTGlzdCk7CiAgICAg Zm9yIChDQ0xheWVySXRlcmF0b3JUeXBlIGl0ID0gQ0NMYXllckl0ZXJhdG9yVHlwZTo6YmVnaW4o JnJlbmRlclN1cmZhY2VMYXllckxpc3QpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgaWYg KCFpdC5yZXByZXNlbnRzVGFyZ2V0UmVuZGVyU3VyZmFjZSgpKSB7CisgICAgICAgIGlmIChpdC5y ZXByZXNlbnRzVGFyZ2V0UmVuZGVyU3VyZmFjZSgpKSB7CisgICAgICAgICAgICBMYXllclR5cGUq IG1hc2tMYXllciA9IGl0LT5tYXNrTGF5ZXIoKTsKKyAgICAgICAgICAgIGlmIChtYXNrTGF5ZXIp CisgICAgICAgICAgICAgICAgbWFza0xheWVyLT5zZXRWaXNpYmxlTGF5ZXJSZWN0KEludFJlY3Qo SW50UG9pbnQoKSwgaXQtPmNvbnRlbnRCb3VuZHMoKSkpOworICAgICAgICAgICAgTGF5ZXJUeXBl KiByZXBsaWNhTWFza0xheWVyID0gaXQtPnJlcGxpY2FMYXllcigpID8gaXQtPnJlcGxpY2FMYXll cigpLT5tYXNrTGF5ZXIoKSA6IDA7CisgICAgICAgICAgICBpZiAocmVwbGljYU1hc2tMYXllcikK KyAgICAgICAgICAgICAgICByZXBsaWNhTWFza0xheWVyLT5zZXRWaXNpYmxlTGF5ZXJSZWN0KElu dFJlY3QoSW50UG9pbnQoKSwgaXQtPmNvbnRlbnRCb3VuZHMoKSkpOworICAgICAgICB9IGVsc2Ug aWYgKGl0LnJlcHJlc2VudHNJdHNlbGYoKSkgewogICAgICAgICAgICAgSW50UmVjdCB2aXNpYmxl TGF5ZXJSZWN0ID0gY2FsY3VsYXRlVmlzaWJsZUxheWVyUmVjdCgqaXQpOwogICAgICAgICAgICAg aXQtPnNldFZpc2libGVMYXllclJlY3QodmlzaWJsZUxheWVyUmVjdCk7Ci0gICAgICAgIH0KLSAg ICAgICAgaWYgKGl0LnJlcHJlc2VudHNJdHNlbGYoKSkgeworCiAgICAgICAgICAgICBJbnRSZWN0 IHNjaXNzb3JSZWN0ID0gY2FsY3VsYXRlTGF5ZXJTY2lzc29yUmVjdDxMYXllclR5cGUsIFJlbmRl clN1cmZhY2VUeXBlPigqaXQsIHJvb3RTY2lzc29yUmVjdCk7CiAgICAgICAgICAgICBpdC0+c2V0 U2Npc3NvclJlY3Qoc2Npc3NvclJlY3QpOwogICAgICAgICB9IGVsc2UgaWYgKGl0LnJlcHJlc2Vu dHNDb250cmlidXRpbmdSZW5kZXJTdXJmYWNlKCkpIHsK