83370 2012-04-06 07:56:14 -0700 [chromium] Scratch texture reused before SkBitmap releases ownership 2012-07-20 14:24:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj senorblanco cc-bugs danakj enne jamesr webkit.review.bot oldest_to_newest 597355 0 danakj 2012-04-06 07:56:14 -0700 [chromium] Scratch texture reused before SkBitmap releases ownership 597356 1 136023 danakj 2012-04-06 07:56:35 -0700 Created attachment 136023 Patch This is a repro for the scratch texture bug. 674880 2 153576 senorblanco 2012-07-20 13:02:25 -0700 Created attachment 153576 Patch 674907 3 153576 enne 2012-07-20 13:29:37 -0700 Comment on attachment 153576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153576&action=review R=me. Wow, GrAutoScratchTexture is way better than manual locking and unlocking. > Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:207 > + GrAutoScratchTexture ast(gr, desc, GrContext::kExact_ScratchTexMatch); > + SkAutoTUnref<GrTexture> dest(ast.detach()); style nit: Argh, abbreviations. 674918 4 153587 senorblanco 2012-07-20 13:39:41 -0700 Created attachment 153587 Patch for landing 674939 5 senorblanco 2012-07-20 13:59:49 -0700 Thanks for the review. I've un-abbreviated the variables on landing. 674970 6 153587 webkit.review.bot 2012-07-20 14:24:21 -0700 Comment on attachment 153587 Patch for landing Clearing flags on attachment: 153587 Committed r123260: <http://trac.webkit.org/changeset/123260> 674971 7 webkit.review.bot 2012-07-20 14:24:24 -0700 All reviewed patches have been landed. Closing bug. 136023 2012-04-06 07:56:35 -0700 2012-07-20 13:02:22 -0700 Patch bug-83370-20120406105634.patch text/plain 3876 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAwNDAzOGVkN2Q5OTFi Y2VmNDI4YWNkZWY5YWFjNjc2ZmFjY2ExNi4uY2E5MWJiMmE3OThhMjIzYmNjMTgxOGQ3MjMwYjRj MGNiODYwMmE1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTA2ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gU2Ny YXRjaCB0ZXh0dXJlIHJldXNlZCBiZWZvcmUgU2tCaXRtYXAgcmVsZWFzZXMgb3duZXJzaGlwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzM3MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNDUmVuZGVyU3VyZmFjZTo6ZHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpDQ1JlbmRlclN1 cmZhY2U6OmFwcGx5RmlsdGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmg6CisgICAgICAgIChDQ1JlbmRlclN1cmZhY2UpOgorCiAy MDEyLTA0LTA2ICBMZXZpIFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBVcGRhdGUgTGF5b3V0VW5pdCB1c2FnZSBpbiBSZW5kZXJWaWV3CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5k ZXJTdXJmYWNlLmNwcAppbmRleCAyZDI5NTUzYjkxYTA3NDczNGY5MmY3ZGU5YWMxZWNiYzk4Mjg0 NDZhLi5jYWM5Nzg4YzA3ZmE2MTc0MDFiMzYwNWUxOTFmMzg1YzQ1ZWMxNWZjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1 cmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDUmVuZGVyU3VyZmFjZS5jcHAKQEAgLTEwOSw3ICsxMDksMTMgQEAgdm9pZCBDQ1JlbmRl clN1cmZhY2U6OmRyYXcoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBsYXllclJlbmRlcmVyLCBjb25z dCBGbG9hdFJlY3QKICAgICBpZiAobV9za2lwc0RyYXcgfHwgIW1fY29udGVudHNUZXh0dXJlKQog ICAgICAgICByZXR1cm47CiAKLSAgICBTa0JpdG1hcCBmaWx0ZXJCaXRtYXAgPSBhcHBseUZpbHRl cnMobGF5ZXJSZW5kZXJlcik7CisgICAgU2tCaXRtYXAgZmlsdGVyQml0bWFwID0gYXBwbHlGaWx0 ZXJzKGxheWVyUmVuZGVyZXIsIG1fZmlsdGVycyk7CisKKyAgICAvLyBUaGlzIGRlc3Ryb3lzIHRo ZSBmaWx0ZXIgcmVzdWx0IGFib3ZlLgorICAgIEZpbHRlck9wZXJhdGlvbnMgZmlsdGVyczsKKyAg ICBmaWx0ZXJzLm9wZXJhdGlvbnMoKS5hcHBlbmQoQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJh dGlvbjo6Y3JlYXRlKDEsIEZpbHRlck9wZXJhdGlvbjo6R1JBWVNDQUxFKSk7CisgICAgYXBwbHlG aWx0ZXJzKGxheWVyUmVuZGVyZXIsIGZpbHRlcnMpOworCiAgICAgLy8gRklYTUU6IEJ5IHVzaW5n IHRoZSBzYW1lIFJlbmRlclN1cmZhY2UgZm9yIGJvdGggdGhlIGNvbnRlbnQgYW5kIGl0cyByZWZs ZWN0aW9uLAogICAgIC8vIGl0J3MgY3VycmVudGx5IG5vdCBwb3NzaWJsZSB0byBhcHBseSBhIHNl cGFyYXRlIG1hc2sgdG8gdGhlIHJlZmxlY3Rpb24gbGF5ZXIKICAgICAvLyBvciBjb3JyZWN0bHkg aGFuZGxlIG9wYWNpdHkgaW4gcmVmbGVjdGlvbnMgKG9wYWNpdHkgbXVzdCBiZSBhcHBsaWVkIGFm dGVyIGRyYXdpbmcKQEAgLTIyMyw3ICsyMjksNyBAQCB2b2lkIENDUmVuZGVyU3VyZmFjZTo6ZHJh d1N1cmZhY2UoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBsYXllclJlbmRlcmVyLCBDQ0xheWVySQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvZ3JhbS0+dmVydGV4U2hhZGVy KCkubWF0cml4TG9jYXRpb24oKSwgcHJvZ3JhbS0+ZnJhZ21lbnRTaGFkZXIoKS5hbHBoYUxvY2F0 aW9uKCksIHNoYWRlclF1YWRMb2NhdGlvbik7CiB9CiAKLVNrQml0bWFwIENDUmVuZGVyU3VyZmFj ZTo6YXBwbHlGaWx0ZXJzKExheWVyUmVuZGVyZXJDaHJvbWl1bSogbGF5ZXJSZW5kZXJlcikKK1Nr Qml0bWFwIENDUmVuZGVyU3VyZmFjZTo6YXBwbHlGaWx0ZXJzKExheWVyUmVuZGVyZXJDaHJvbWl1 bSogbGF5ZXJSZW5kZXJlciwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVycykKIHsKICAg ICBpZiAoIW1fY29udGVudHNUZXh0dXJlIHx8ICFtX2ZpbHRlcnMuc2l6ZSgpKQogICAgICAgICBy ZXR1cm4gU2tCaXRtYXAoKTsKQEAgLTIzNCw3ICsyNDAsNyBAQCBTa0JpdG1hcCBDQ1JlbmRlclN1 cmZhY2U6OmFwcGx5RmlsdGVycyhMYXllclJlbmRlcmVyQ2hyb21pdW0qIGxheWVyUmVuZGVyZXIp CiAKICAgICBsYXllclJlbmRlcmVyLT5jb250ZXh0KCktPmZsdXNoKCk7CiAKLSAgICByZXR1cm4g Q0NSZW5kZXJTdXJmYWNlRmlsdGVyczo6YXBwbHkobV9maWx0ZXJzLCBtX2NvbnRlbnRzVGV4dHVy ZS0+dGV4dHVyZUlkKCksIG1fY29udGVudFJlY3Quc2l6ZSgpLCBmaWx0ZXJDb250ZXh0LmdldCgp KTsKKyAgICByZXR1cm4gQ0NSZW5kZXJTdXJmYWNlRmlsdGVyczo6YXBwbHkoZmlsdGVycywgbV9j b250ZW50c1RleHR1cmUtPnRleHR1cmVJZCgpLCBtX2NvbnRlbnRSZWN0LnNpemUoKSwgZmlsdGVy Q29udGV4dC5nZXQoKSk7CiB9CiAKIFN0cmluZyBDQ1JlbmRlclN1cmZhY2U6Om5hbWUoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NSZW5kZXJTdXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaAppbmRleCBhYzQ4NjU1YTM5NjJlNjdhNGNlN2Ri ZjRjOTIyMTE3YTMyMzRlMjM5Li5jZDljMTY1MjI2ZDA4MjQxMDJmMmEzNzcxZWY2YmFhOTU1Y2I2 ODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ1JlbmRlclN1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaApAQCAtNzIsNyArNzIsNyBAQCBwdWJs aWM6CiAKICAgICB2b2lkIHNldEZpbHRlcnMoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVy cykgeyBtX2ZpbHRlcnMgPSBmaWx0ZXJzOyB9CiAgICAgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYg ZmlsdGVycygpIGNvbnN0IHsgcmV0dXJuIG1fZmlsdGVyczsgfQotICAgIFNrQml0bWFwIGFwcGx5 RmlsdGVycyhMYXllclJlbmRlcmVyQ2hyb21pdW0qKTsKKyAgICBTa0JpdG1hcCBhcHBseUZpbHRl cnMoTGF5ZXJSZW5kZXJlckNocm9taXVtKiwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpOwogCiAg ICAgdm9pZCBzZXROZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMoQ0NSZW5kZXJTdXJmYWNl KiBzdXJmYWNlKSB7IG1fbmVhcmVzdEFuY2VzdG9yVGhhdE1vdmVzUGl4ZWxzID0gc3VyZmFjZTsg fQogICAgIGNvbnN0IENDUmVuZGVyU3VyZmFjZSogbmVhcmVzdEFuY2VzdG9yVGhhdE1vdmVzUGl4 ZWxzKCkgY29uc3QgeyByZXR1cm4gbV9uZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHM7IH0K 153576 2012-07-20 13:02:25 -0700 2012-07-20 13:39:38 -0700 Patch bug-83370-20120720160220.patch text/plain 3636 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzI0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA3LTIwICBTdGVwaGVu IFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g Q2xlYW4gdXAgc2NyYXRjaCB0ZXh0dXJlIHVzYWdlIGluIENocm9taXVtJ3MgaW1wbGVtZW50YXRp b24KKyAgICAgICAgb2YgR1BVLWFjY2VsZXJhdGVkIGZpbHRlcnMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzM3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIGRpZG4ndCB1c2VkIHRvIGJlIGEg c2FmZSB3YXkgdG8gYWxsb2NhdGUgYSBzY3JhdGNoIHRleHR1cmUsIGFuZAorICAgICAgICBob2xk IGludG8gaXQgYmV5b25kIHRoZSBsaWZldGltZSBvZiBHckF1dG9TY3JhdGNoVGV4dHVyZS4gIE5v dyB0aGVyZSBpczoKKyAgICAgICAgZGV0YWNoKCkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlz dGluZyB0ZXN0cyBpbiBjc3MzL2ZpbHRlcnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2VGaWx0ZXJzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNDUmVuZGVyU3VyZmFjZUZpbHRlcnM6OmFwcGx5KToKKyAgICAgICAgVXNlIGEgR3JBdXRv U2NyYXRjaFRleHR1cmUgdG8gYWxsb2NhdGUgdGhlIGRlc3RpbmF0aW9uIHRleHR1cmUsIGFuZCAK KyAgICAgICAgZGV0YWNoKCkgdG8gZGV0YWNoIGl0IGZyb20gdGhlIGNhY2hlIGJlZm9yZSBwbGFj aW5nIGl0IGluIGFuCisgICAgICAgIFNrR3JUZXh0dXJlUGl4ZWxSZWYuICBUaGlzIG1lYW5zIHdl IG5vIGxvbmdlciBuZWVkIHRvIGRvIGFueSBsb2NrLworICAgICAgICB1bmxvY2sgdHJpY2tlcnkg d2l0aCB0aGUgVGV4dHVyZUNhY2hlRW50cnksIHNpbmNlIHRoZSByZWZjb3VudCBpcworICAgICAg ICBlbm91Z2ggdG8ga2VlcCB0aGUgdGV4dHVyZSBhd2F5IGZyb20gdGhlIGNhY2hlJ3MgcHJ5aW5n IGhhbmRzLgorCiAyMDEyLTA3LTIwICBWaW5jZW50IFNjaGVpYiAgPHNjaGVpYkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBjb21waWxlIGZpeCwgcjEyMzI0NyBpbmNsdWRlZCB1 bmludGVuZGVkIGNoYW5nZXMgdG8gRG9jdW1lbnQuY3BwLgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHAJKHJldmlzaW9uIDEyMzI0OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZp bHRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsMTIgKzE5Myw3IEBAIFNrQml0bWFwIEND UmVuZGVyU3VyZmFjZUZpbHRlcnM6OmFwcGx5KGMKICAgICBzb3VyY2Uuc2V0Q29uZmlnKFNrQml0 bWFwOjprQVJHQl84ODg4X0NvbmZpZywgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKICAg ICBzb3VyY2Uuc2V0UGl4ZWxSZWYobmV3IFNrR3JUZXh0dXJlUGl4ZWxSZWYodGV4dHVyZS5nZXQo KSkpLT51bnJlZigpOwogICAgIAotICAgIEdyQ29udGV4dDo6VGV4dHVyZUNhY2hlRW50cnkgZGVz dDsKLQogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBmaWx0ZXJzLnNpemUoKTsgKytpKSB7 Ci0gICAgICAgIC8vIFNhdmUgdGhlIHByZXZpb3VzIHRleHR1cmUgY2FjaGUgZGVzdGluYXRpb24g KGlmIGFueSksIGFuZCBrZWVwIGl0Ci0gICAgICAgIC8vIGxvY2tlZCBkdXJpbmcgZHJhdyB0byBw cmV2ZW50IGl0IGJlIHJlLXVzZWQgYXMgZGVzdGluYXRpb24uCi0gICAgICAgIEdyQ29udGV4dDo6 VGV4dHVyZUNhY2hlRW50cnkgc291cmNlRW50cnkgPSBkZXN0OwogICAgICAgICBjb25zdCBXZWJL aXQ6OldlYkZpbHRlck9wZXJhdGlvbiYgb3AgPSBmaWx0ZXJzLmF0KGkpOwogICAgICAgICAvLyBB bGxvY2F0ZSBhIGRlc3RpbmF0aW9uIHRleHR1cmUuCiAgICAgICAgIEdyVGV4dHVyZURlc2MgZGVz YzsKQEAgLTIwOCwxMCArMjAzLDExIEBAIFNrQml0bWFwIENDUmVuZGVyU3VyZmFjZUZpbHRlcnM6 OmFwcGx5KGMKICAgICAgICAgZGVzYy5mSGVpZ2h0ID0gc2l6ZS5oZWlnaHQoKTsKICAgICAgICAg ZGVzYy5mQ29uZmlnID0ga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWc7CiAgICAgICAgIC8vIEZJ WE1FOiBjb3VsZCB3ZSB1c2UgYXBwcm94aW1hdGUgbWF0Y2gsIGFuZCBmaXggdGV4Y29vcmRzIG9u IGRyYXcKLSAgICAgICAgZGVzdCA9IGdyLT5sb2NrU2NyYXRjaFRleHR1cmUoZGVzYywgR3JDb250 ZXh0OjprRXhhY3RfU2NyYXRjaFRleE1hdGNoKTsKLSAgICAgICAgaWYgKCFkZXN0LnRleHR1cmUo KSkKKyAgICAgICAgR3JBdXRvU2NyYXRjaFRleHR1cmUgYXN0KGdyLCBkZXNjLCBHckNvbnRleHQ6 OmtFeGFjdF9TY3JhdGNoVGV4TWF0Y2gpOworICAgICAgICBTa0F1dG9UVW5yZWY8R3JUZXh0dXJl PiBkZXN0KGFzdC5kZXRhY2goKSk7CisgICAgICAgIGlmICghZGVzdC5nZXQoKSkKICAgICAgICAg ICAgIHJldHVybiBTa0JpdG1hcCgpOwotICAgICAgICBTa0dwdURldmljZSBkZXZpY2UoZ3IsIGRl c3QudGV4dHVyZSgpKTsKKyAgICAgICAgU2tHcHVEZXZpY2UgZGV2aWNlKGdyLCBkZXN0LmdldCgp KTsKICAgICAgICAgU2tDYW52YXMgY2FudmFzKCZkZXZpY2UpOwogICAgICAgICBjYW52YXMuY2xl YXIoMHgwKTsKICAgICAgICAgc3dpdGNoIChvcC50eXBlKCkpIHsKQEAgLTI4OSwxMyArMjg1LDgg QEAgU2tCaXRtYXAgQ0NSZW5kZXJTdXJmYWNlRmlsdGVyczo6YXBwbHkoYwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgLy8gRGVzdCB0ZXh0dXJlIGZyb20gdGhpcyBmaWx0 ZXIgYmVjb21lcyBzb3VyY2UgYml0bWFwIGZvciBuZXh0IGZpbHRlci4KLSAgICAgICAgc291cmNl LnNldFBpeGVsUmVmKG5ldyBTa0dyVGV4dHVyZVBpeGVsUmVmKGRlc3QudGV4dHVyZSgpKSktPnVu cmVmKCk7Ci0gICAgICAgIC8vIFVubG9jayB0aGUgcHJldmlvdXMgdGV4dHVyZSBjYWNoZSBlbnRy eS4KLSAgICAgICAgaWYgKHNvdXJjZUVudHJ5LnRleHR1cmUoKSkKLSAgICAgICAgICAgIGdyLT51 bmxvY2tUZXh0dXJlKHNvdXJjZUVudHJ5KTsKKyAgICAgICAgc291cmNlLnNldFBpeGVsUmVmKG5l dyBTa0dyVGV4dHVyZVBpeGVsUmVmKGRlc3QuZ2V0KCkpKS0+dW5yZWYoKTsKICAgICB9Ci0gICAg aWYgKGRlc3QudGV4dHVyZSgpKQotICAgICAgICBnci0+dW5sb2NrVGV4dHVyZShkZXN0KTsKICAg ICBjb250ZXh0M0QtPmZsdXNoKCk7CiAgICAgcmV0dXJuIHNvdXJjZTsKIH0K 153587 2012-07-20 13:39:41 -0700 2012-07-20 14:24:21 -0700 Patch for landing bug-83370-20120720163937.patch text/plain 3687 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzI0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA3LTIwICBTdGVwaGVu IFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g Q2xlYW4gdXAgc2NyYXRjaCB0ZXh0dXJlIHVzYWdlIGluIENocm9taXVtJ3MgaW1wbGVtZW50YXRp b24KKyAgICAgICAgb2YgR1BVLWFjY2VsZXJhdGVkIGZpbHRlcnMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzM3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IEFkcmllbm5lIFdhbGtlci4KKworICAgICAgICBUaGVyZSBkaWRuJ3QgdXNlZCB0byBiZSBh IHNhZmUgd2F5IHRvIGFsbG9jYXRlIGEgc2NyYXRjaCB0ZXh0dXJlLCBhbmQKKyAgICAgICAgaG9s ZCBpbnRvIGl0IGJleW9uZCB0aGUgbGlmZXRpbWUgb2YgR3JBdXRvU2NyYXRjaFRleHR1cmUuICBO b3cgdGhlcmUgaXM6CisgICAgICAgIGRldGFjaCgpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhp c3RpbmcgdGVzdHMgaW4gY3NzMy9maWx0ZXJzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDQ1JlbmRlclN1cmZhY2VGaWx0ZXJzOjphcHBseSk6CisgICAgICAgIFVzZSBhIEdyQXV0 b1NjcmF0Y2hUZXh0dXJlIHRvIGFsbG9jYXRlIHRoZSBkZXN0aW5hdGlvbiB0ZXh0dXJlLCBhbmQg CisgICAgICAgIGRldGFjaCgpIHRvIGRldGFjaCBpdCBmcm9tIHRoZSBjYWNoZSBiZWZvcmUgcGxh Y2luZyBpdCBpbiBhbgorICAgICAgICBTa0dyVGV4dHVyZVBpeGVsUmVmLiAgVGhpcyBtZWFucyB3 ZSBubyBsb25nZXIgbmVlZCB0byBkbyBhbnkgbG9jay8KKyAgICAgICAgdW5sb2NrIHRyaWNrZXJ5 IHdpdGggdGhlIFRleHR1cmVDYWNoZUVudHJ5LCBzaW5jZSB0aGUgcmVmY291bnQgaXMKKyAgICAg ICAgZW5vdWdoIHRvIGtlZXAgdGhlIHRleHR1cmUgYXdheSBmcm9tIHRoZSBjYWNoZSdzIHByeWlu ZyBoYW5kcy4KKwogMjAxMi0wNy0yMCAgVmluY2VudCBTY2hlaWIgIDxzY2hlaWJAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgY29tcGlsZSBmaXgsIHIxMjMyNDcgaW5jbHVkZWQg dW5pbnRlbmRlZCBjaGFuZ2VzIHRvIERvY3VtZW50LmNwcC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwCShyZXZpc2lvbiAxMjMyNDkpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2VG aWx0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkzLDEyICsxOTMsNyBAQCBTa0JpdG1hcCBD Q1JlbmRlclN1cmZhY2VGaWx0ZXJzOjphcHBseShjCiAgICAgc291cmNlLnNldENvbmZpZyhTa0Jp dG1hcDo6a0FSR0JfODg4OF9Db25maWcsIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7CiAg ICAgc291cmNlLnNldFBpeGVsUmVmKG5ldyBTa0dyVGV4dHVyZVBpeGVsUmVmKHRleHR1cmUuZ2V0 KCkpKS0+dW5yZWYoKTsKICAgICAKLSAgICBHckNvbnRleHQ6OlRleHR1cmVDYWNoZUVudHJ5IGRl c3Q7Ci0KICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZmlsdGVycy5zaXplKCk7ICsraSkg ewotICAgICAgICAvLyBTYXZlIHRoZSBwcmV2aW91cyB0ZXh0dXJlIGNhY2hlIGRlc3RpbmF0aW9u IChpZiBhbnkpLCBhbmQga2VlcCBpdAotICAgICAgICAvLyBsb2NrZWQgZHVyaW5nIGRyYXcgdG8g cHJldmVudCBpdCBiZSByZS11c2VkIGFzIGRlc3RpbmF0aW9uLgotICAgICAgICBHckNvbnRleHQ6 OlRleHR1cmVDYWNoZUVudHJ5IHNvdXJjZUVudHJ5ID0gZGVzdDsKICAgICAgICAgY29uc3QgV2Vi S2l0OjpXZWJGaWx0ZXJPcGVyYXRpb24mIG9wID0gZmlsdGVycy5hdChpKTsKICAgICAgICAgLy8g QWxsb2NhdGUgYSBkZXN0aW5hdGlvbiB0ZXh0dXJlLgogICAgICAgICBHclRleHR1cmVEZXNjIGRl c2M7CkBAIC0yMDgsMTAgKzIwMywxMSBAQCBTa0JpdG1hcCBDQ1JlbmRlclN1cmZhY2VGaWx0ZXJz OjphcHBseShjCiAgICAgICAgIGRlc2MuZkhlaWdodCA9IHNpemUuaGVpZ2h0KCk7CiAgICAgICAg IGRlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9QTV9HclBpeGVsQ29uZmlnOwogICAgICAgICAvLyBG SVhNRTogY291bGQgd2UgdXNlIGFwcHJveGltYXRlIG1hdGNoLCBhbmQgZml4IHRleGNvb3JkcyBv biBkcmF3Ci0gICAgICAgIGRlc3QgPSBnci0+bG9ja1NjcmF0Y2hUZXh0dXJlKGRlc2MsIEdyQ29u dGV4dDo6a0V4YWN0X1NjcmF0Y2hUZXhNYXRjaCk7Ci0gICAgICAgIGlmICghZGVzdC50ZXh0dXJl KCkpCisgICAgICAgIEdyQXV0b1NjcmF0Y2hUZXh0dXJlIHNjcmF0Y2hUZXh0dXJlKGdyLCBkZXNj LCBHckNvbnRleHQ6OmtFeGFjdF9TY3JhdGNoVGV4TWF0Y2gpOworICAgICAgICBTa0F1dG9UVW5y ZWY8R3JUZXh0dXJlPiBkZXN0aW5hdGlvbihzY3JhdGNoVGV4dHVyZS5kZXRhY2goKSk7CisgICAg ICAgIGlmICghZGVzdGluYXRpb24uZ2V0KCkpCiAgICAgICAgICAgICByZXR1cm4gU2tCaXRtYXAo KTsKLSAgICAgICAgU2tHcHVEZXZpY2UgZGV2aWNlKGdyLCBkZXN0LnRleHR1cmUoKSk7CisgICAg ICAgIFNrR3B1RGV2aWNlIGRldmljZShnciwgZGVzdGluYXRpb24uZ2V0KCkpOwogICAgICAgICBT a0NhbnZhcyBjYW52YXMoJmRldmljZSk7CiAgICAgICAgIGNhbnZhcy5jbGVhcigweDApOwogICAg ICAgICBzd2l0Y2ggKG9wLnR5cGUoKSkgewpAQCAtMjg5LDEzICsyODUsOCBAQCBTa0JpdG1hcCBD Q1JlbmRlclN1cmZhY2VGaWx0ZXJzOjphcHBseShjCiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQogICAgICAgICAvLyBEZXN0IHRleHR1cmUgZnJvbSB0aGlzIGZpbHRlciBiZWNvbWVzIHNv dXJjZSBiaXRtYXAgZm9yIG5leHQgZmlsdGVyLgotICAgICAgICBzb3VyY2Uuc2V0UGl4ZWxSZWYo bmV3IFNrR3JUZXh0dXJlUGl4ZWxSZWYoZGVzdC50ZXh0dXJlKCkpKS0+dW5yZWYoKTsKLSAgICAg ICAgLy8gVW5sb2NrIHRoZSBwcmV2aW91cyB0ZXh0dXJlIGNhY2hlIGVudHJ5LgotICAgICAgICBp ZiAoc291cmNlRW50cnkudGV4dHVyZSgpKQotICAgICAgICAgICAgZ3ItPnVubG9ja1RleHR1cmUo c291cmNlRW50cnkpOworICAgICAgICBzb3VyY2Uuc2V0UGl4ZWxSZWYobmV3IFNrR3JUZXh0dXJl UGl4ZWxSZWYoZGVzdGluYXRpb24uZ2V0KCkpKS0+dW5yZWYoKTsKICAgICB9Ci0gICAgaWYgKGRl c3QudGV4dHVyZSgpKQotICAgICAgICBnci0+dW5sb2NrVGV4dHVyZShkZXN0KTsKICAgICBjb250 ZXh0M0QtPmZsdXNoKCk7CiAgICAgcmV0dXJuIHNvdXJjZTsKIH0K