83504 2012-04-09 13:32:26 -0700 [chromium] Replica layers are not drawn, so should not be painted 2012-04-09 20:11:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj backer cc-bugs enne jamesr piman vangelis webkit.review.bot oldest_to_newest 598571 0 danakj 2012-04-09 13:32:26 -0700 [chromium] Don't waste time trying to paint replica layers 598573 1 danakj 2012-04-09 13:36:20 -0700 We attempt to paint replica layers when we are painting the mask layers in CCLayerTreeHost.cpp. This is useless code, replica layers have drawsContent() == false, and have an empty visibleLayerRect, so the paint functions end up early-outting. But it is a waste of time to try, and confusing to have this attempted in the code at all, since the replica layers are never drawn. They exist only for their transforms. Also the dimensions used for the mask are different from the surface mask, which is confusing and unnecessary as well. The mask is applied to the same surface contents as the surface mask would be, so only the surface's contentBounds need to be painted in the replica mask. 598579 2 136297 danakj 2012-04-09 13:42:03 -0700 Created attachment 136297 Patch 598585 3 136297 jamesr 2012-04-09 13:47:02 -0700 Comment on attachment 136297 Patch Seems like paintMaskAndReplicaForRenderSurface() needs a rename, no? 598588 4 136300 danakj 2012-04-09 13:50:45 -0700 Created attachment 136300 Patch yes! 598606 5 136300 jamesr 2012-04-09 14:23:21 -0700 Comment on attachment 136300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136300&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp:531 > + LayerChromium* maskLayer = replicaLayer->maskLayer(); this shadows the earlier local which is a bit weird (and I wouldn't be surprised if triggered a warning on some pedantic compiler somewhere). Can you: *) reuse the local *) pick another name *) refactor shared code into a helper so we don't have to duplicate this block? 598658 6 danakj 2012-04-09 15:10:44 -0700 done, renamed to replicaMaskLayer. 598659 7 136313 danakj 2012-04-09 15:10:56 -0700 Created attachment 136313 Patch for landing 598942 8 136313 webkit.review.bot 2012-04-09 20:11:54 -0700 Comment on attachment 136313 Patch for landing Clearing flags on attachment: 136313 Committed r113668: <http://trac.webkit.org/changeset/113668> 598943 9 webkit.review.bot 2012-04-09 20:11:59 -0700 All reviewed patches have been landed. Closing bug. 136297 2012-04-09 13:42:03 -0700 2012-04-09 13:50:42 -0700 Patch bug-83504-20120409164202.patch text/plain 3544 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNlZDg3NzIxZDlmZmFl NTRlNDg1OTlhNjRlZjc5Nzk5YmM1M2Q1OS4uZTFhYzNlOTcyZGNlMmI3NzI0Y2Q2NzNlZjM3NTJl NmZjMmVmM2IwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA0LTA5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVw bGljYSBsYXllcnMgYXJlIG5vdCBkcmF3biwgc28gc2hvdWxkIG5vdCBiZSBwYWludGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzUwNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGF0dGVtcHQgdG8g cGFpbnQgcmVwbGljYSBsYXllcnMgd2hlbiB3ZSBhcmUgcGFpbnRpbmcgdGhlIG1hc2sgbGF5ZXJz CisgICAgICAgIGluIENDTGF5ZXJUcmVlSG9zdC5jcHAuCisKKyAgICAgICAgVGhpcyBpcyB1c2Vs ZXNzIGNvZGUsIHJlcGxpY2EgbGF5ZXJzIGhhdmUgZHJhd3NDb250ZW50KCkgPT0gZmFsc2UsIGFu ZAorICAgICAgICBoYXZlIGFuIGVtcHR5IHZpc2libGVMYXllclJlY3QsIHNvIHRoZSBwYWludCBm dW5jdGlvbnMgZW5kIHVwIGVhcmx5LQorICAgICAgICBvdXR0aW5nLiBCdXQgaXQgaXMgYSB3YXN0 ZSBvZiB0aW1lIHRvIHRyeSwgYW5kIGNvbmZ1c2luZyB0byBoYXZlCisgICAgICAgIHRoaXMgYXR0 ZW1wdGVkIGluIHRoZSBjb2RlIGF0IGFsbCwgc2luY2UgdGhlIHJlcGxpY2EgbGF5ZXJzIGFyZSBu ZXZlcgorICAgICAgICBkcmF3bi4gVGhleSBleGlzdCBvbmx5IGZvciB0aGVpciB0cmFuc2Zvcm1z LgorCisgICAgICAgIEFsc28gdGhlIGRpbWVuc2lvbnMgdXNlZCBmb3IgdGhlIHJlcGxpY2EgbWFz ayBhcmUgZGlmZmVyZW50IGZyb20gdGhlCisgICAgICAgIHN1cmZhY2UgbWFzaywgd2hpY2ggaXMg Y29uZnVzaW5nIGFuZCB1bm5lY2Vzc2FyeSBhcyB3ZWxsLiBUaGUgbWFzayBpcworICAgICAgICBh cHBsaWVkIHRvIHRoZSBzYW1lIHN1cmZhY2UgY29udGVudHMgYXMgdGhlIHN1cmZhY2UgbWFzayB3 b3VsZCBiZSwgc28KKyAgICAgICAgb25seSB0aGUgc3VyZmFjZSdzIGNvbnRlbnRCb3VuZHMgbmVl ZCB0byBiZSBwYWludGVkIGluIHRoZSByZXBsaWNhCisgICAgICAgIG1hc2suCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xh eWVyVHJlZUhvc3Q6OnBhaW50TWFza0FuZFJlcGxpY2FGb3JSZW5kZXJTdXJmYWNlKToKKwogMjAx Mi0wNC0wOSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IENyYXNoIGR1ZSB0byBmbG9hdHMgbm90IGNsZWFyZWQgYmVmb3JlIHN0YXJ0aW5nIFNWRyA8dGV4 dD4gbGF5b3V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggOGRjOWI0ZjNk MDJhOTZiMWFkNzFhNmE1YmRiZjFkYTE4NWM1MWRiYy4uNTY3N2E0OWIxZWI0MzkzZmNiNWU0OWI1 ZWU0OTQ2Y2E5ODA4MjBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC01 MjAsMjAgKzUyMCwxOCBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6cGFpbnRNYXNrQW5kUmVwbGlj YUZvclJlbmRlclN1cmZhY2UoTGF5ZXJDaHJvbWl1bSogcmVuZGVyUwogICAgIC8vIGluIGNvZGUs IHdlIGFscmVhZHkga25vdyB0aGF0IGF0IGxlYXN0IHNvbWV0aGluZyB3aWxsIGJlIGRyYXduIGlu dG8gdGhpcyByZW5kZXIgc3VyZmFjZSwgc28gdGhlCiAgICAgLy8gbWFzayBhbmQgcmVwbGljYSBz aG91bGQgYmUgcGFpbnRlZC4KIAotICAgIC8vIEZJWE1FOiBJZiB0aGUgc3VyZmFjZSBoYXMgYSBy ZXBsaWNhLCBpdCBzaG91bGQgYmUgcGFpbnRlZCB3aXRoIG9jY2x1c2lvbiB0aGF0IGV4Y2x1ZGVz IHRoZSBjdXJyZW50IHRhcmdldCBzdXJmYWNlIHN1YnRyZWUuCi0KLSAgICBpZiAocmVuZGVyU3Vy ZmFjZUxheWVyLT5tYXNrTGF5ZXIoKSkgewotICAgICAgICByZW5kZXJTdXJmYWNlTGF5ZXItPm1h c2tMYXllcigpLT5zZXRWaXNpYmxlTGF5ZXJSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgcmVuZGVy U3VyZmFjZUxheWVyLT5jb250ZW50Qm91bmRzKCkpKTsKLSAgICAgICAgcGFpbnRDb250ZW50c0lm RGlydHkocmVuZGVyU3VyZmFjZUxheWVyLT5tYXNrTGF5ZXIoKSwgcGFpbnRUeXBlLCAwKTsKKyAg ICBMYXllckNocm9taXVtKiBtYXNrTGF5ZXIgPSByZW5kZXJTdXJmYWNlTGF5ZXItPm1hc2tMYXll cigpOworICAgIGlmIChtYXNrTGF5ZXIpIHsKKyAgICAgICAgbWFza0xheWVyLT5zZXRWaXNpYmxl TGF5ZXJSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgcmVuZGVyU3VyZmFjZUxheWVyLT5jb250ZW50 Qm91bmRzKCkpKTsKKyAgICAgICAgcGFpbnRDb250ZW50c0lmRGlydHkobWFza0xheWVyLCBwYWlu dFR5cGUsIDApOwogICAgIH0KIAogICAgIExheWVyQ2hyb21pdW0qIHJlcGxpY2FMYXllciA9IHJl bmRlclN1cmZhY2VMYXllci0+cmVwbGljYUxheWVyKCk7CiAgICAgaWYgKHJlcGxpY2FMYXllcikg ewotICAgICAgICBwYWludENvbnRlbnRzSWZEaXJ0eShyZXBsaWNhTGF5ZXIsIHBhaW50VHlwZSwg MCk7Ci0KLSAgICAgICAgaWYgKHJlcGxpY2FMYXllci0+bWFza0xheWVyKCkpIHsKLSAgICAgICAg ICAgIHJlcGxpY2FMYXllci0+bWFza0xheWVyKCktPnNldFZpc2libGVMYXllclJlY3QoSW50UmVj dChJbnRQb2ludCgpLCByZXBsaWNhTGF5ZXItPm1hc2tMYXllcigpLT5jb250ZW50Qm91bmRzKCkp KTsKLSAgICAgICAgICAgIHBhaW50Q29udGVudHNJZkRpcnR5KHJlcGxpY2FMYXllci0+bWFza0xh eWVyKCksIHBhaW50VHlwZSwgMCk7CisgICAgICAgIExheWVyQ2hyb21pdW0qIG1hc2tMYXllciA9 IHJlcGxpY2FMYXllci0+bWFza0xheWVyKCk7CisgICAgICAgIGlmIChtYXNrTGF5ZXIpIHsKKyAg ICAgICAgICAgIG1hc2tMYXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50 KCksIHJlbmRlclN1cmZhY2VMYXllci0+Y29udGVudEJvdW5kcygpKSk7CisgICAgICAgICAgICBw YWludENvbnRlbnRzSWZEaXJ0eShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgMCk7CiAgICAgICAgIH0K ICAgICB9CiB9Cg== 136300 2012-04-09 13:50:45 -0700 2012-04-09 15:10:51 -0700 Patch bug-83504-20120409165044.patch text/plain 5410 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNlZDg3NzIxZDlmZmFl NTRlNDg1OTlhNjRlZjc5Nzk5YmM1M2Q1OS4uNTViYzgzOWFiMmZiMzVmODY0YjcxNjdjMTExNDlj YzRlOWM5MzY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTA5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVw bGljYSBsYXllcnMgYXJlIG5vdCBkcmF3biwgc28gc2hvdWxkIG5vdCBiZSBwYWludGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzUwNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGF0dGVtcHQgdG8g cGFpbnQgcmVwbGljYSBsYXllcnMgd2hlbiB3ZSBhcmUgcGFpbnRpbmcgdGhlIG1hc2sgbGF5ZXJz CisgICAgICAgIGluIENDTGF5ZXJUcmVlSG9zdC5jcHAuCisKKyAgICAgICAgVGhpcyBpcyB1c2Vs ZXNzIGNvZGUsIHJlcGxpY2EgbGF5ZXJzIGhhdmUgZHJhd3NDb250ZW50KCkgPT0gZmFsc2UsIGFu ZAorICAgICAgICBoYXZlIGFuIGVtcHR5IHZpc2libGVMYXllclJlY3QsIHNvIHRoZSBwYWludCBm dW5jdGlvbnMgZW5kIHVwIGVhcmx5LQorICAgICAgICBvdXR0aW5nLiBCdXQgaXQgaXMgYSB3YXN0 ZSBvZiB0aW1lIHRvIHRyeSwgYW5kIGNvbmZ1c2luZyB0byBoYXZlCisgICAgICAgIHRoaXMgYXR0 ZW1wdGVkIGluIHRoZSBjb2RlIGF0IGFsbCwgc2luY2UgdGhlIHJlcGxpY2EgbGF5ZXJzIGFyZSBu ZXZlcgorICAgICAgICBkcmF3bi4gVGhleSBleGlzdCBvbmx5IGZvciB0aGVpciB0cmFuc2Zvcm1z LgorCisgICAgICAgIEFsc28gdGhlIGRpbWVuc2lvbnMgdXNlZCBmb3IgdGhlIHJlcGxpY2EgbWFz ayBhcmUgZGlmZmVyZW50IGZyb20gdGhlCisgICAgICAgIHN1cmZhY2UgbWFzaywgd2hpY2ggaXMg Y29uZnVzaW5nIGFuZCB1bm5lY2Vzc2FyeSBhcyB3ZWxsLiBUaGUgbWFzayBpcworICAgICAgICBh cHBsaWVkIHRvIHRoZSBzYW1lIHN1cmZhY2UgY29udGVudHMgYXMgdGhlIHN1cmZhY2UgbWFzayB3 b3VsZCBiZSwgc28KKyAgICAgICAgb25seSB0aGUgc3VyZmFjZSdzIGNvbnRlbnRCb3VuZHMgbmVl ZCB0byBiZSBwYWludGVkIGluIHRoZSByZXBsaWNhCisgICAgICAgIG1hc2suCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xh eWVyVHJlZUhvc3Q6OnBhaW50TWFza3NGb3JSZW5kZXJTdXJmYWNlKToKKyAgICAgICAgKFdlYkNv cmU6OkNDTGF5ZXJUcmVlSG9zdDo6cGFpbnRMYXllckNvbnRlbnRzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKwogMjAxMi0wNC0w OSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENyYXNo IGR1ZSB0byBmbG9hdHMgbm90IGNsZWFyZWQgYmVmb3JlIHN0YXJ0aW5nIFNWRyA8dGV4dD4gbGF5 b3V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggOGRjOWI0ZjNkMDJhOTZi MWFkNzFhNmE1YmRiZjFkYTE4NWM1MWRiYy4uMTY1ZmUxNzcyMDgxMTMyMTFkMTlkZjU2Y2M5YjM4 ZDFjZTJhNWU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC01MTQsMjYg KzUxNCwyNCBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6cGFpbnRDb250ZW50c0lmRGlydHkoTGF5 ZXJDaHJvbWl1bSogbGF5ZXIsIFBhaW50VHlwZSBwYWludAogICAgICAgICBsYXllci0+aWRsZVBh aW50Q29udGVudHNJZkRpcnR5KG9jY2x1c2lvbik7CiB9CiAKLXZvaWQgQ0NMYXllclRyZWVIb3N0 OjpwYWludE1hc2tBbmRSZXBsaWNhRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9taXVtKiByZW5k ZXJTdXJmYWNlTGF5ZXIsIFBhaW50VHlwZSBwYWludFR5cGUpCit2b2lkIENDTGF5ZXJUcmVlSG9z dDo6cGFpbnRNYXNrc0ZvclJlbmRlclN1cmZhY2UoTGF5ZXJDaHJvbWl1bSogcmVuZGVyU3VyZmFj ZUxheWVyLCBQYWludFR5cGUgcGFpbnRUeXBlKQogewogICAgIC8vIE5vdGU6IE1hc2tzIGFuZCBy ZXBsaWNhcyBvbmx5IGV4aXN0IGZvciBsYXllcnMgdGhhdCBvd24gcmVuZGVyIHN1cmZhY2VzLiBJ ZiB3ZSByZWFjaCB0aGlzIHBvaW50CiAgICAgLy8gaW4gY29kZSwgd2UgYWxyZWFkeSBrbm93IHRo YXQgYXQgbGVhc3Qgc29tZXRoaW5nIHdpbGwgYmUgZHJhd24gaW50byB0aGlzIHJlbmRlciBzdXJm YWNlLCBzbyB0aGUKICAgICAvLyBtYXNrIGFuZCByZXBsaWNhIHNob3VsZCBiZSBwYWludGVkLgog Ci0gICAgLy8gRklYTUU6IElmIHRoZSBzdXJmYWNlIGhhcyBhIHJlcGxpY2EsIGl0IHNob3VsZCBi ZSBwYWludGVkIHdpdGggb2NjbHVzaW9uIHRoYXQgZXhjbHVkZXMgdGhlIGN1cnJlbnQgdGFyZ2V0 IHN1cmZhY2Ugc3VidHJlZS4KLQotICAgIGlmIChyZW5kZXJTdXJmYWNlTGF5ZXItPm1hc2tMYXll cigpKSB7Ci0gICAgICAgIHJlbmRlclN1cmZhY2VMYXllci0+bWFza0xheWVyKCktPnNldFZpc2li bGVMYXllclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPmNvbnRl bnRCb3VuZHMoKSkpOwotICAgICAgICBwYWludENvbnRlbnRzSWZEaXJ0eShyZW5kZXJTdXJmYWNl TGF5ZXItPm1hc2tMYXllcigpLCBwYWludFR5cGUsIDApOworICAgIExheWVyQ2hyb21pdW0qIG1h c2tMYXllciA9IHJlbmRlclN1cmZhY2VMYXllci0+bWFza0xheWVyKCk7CisgICAgaWYgKG1hc2tM YXllcikgeworICAgICAgICBtYXNrTGF5ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgICAg ICBwYWludENvbnRlbnRzSWZEaXJ0eShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgMCk7CiAgICAgfQog CiAgICAgTGF5ZXJDaHJvbWl1bSogcmVwbGljYUxheWVyID0gcmVuZGVyU3VyZmFjZUxheWVyLT5y ZXBsaWNhTGF5ZXIoKTsKICAgICBpZiAocmVwbGljYUxheWVyKSB7Ci0gICAgICAgIHBhaW50Q29u dGVudHNJZkRpcnR5KHJlcGxpY2FMYXllciwgcGFpbnRUeXBlLCAwKTsKLQotICAgICAgICBpZiAo cmVwbGljYUxheWVyLT5tYXNrTGF5ZXIoKSkgewotICAgICAgICAgICAgcmVwbGljYUxheWVyLT5t YXNrTGF5ZXIoKS0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50KCksIHJlcGxp Y2FMYXllci0+bWFza0xheWVyKCktPmNvbnRlbnRCb3VuZHMoKSkpOwotICAgICAgICAgICAgcGFp bnRDb250ZW50c0lmRGlydHkocmVwbGljYUxheWVyLT5tYXNrTGF5ZXIoKSwgcGFpbnRUeXBlLCAw KTsKKyAgICAgICAgTGF5ZXJDaHJvbWl1bSogbWFza0xheWVyID0gcmVwbGljYUxheWVyLT5tYXNr TGF5ZXIoKTsKKyAgICAgICAgaWYgKG1hc2tMYXllcikgeworICAgICAgICAgICAgbWFza0xheWVy LT5zZXRWaXNpYmxlTGF5ZXJSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgcmVuZGVyU3VyZmFjZUxh eWVyLT5jb250ZW50Qm91bmRzKCkpKTsKKyAgICAgICAgICAgIHBhaW50Q29udGVudHNJZkRpcnR5 KG1hc2tMYXllciwgcGFpbnRUeXBlLCAwKTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTU1Myw3 ICs1NTEsNyBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6cGFpbnRMYXllckNvbnRlbnRzKGNvbnN0 IExheWVyTGlzdCYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdAogICAgICAgICAgICAgQVNTRVJUKGl0 LT5yZW5kZXJTdXJmYWNlKCktPmRyYXdPcGFjaXR5KCkgfHwgaXQtPnJlbmRlclN1cmZhY2UoKS0+ ZHJhd09wYWNpdHlJc0FuaW1hdGluZygpKTsKIAogICAgICAgICAgICAgb2NjbHVzaW9uVHJhY2tl ci5maW5pc2hlZFRhcmdldFJlbmRlclN1cmZhY2UoKml0LCBpdC0+cmVuZGVyU3VyZmFjZSgpKTsK LSAgICAgICAgICAgIHBhaW50TWFza0FuZFJlcGxpY2FGb3JSZW5kZXJTdXJmYWNlKCppdCwgcGFp bnRUeXBlKTsKKyAgICAgICAgICAgIHBhaW50TWFza3NGb3JSZW5kZXJTdXJmYWNlKCppdCwgcGFp bnRUeXBlKTsKICAgICAgICAgfSBlbHNlIGlmIChpdC5yZXByZXNlbnRzSXRzZWxmKCkpIHsKICAg ICAgICAgICAgIEFTU0VSVCghaXQtPmJvdW5kcygpLmlzRW1wdHkoKSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVl SG9zdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllclRyZWVIb3N0LmgKaW5kZXggOWNhMTRmYzA0NDg4M2FiMGMzMTA5YTk3ZmI4YmUxYjJiYTIz NzE2MS4uZmViM2M3Y2RlMTYyMzBmODRkZjkzNjhhMDU1ZGNjYzcxOGJiZjgyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRy ZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllclRyZWVIb3N0LmgKQEAgLTIyOSw3ICsyMjksNyBAQCBwcml2YXRlOgogICAgIGVu dW0gUGFpbnRUeXBlIHsgUGFpbnRWaXNpYmxlLCBQYWludElkbGUgfTsKICAgICBzdGF0aWMgdm9p ZCBwYWludENvbnRlbnRzSWZEaXJ0eShMYXllckNocm9taXVtKiwgUGFpbnRUeXBlLCBjb25zdCBD Q09jY2x1c2lvblRyYWNrZXIqKTsKICAgICB2b2lkIHBhaW50TGF5ZXJDb250ZW50cyhjb25zdCBM YXllckxpc3QmLCBQYWludFR5cGUpOwotICAgIHZvaWQgcGFpbnRNYXNrQW5kUmVwbGljYUZvclJl bmRlclN1cmZhY2UoTGF5ZXJDaHJvbWl1bSosIFBhaW50VHlwZSk7CisgICAgdm9pZCBwYWludE1h c2tzRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9taXVtKiwgUGFpbnRUeXBlKTsKIAogICAgIHZv aWQgdXBkYXRlTGF5ZXJzKExheWVyQ2hyb21pdW0qKTsKICAgICAvLyBQcmUtcmVzZXJ2ZSB0ZXh0 dXJlcyBmb3IgYW55IGxheWVyIG1hcmtlZCAiYWx3YXlzIHJlc2VydmUgdGV4dHVyZXMiCg== 136313 2012-04-09 15:10:56 -0700 2012-04-09 20:11:54 -0700 Patch for landing bug-83504-20120409181055.patch text/plain 5487 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNlZDg3NzIxZDlmZmFl NTRlNDg1OTlhNjRlZjc5Nzk5YmM1M2Q1OS4uMTQ2N2EwZWJiMmNmMGVlYWRiN2QyZjA5YTZhMTE2 MjUwMDVlODEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTA5ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVw bGljYSBsYXllcnMgYXJlIG5vdCBkcmF3biwgc28gc2hvdWxkIG5vdCBiZSBwYWludGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzUwNAorCisgICAg ICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgorCisgICAgICAgIFdlIGF0dGVtcHQgdG8g cGFpbnQgcmVwbGljYSBsYXllcnMgd2hlbiB3ZSBhcmUgcGFpbnRpbmcgdGhlIG1hc2sgbGF5ZXJz CisgICAgICAgIGluIENDTGF5ZXJUcmVlSG9zdC5jcHAuCisKKyAgICAgICAgVGhpcyBpcyB1c2Vs ZXNzIGNvZGUsIHJlcGxpY2EgbGF5ZXJzIGhhdmUgZHJhd3NDb250ZW50KCkgPT0gZmFsc2UsIGFu ZAorICAgICAgICBoYXZlIGFuIGVtcHR5IHZpc2libGVMYXllclJlY3QsIHNvIHRoZSBwYWludCBm dW5jdGlvbnMgZW5kIHVwIGVhcmx5LQorICAgICAgICBvdXR0aW5nLiBCdXQgaXQgaXMgYSB3YXN0 ZSBvZiB0aW1lIHRvIHRyeSwgYW5kIGNvbmZ1c2luZyB0byBoYXZlCisgICAgICAgIHRoaXMgYXR0 ZW1wdGVkIGluIHRoZSBjb2RlIGF0IGFsbCwgc2luY2UgdGhlIHJlcGxpY2EgbGF5ZXJzIGFyZSBu ZXZlcgorICAgICAgICBkcmF3bi4gVGhleSBleGlzdCBvbmx5IGZvciB0aGVpciB0cmFuc2Zvcm1z LgorCisgICAgICAgIEFsc28gdGhlIGRpbWVuc2lvbnMgdXNlZCBmb3IgdGhlIHJlcGxpY2EgbWFz ayBhcmUgZGlmZmVyZW50IGZyb20gdGhlCisgICAgICAgIHN1cmZhY2UgbWFzaywgd2hpY2ggaXMg Y29uZnVzaW5nIGFuZCB1bm5lY2Vzc2FyeSBhcyB3ZWxsLiBUaGUgbWFzayBpcworICAgICAgICBh cHBsaWVkIHRvIHRoZSBzYW1lIHN1cmZhY2UgY29udGVudHMgYXMgdGhlIHN1cmZhY2UgbWFzayB3 b3VsZCBiZSwgc28KKyAgICAgICAgb25seSB0aGUgc3VyZmFjZSdzIGNvbnRlbnRCb3VuZHMgbmVl ZCB0byBiZSBwYWludGVkIGluIHRoZSByZXBsaWNhCisgICAgICAgIG1hc2suCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xh eWVyVHJlZUhvc3Q6OnBhaW50TWFza3NGb3JSZW5kZXJTdXJmYWNlKToKKyAgICAgICAgKFdlYkNv cmU6OkNDTGF5ZXJUcmVlSG9zdDo6cGFpbnRMYXllckNvbnRlbnRzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKwogMjAxMi0wNC0w OSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENyYXNo IGR1ZSB0byBmbG9hdHMgbm90IGNsZWFyZWQgYmVmb3JlIHN0YXJ0aW5nIFNWRyA8dGV4dD4gbGF5 b3V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggOGRjOWI0ZjNkMDJhOTZi MWFkNzFhNmE1YmRiZjFkYTE4NWM1MWRiYy4uMzA4NzU4NzM2ZjZmMTFiZjMwMzRlY2EwNmMzNWRh MWU3NDhhODI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC01MTQsMjcg KzUxNCwyMiBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6cGFpbnRDb250ZW50c0lmRGlydHkoTGF5 ZXJDaHJvbWl1bSogbGF5ZXIsIFBhaW50VHlwZSBwYWludAogICAgICAgICBsYXllci0+aWRsZVBh aW50Q29udGVudHNJZkRpcnR5KG9jY2x1c2lvbik7CiB9CiAKLXZvaWQgQ0NMYXllclRyZWVIb3N0 OjpwYWludE1hc2tBbmRSZXBsaWNhRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9taXVtKiByZW5k ZXJTdXJmYWNlTGF5ZXIsIFBhaW50VHlwZSBwYWludFR5cGUpCit2b2lkIENDTGF5ZXJUcmVlSG9z dDo6cGFpbnRNYXNrc0ZvclJlbmRlclN1cmZhY2UoTGF5ZXJDaHJvbWl1bSogcmVuZGVyU3VyZmFj ZUxheWVyLCBQYWludFR5cGUgcGFpbnRUeXBlKQogewogICAgIC8vIE5vdGU6IE1hc2tzIGFuZCBy ZXBsaWNhcyBvbmx5IGV4aXN0IGZvciBsYXllcnMgdGhhdCBvd24gcmVuZGVyIHN1cmZhY2VzLiBJ ZiB3ZSByZWFjaCB0aGlzIHBvaW50CiAgICAgLy8gaW4gY29kZSwgd2UgYWxyZWFkeSBrbm93IHRo YXQgYXQgbGVhc3Qgc29tZXRoaW5nIHdpbGwgYmUgZHJhd24gaW50byB0aGlzIHJlbmRlciBzdXJm YWNlLCBzbyB0aGUKICAgICAvLyBtYXNrIGFuZCByZXBsaWNhIHNob3VsZCBiZSBwYWludGVkLgog Ci0gICAgLy8gRklYTUU6IElmIHRoZSBzdXJmYWNlIGhhcyBhIHJlcGxpY2EsIGl0IHNob3VsZCBi ZSBwYWludGVkIHdpdGggb2NjbHVzaW9uIHRoYXQgZXhjbHVkZXMgdGhlIGN1cnJlbnQgdGFyZ2V0 IHN1cmZhY2Ugc3VidHJlZS4KLQotICAgIGlmIChyZW5kZXJTdXJmYWNlTGF5ZXItPm1hc2tMYXll cigpKSB7Ci0gICAgICAgIHJlbmRlclN1cmZhY2VMYXllci0+bWFza0xheWVyKCktPnNldFZpc2li bGVMYXllclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPmNvbnRl bnRCb3VuZHMoKSkpOwotICAgICAgICBwYWludENvbnRlbnRzSWZEaXJ0eShyZW5kZXJTdXJmYWNl TGF5ZXItPm1hc2tMYXllcigpLCBwYWludFR5cGUsIDApOworICAgIExheWVyQ2hyb21pdW0qIG1h c2tMYXllciA9IHJlbmRlclN1cmZhY2VMYXllci0+bWFza0xheWVyKCk7CisgICAgaWYgKG1hc2tM YXllcikgeworICAgICAgICBtYXNrTGF5ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgICAg ICBwYWludENvbnRlbnRzSWZEaXJ0eShtYXNrTGF5ZXIsIHBhaW50VHlwZSwgMCk7CiAgICAgfQog Ci0gICAgTGF5ZXJDaHJvbWl1bSogcmVwbGljYUxheWVyID0gcmVuZGVyU3VyZmFjZUxheWVyLT5y ZXBsaWNhTGF5ZXIoKTsKLSAgICBpZiAocmVwbGljYUxheWVyKSB7Ci0gICAgICAgIHBhaW50Q29u dGVudHNJZkRpcnR5KHJlcGxpY2FMYXllciwgcGFpbnRUeXBlLCAwKTsKLQotICAgICAgICBpZiAo cmVwbGljYUxheWVyLT5tYXNrTGF5ZXIoKSkgewotICAgICAgICAgICAgcmVwbGljYUxheWVyLT5t YXNrTGF5ZXIoKS0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KEludFBvaW50KCksIHJlcGxp Y2FMYXllci0+bWFza0xheWVyKCktPmNvbnRlbnRCb3VuZHMoKSkpOwotICAgICAgICAgICAgcGFp bnRDb250ZW50c0lmRGlydHkocmVwbGljYUxheWVyLT5tYXNrTGF5ZXIoKSwgcGFpbnRUeXBlLCAw KTsKLSAgICAgICAgfQorICAgIExheWVyQ2hyb21pdW0qIHJlcGxpY2FNYXNrTGF5ZXIgPSByZW5k ZXJTdXJmYWNlTGF5ZXItPnJlcGxpY2FMYXllcigpID8gcmVuZGVyU3VyZmFjZUxheWVyLT5yZXBs aWNhTGF5ZXIoKS0+bWFza0xheWVyKCkgOiAwOworICAgIGlmIChyZXBsaWNhTWFza0xheWVyKSB7 CisgICAgICAgIHJlcGxpY2FNYXNrTGF5ZXItPnNldFZpc2libGVMYXllclJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCByZW5kZXJTdXJmYWNlTGF5ZXItPmNvbnRlbnRCb3VuZHMoKSkpOworICAgICAg ICBwYWludENvbnRlbnRzSWZEaXJ0eShyZXBsaWNhTWFza0xheWVyLCBwYWludFR5cGUsIDApOwog ICAgIH0KIH0KIApAQCAtNTUzLDcgKzU0OCw3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0OjpwYWlu dExheWVyQ29udGVudHMoY29uc3QgTGF5ZXJMaXN0JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0CiAg ICAgICAgICAgICBBU1NFUlQoaXQtPnJlbmRlclN1cmZhY2UoKS0+ZHJhd09wYWNpdHkoKSB8fCBp dC0+cmVuZGVyU3VyZmFjZSgpLT5kcmF3T3BhY2l0eUlzQW5pbWF0aW5nKCkpOwogCiAgICAgICAg ICAgICBvY2NsdXNpb25UcmFja2VyLmZpbmlzaGVkVGFyZ2V0UmVuZGVyU3VyZmFjZSgqaXQsIGl0 LT5yZW5kZXJTdXJmYWNlKCkpOwotICAgICAgICAgICAgcGFpbnRNYXNrQW5kUmVwbGljYUZvclJl bmRlclN1cmZhY2UoKml0LCBwYWludFR5cGUpOworICAgICAgICAgICAgcGFpbnRNYXNrc0ZvclJl bmRlclN1cmZhY2UoKml0LCBwYWludFR5cGUpOwogICAgICAgICB9IGVsc2UgaWYgKGl0LnJlcHJl c2VudHNJdHNlbGYoKSkgewogICAgICAgICAgICAgQVNTRVJUKCFpdC0+Ym91bmRzKCkuaXNFbXB0 eSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaAppbmRleCA5Y2ExNGZjMDQ0ODgzYWIw YzMxMDlhOTdmYjhiZTFiMmJhMjM3MTYxLi5mZWIzYzdjZGUxNjIzMGY4NGRmOTM2OGEwNTVkY2Nj NzE4YmJmODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaApAQCAtMjI5LDcgKzIyOSw3 IEBAIHByaXZhdGU6CiAgICAgZW51bSBQYWludFR5cGUgeyBQYWludFZpc2libGUsIFBhaW50SWRs ZSB9OwogICAgIHN0YXRpYyB2b2lkIHBhaW50Q29udGVudHNJZkRpcnR5KExheWVyQ2hyb21pdW0q LCBQYWludFR5cGUsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopOwogICAgIHZvaWQgcGFpbnRM YXllckNvbnRlbnRzKGNvbnN0IExheWVyTGlzdCYsIFBhaW50VHlwZSk7Ci0gICAgdm9pZCBwYWlu dE1hc2tBbmRSZXBsaWNhRm9yUmVuZGVyU3VyZmFjZShMYXllckNocm9taXVtKiwgUGFpbnRUeXBl KTsKKyAgICB2b2lkIHBhaW50TWFza3NGb3JSZW5kZXJTdXJmYWNlKExheWVyQ2hyb21pdW0qLCBQ YWludFR5cGUpOwogCiAgICAgdm9pZCB1cGRhdGVMYXllcnMoTGF5ZXJDaHJvbWl1bSopOwogICAg IC8vIFByZS1yZXNlcnZlIHRleHR1cmVzIGZvciBhbnkgbGF5ZXIgbWFya2VkICJhbHdheXMgcmVz ZXJ2ZSB0ZXh0dXJlcyIK