51186 2010-12-16 07:26:44 -0800 [chromium] Add asserts to test for contiguous-pixel Skia bitmaps. 2013-04-09 12:55:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 51513 51565 0 wjmaclean wjmaclean commit-queue jamesr kbr schenney senorblanco oldest_to_newest 323163 0 wjmaclean 2010-12-16 07:26:44 -0800 [chromium] Add asserts to test for contiguous-pixel Skia bitmaps. 323165 1 76768 wjmaclean 2010-12-16 07:29:37 -0800 Created attachment 76768 Patch 323166 2 wjmaclean 2010-12-16 07:33:12 -0800 Since Skia bitmaps may have rowBytes() >= bytesPerPixel() * width(), and since some places in the code assume the equality above is enforced, add asserts() to detect when there are extra bytes at the end of each line where padding=0 is assumed. 323170 3 wjmaclean 2010-12-16 07:38:21 -0800 James R, can you please review this? It's a very short (and hopefully straightforward) CL. 325617 4 76768 kbr 2010-12-22 11:58:48 -0800 Comment on attachment 76768 Patch Looks OK. 325687 5 76768 commit-queue 2010-12-22 14:03:39 -0800 Comment on attachment 76768 Patch Clearing flags on attachment: 76768 Committed r74503: <http://trac.webkit.org/changeset/74503> 325688 6 commit-queue 2010-12-22 14:03:46 -0800 All reviewed patches have been landed. Closing bug. 326069 7 77333 wjmaclean 2010-12-23 07:56:10 -0800 Created attachment 77333 Patch 326072 8 77333 wjmaclean 2010-12-23 07:58:22 -0800 Comment on attachment 77333 Patch The patch failed on mac compile (I thought I had tested this, but apparently not). I have revised to correct, and this patch has been re-tested to make sure it compiles on Mac. 326073 9 wjmaclean 2010-12-23 07:59:47 -0800 Patch reverted due to not compiling on mac. 326074 10 77333 kbr 2010-12-23 08:01:53 -0800 Comment on attachment 77333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77333&action=review The "if" with an ASSERT as its sole arm is sloppy. > WebCore/platform/graphics/chromium/ImageLayerChromium.cpp:125 > + ASSERT(skiaBitmap->rowBytes() == SkBitmap::ComputeRowBytes(skiaConfig, skiaBitmap->width())); ASSERT(!pixels || (skiaBitmap->rowBytes() == ...)) 326086 11 77335 wjmaclean 2010-12-23 08:26:21 -0800 Created attachment 77335 Patch 326087 12 wjmaclean 2010-12-23 08:27:20 -0800 (In reply to comment #10) > > ASSERT(!pixels || (skiaBitmap->rowBytes() == ...)) This is much better, thanks. 326089 13 77335 kbr 2010-12-23 08:28:27 -0800 Comment on attachment 77335 Patch OK. 326105 14 77335 commit-queue 2010-12-23 08:56:48 -0800 Comment on attachment 77335 Patch Clearing flags on attachment: 77335 Committed r74561: <http://trac.webkit.org/changeset/74561> 326106 15 commit-queue 2010-12-23 08:56:54 -0800 All reviewed patches have been landed. Closing bug. 326319 16 kbr 2010-12-23 15:23:11 -0800 These assertions seem to have broken the Chromium UI tests. See https://bugs.webkit.org/show_bug.cgi?id=51565 , but in particular: http://build.chromium.org/p/chromium/builders/Vista%20Tests%20(dbg)(2)/builds/3052 the failure of UITestCanLaunchWithOSMesa, and: http://build.chromium.org/p/chromium/builders/Vista%20Tests%20(dbg)(2)/builds/3052/steps/ui_tests/logs/stdio http://build.chromium.org/p/chromium/builders/Vista%20Tests%20(dbg)(2)/builds/3052/steps/Process%20Dumps/logs/stdio Reopening. Please test this patch with this test on Windows before resubmitting. 326321 17 kbr 2010-12-23 15:23:40 -0800 See above comment. 76768 2010-12-16 07:29:37 -0800 2010-12-23 07:56:05 -0800 Patch bug-51186-20101216103331.patch text/plain 4740 wjmaclean ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWRkNmI0NjNlOWIwNDBlNjUxMGMzZWQ0NTg3NmVjNmFiNzI3ZDdiNC4uOTQ4YmUyYTE4NGY0ODg2 MDhlYzVhYjljZThhMWE1NDJhN2IwYjBjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0xNiAgVy4g SmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgYXNzZXJ0cyB0 byB0ZXN0IGZvciBjb250aWd1b3VzLXBpeGVsIFNraWEgYml0bWFwcy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMTg2CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBCZWhhdmlvdXIgbm90IGNoYW5nZWQsIGJ1dCBuZWVkIHRoZSBhc3NlcnRzIHRvIGRl dGVjdCB3aGVuIGFzc3VtcHRpb25zIHZpb2xhdGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNJZkRpcnR5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKToKKwogMjAxMC0xMi0x NiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLiBGaXggQ2hyb21pdW0gTWFjIERlYnVnIENsYW5nIGNvbXBpbGF0aW9uLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21p dW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hy b21pdW0uY3BwCmluZGV4IGNkMjk5YzFhMGNlM2IzMGU5NWQ5MTRkZTA1MWI5NjMyMTk4NDljYWIu LjViNDI4MjY1NThhOWFlZTE4YzhmNDM5YTQ4MDIxMGQxMDc5MWVmN2MgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1 bS5jcHAKQEAgLTE1Niw4ICsxNTYsMTMgQEAgdm9pZCBJbWFnZUxheWVyQ2hyb21pdW06OnVwZGF0 ZUNvbnRlbnRzSWZEaXJ0eSgpCiAjZXJyb3IgIk5lZWQgdG8gaW1wbGVtZW50IGZvciB5b3VyIHBs YXRmb3JtLiIKICNlbmRpZgogCi0gICAgaWYgKHBpeGVscykKKyAgICBpZiAocGl4ZWxzKSB7Cisg ICAgICAgIC8vIFNpbmNlIHRoaXMgb3BlcmF0aW9uIHJlcXVpcmVzIGNvbnRpZ3VvdXMgcGl4ZWxz LCBtYWtlIHN1cmUgdGhlcmUncyBubyBwYWRkaW5nIGF0IHRoZQorICAgICAgICAvLyBlbmQgb2Yg ZWFjaCBsaW5lLgorICAgICAgICBBU1NFUlQoc2tpYUJpdG1hcC0+cm93Qnl0ZXMoKSA9PSBTa0Jp dG1hcDo6Q29tcHV0ZVJvd0J5dGVzKHNraWFDb25maWcsIHNraWFCaXRtYXAtPndpZHRoKCkpKTsK KwogICAgICAgICB1cGRhdGVUZXh0dXJlUmVjdChwaXhlbHMsIGJpdG1hcFNpemUsICBkaXJ0eVJl Y3QpOworICAgIH0KIH0KIAogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3NraWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNwcAppbmRleCA4YjdhYzg2ZmY3NjFjNzU3 M2IwM2QzNjg1MWY2MzQyMzJjNzY4NjY2Li43ZmQ3YzcwOTY0OGM0MDc4OGJjMGE0MTk0YzI4YmM1 NmVkN2RjMzc4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3Jh cGhpY3NDb250ZXh0M0RTa2lhLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNwcApAQCAtNzgsNyArNzgsOCBAQCBib29sIEdyYXBo aWNzQ29udGV4dDNEOjpnZXRJbWFnZURhdGEoSW1hZ2UqIGltYWdlLAogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgU2tCaXRtYXAmIHNraWFJbWFnZVJlZiA9ICpza2lhSW1hZ2U7CiAgICAgU2tB dXRvTG9ja1BpeGVscyBsb2NrKHNraWFJbWFnZVJlZik7Ci0gICAgQVNTRVJUKHNraWFJbWFnZS0+ cm93Qnl0ZXMoKSA9PSBza2lhSW1hZ2UtPndpZHRoKCkgKiA0KTsKKyAgICBBU1NFUlQoc2tpYUlt YWdlLT5ieXRlc1BlclBpeGVsKCkgPT0gNAorICAgICAgICAgICAmJiBza2lhSW1hZ2UtPnJvd0J5 dGVzKCkgPT0gU2tCaXRtYXA6OkNvbXB1dGVSb3dCeXRlcyhza2lhSW1hZ2UtPmNvbmZpZygpLCBz a2lhSW1hZ2UtPndpZHRoKCkpKTsKICAgICBvdXRwdXRWZWN0b3IucmVzaXplKHNraWFJbWFnZS0+ cm93Qnl0ZXMoKSAqIHNraWFJbWFnZS0+aGVpZ2h0KCkpOwogICAgIHJldHVybiBwYWNrUGl4ZWxz KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHNraWFJbWFnZS0+Z2V0UGl4ZWxzKCkp LAogICAgICAgICAgICAgICAgICAgICAgIFNvdXJjZUZvcm1hdEJHUkE4LCBza2lhSW1hZ2UtPndp ZHRoKCksIHNraWFJbWFnZS0+aGVpZ2h0KCksIDAsCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA5NWUzNzdhYmJl NzEwMGViOWU4YWYwYzJkZjJiMDliN2QxMGNkNjIzLi5jYmYzZWIzZWVjZmFiZDQ5YTQ3NDJiMjky ZjdiN2M4YzY3ZTIxOTEzIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMi0x NiAgVy4gSmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgYXNz ZXJ0cyB0byB0ZXN0IGZvciBjb250aWd1b3VzLXBpeGVsIFNraWEgYml0bWFwcy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMTg2CisKKyAgICAgICAg QWRkIGFzc2VydHMgdG8gZGV0ZWN0IGlmIGFzc3VtcHRpb25zIChhYm91dCBjb250aWd1b3VzIHBp eGVscyBpbiBTa2lhIGJpdG1hcHMpIGFyZSB2aW9sYXRlZC4KKworICAgICAgICAqIHNyYy9HcmFw aGljc0NvbnRleHQzRENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDNESW50ZXJuYWw6OnBhaW50UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFzKToKKwogMjAxMC0x Mi0xNSAgQ2hyaXMgR3VpbGxvcnkgIDxjaHJpcy5ndWlsbG9yeUBnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3BwCmluZGV4IDJkZmY1MmIzMDI0YTc5ZWVhNzNk MThkODQxMmNmNzA3ZDkxN2I2NzAuLjZhMGM2NzIxNmMxMDk3NTJlOWY1Yjg0Njk5NmI0MjJlNjhj YmVlNmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvR3JhcGhpY3NDb250ZXh0M0RD aHJvbWl1bS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRleHQzRENo cm9taXVtLmNwcApAQCAtMTcyLDkgKzE3MiwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNESW50 ZXJuYWw6OnBhaW50UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFzKENhbnZhc1JlbmRlcmluZ0Nvbgog ICAgIGNvbnN0IFNrQml0bWFwKiBjYW52YXNCaXRtYXAgPSBpbWFnZUJ1ZmZlci0+Y29udGV4dCgp LT5wbGF0Zm9ybUNvbnRleHQoKS0+Yml0bWFwKCk7CiAgICAgY29uc3QgU2tCaXRtYXAqIHJlYWRi YWNrQml0bWFwID0gMDsKICAgICBBU1NFUlQoY2FudmFzQml0bWFwLT5jb25maWcoKSA9PSBTa0Jp dG1hcDo6a0FSR0JfODg4OF9Db25maWcpOworICAgIEFTU0VSVChTa0JpdG1hcDo6Q29tcHV0ZUJ5 dGVzUGVyUGl4ZWwoY2FudmFzQml0bWFwLT5jb25maWcoKSkgPT0gNCk7CiAgICAgaWYgKGNhbnZh c0JpdG1hcC0+d2lkdGgoKSA9PSBtX2ltcGwtPndpZHRoKCkgJiYgY2FudmFzQml0bWFwLT5oZWln aHQoKSA9PSBtX2ltcGwtPmhlaWdodCgpKSB7CiAgICAgICAgIC8vIFRoaXMgaXMgdGhlIGZhc3Rl c3QgYW5kIG1vc3QgY29tbW9uIGNhc2UuIFdlIHJlYWQgYmFjawogICAgICAgICAvLyBkaXJlY3Rs eSBpbnRvIHRoZSBjYW52YXMncyBiYWNraW5nIHN0b3JlLgorICAgICAgICAvLyBNYWtlIHN1cmUg bm8gZXh0cmEgcGFkZGluZyBhdCBsaW5lIGVuZHMgKGUuZy4gYSBiaXRtYXAgZXh0cmFjdGVkIHN1 YnNldCkuCisgICAgICAgIEFTU0VSVChyZWFkYmFja0JpdG1hcC0+cm93Qnl0ZXMoKSA9PQorICAg ICAgICAgICAgICAgU2tCaXRtYXA6OkNvbXB1dGVSb3dCeXRlcyhyZWFkYmFja0JpdG1hcC0+Y29u ZmlnKCksIHJlYWRiYWNrQml0bWFwLT53aWR0aCgpKSk7CiAgICAgICAgIHJlYWRiYWNrQml0bWFw ID0gY2FudmFzQml0bWFwOwogICAgICAgICBtX3Jlc2l6aW5nQml0bWFwLnJlc2V0KCk7CiAgICAg fSBlbHNlIHsK 77333 2010-12-23 07:56:10 -0800 2010-12-23 08:26:17 -0800 Patch bug-51186-20101223110041.patch text/plain 4866 wjmaclean ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDI1ZDg3ZjViMmNkZmU1MDc0NDEzNzI0ZTVmZmRmYzQ1NGY2NzRiMy4uMGI0Y2I3ZTE2M2MyNjJj MmM4MjcwMzBkYjBhN2NkZjM5NmQxNWZkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0yMyAgVy4g SmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgYXNzZXJ0cyB0 byB0ZXN0IGZvciBjb250aWd1b3VzLXBpeGVsIFNraWEgYml0bWFwcy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMTg2CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBCZWhhdmlvdXIgbm90IGNoYW5nZWQsIGJ1dCBuZWVkIHRoZSBhc3NlcnRzIHRvIGRl dGVjdCB3aGVuIGFzc3VtcHRpb25zIHZpb2xhdGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNJZkRpcnR5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKToKKwogMjAxMC0xMi0y MyAgTHVjYXMgRGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5j cHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1 bS5jcHAKaW5kZXggY2QyOTljMWEwY2UzYjMwZTk1ZDkxNGRlMDUxYjk2MzIxOTg0OWNhYi4uNDRi Mjg4YzMzYzZhZmY2MDFhYmRlMjI1OGE1MmZjMjY1MDFlZTkxYiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNw cApAQCAtMTE5LDYgKzExOSwxMCBAQCB2b2lkIEltYWdlTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29u dGVudHNJZkRpcnR5KCkKICAgICAvLyBGSVhNRTogZG8gd2UgbmVlZCB0byBzdXBwb3J0IG1vcmUg aW1hZ2UgY29uZmlndXJhdGlvbnM/CiAgICAgaWYgKHNraWFDb25maWcgPT0gU2tCaXRtYXA6OmtB UkdCXzg4ODhfQ29uZmlnKQogICAgICAgICBwaXhlbHMgPSBza2lhQml0bWFwLT5nZXRQaXhlbHMo KTsKKyAgICAvLyBTaW5jZSB0aGlzIG9wZXJhdGlvbiByZXF1aXJlcyBjb250aWd1b3VzIHBpeGVs cywgbWFrZSBzdXJlIHRoZXJlJ3Mgbm8gcGFkZGluZyBhdCB0aGUKKyAgICAvLyBlbmQgb2YgZWFj aCBsaW5lLgorICAgIGlmIChwaXhlbHMpCisgICAgICAgIEFTU0VSVChza2lhQml0bWFwLT5yb3dC eXRlcygpID09IFNrQml0bWFwOjpDb21wdXRlUm93Qnl0ZXMoc2tpYUNvbmZpZywgc2tpYUJpdG1h cC0+d2lkdGgoKSkpOwogI2VsaWYgUExBVEZPUk0oQ0cpCiAgICAgLy8gRklYTUU6IHdlIHNob3Vs ZCBnZXQgcmlkIG9mIHRoaXMgdGVtcG9yYXJ5IGNvcHkgd2hlcmUgcG9zc2libGUuCiAgICAgaW50 IHRlbXBSb3dCeXRlcyA9IHdpZHRoICogNDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHQzRFNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHAKaW5kZXggOGI3YWM4NmZm NzYxYzc1NzNiMDNkMzY4NTFmNjM0MjMyYzc2ODY2Ni4uN2ZkN2M3MDk2NDhjNDA3ODhiYzBhNDE5 NGMyOGJjNTZlZDdkYzM3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHAKQEAgLTc4LDcgKzc4LDggQEAgYm9v bCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKEltYWdlKiBpbWFnZSwKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIFNrQml0bWFwJiBza2lhSW1hZ2VSZWYgPSAqc2tpYUltYWdlOwog ICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9jayhza2lhSW1hZ2VSZWYpOwotICAgIEFTU0VSVChza2lh SW1hZ2UtPnJvd0J5dGVzKCkgPT0gc2tpYUltYWdlLT53aWR0aCgpICogNCk7CisgICAgQVNTRVJU KHNraWFJbWFnZS0+Ynl0ZXNQZXJQaXhlbCgpID09IDQKKyAgICAgICAgICAgJiYgc2tpYUltYWdl LT5yb3dCeXRlcygpID09IFNrQml0bWFwOjpDb21wdXRlUm93Qnl0ZXMoc2tpYUltYWdlLT5jb25m aWcoKSwgc2tpYUltYWdlLT53aWR0aCgpKSk7CiAgICAgb3V0cHV0VmVjdG9yLnJlc2l6ZShza2lh SW1hZ2UtPnJvd0J5dGVzKCkgKiBza2lhSW1hZ2UtPmhlaWdodCgpKTsKICAgICByZXR1cm4gcGFj a1BpeGVscyhyZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihza2lhSW1hZ2UtPmdldFBp eGVscygpKSwKICAgICAgICAgICAgICAgICAgICAgICBTb3VyY2VGb3JtYXRCR1JBOCwgc2tpYUlt YWdlLT53aWR0aCgpLCBza2lhSW1hZ2UtPmhlaWdodCgpLCAwLApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMzM1 NzMyYTQyYWJhMGY4MzQ2MjRiZGVkMmU4MDMwNmEzODVmMmNhNi4uMGYzMjJjMWE1MDk1OWMzMGZh MTJmNmM2ZGQ2ZDdlZmFmN2Q5MjIxNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTAtMTItMjMgIFcuIEphbWVzIE1hY0xlYW4gIDx3am1hY2xlYW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIGFzc2VydHMgdG8gdGVzdCBmb3IgY29udGlndW91cy1waXhlbCBTa2lhIGJpdG1hcHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTE4NgorCisg ICAgICAgIEFkZCBhc3NlcnRzIHRvIGRldGVjdCBpZiBhc3N1bXB0aW9ucyAoYWJvdXQgY29udGln dW91cyBwaXhlbHMgaW4gU2tpYSBiaXRtYXBzKSBhcmUgdmlvbGF0ZWQuCisKKyAgICAgICAgKiBz cmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzREludGVybmFsOjpwYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcyk6CisK IDIwMTAtMTItMjIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3NDUwMy4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9zcmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHAgYi9XZWJLaXQv Y2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3BwCmluZGV4IDJkZmY1MmIz MDI0YTc5ZWVhNzNkMThkODQxMmNmNzA3ZDkxN2I2NzAuLjZhMGM2NzIxNmMxMDk3NTJlOWY1Yjg0 Njk5NmI0MjJlNjhjYmVlNmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvR3JhcGhp Y3NDb250ZXh0M0RDaHJvbWl1bS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGlj c0NvbnRleHQzRENocm9taXVtLmNwcApAQCAtMTcyLDkgKzE3MiwxMyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDNESW50ZXJuYWw6OnBhaW50UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFzKENhbnZhc1Jl bmRlcmluZ0NvbgogICAgIGNvbnN0IFNrQml0bWFwKiBjYW52YXNCaXRtYXAgPSBpbWFnZUJ1ZmZl ci0+Y29udGV4dCgpLT5wbGF0Zm9ybUNvbnRleHQoKS0+Yml0bWFwKCk7CiAgICAgY29uc3QgU2tC aXRtYXAqIHJlYWRiYWNrQml0bWFwID0gMDsKICAgICBBU1NFUlQoY2FudmFzQml0bWFwLT5jb25m aWcoKSA9PSBTa0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcpOworICAgIEFTU0VSVChTa0JpdG1h cDo6Q29tcHV0ZUJ5dGVzUGVyUGl4ZWwoY2FudmFzQml0bWFwLT5jb25maWcoKSkgPT0gNCk7CiAg ICAgaWYgKGNhbnZhc0JpdG1hcC0+d2lkdGgoKSA9PSBtX2ltcGwtPndpZHRoKCkgJiYgY2FudmFz Qml0bWFwLT5oZWlnaHQoKSA9PSBtX2ltcGwtPmhlaWdodCgpKSB7CiAgICAgICAgIC8vIFRoaXMg aXMgdGhlIGZhc3Rlc3QgYW5kIG1vc3QgY29tbW9uIGNhc2UuIFdlIHJlYWQgYmFjawogICAgICAg ICAvLyBkaXJlY3RseSBpbnRvIHRoZSBjYW52YXMncyBiYWNraW5nIHN0b3JlLgorICAgICAgICAv LyBNYWtlIHN1cmUgbm8gZXh0cmEgcGFkZGluZyBhdCBsaW5lIGVuZHMgKGUuZy4gYSBiaXRtYXAg ZXh0cmFjdGVkIHN1YnNldCkuCisgICAgICAgIEFTU0VSVChyZWFkYmFja0JpdG1hcC0+cm93Qnl0 ZXMoKSA9PQorICAgICAgICAgICAgICAgU2tCaXRtYXA6OkNvbXB1dGVSb3dCeXRlcyhyZWFkYmFj a0JpdG1hcC0+Y29uZmlnKCksIHJlYWRiYWNrQml0bWFwLT53aWR0aCgpKSk7CiAgICAgICAgIHJl YWRiYWNrQml0bWFwID0gY2FudmFzQml0bWFwOwogICAgICAgICBtX3Jlc2l6aW5nQml0bWFwLnJl c2V0KCk7CiAgICAgfSBlbHNlIHsK 77335 2010-12-23 08:26:21 -0800 2010-12-23 08:56:48 -0800 Patch bug-51186-20101223113053.patch text/plain 4855 wjmaclean ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDI1ZDg3ZjViMmNkZmU1MDc0NDEzNzI0ZTVmZmRmYzQ1NGY2NzRiMy4uMGI0Y2I3ZTE2M2MyNjJj MmM4MjcwMzBkYjBhN2NkZjM5NmQxNWZkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0yMyAgVy4g SmFtZXMgTWFjTGVhbiAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBBZGQgYXNzZXJ0cyB0 byB0ZXN0IGZvciBjb250aWd1b3VzLXBpeGVsIFNraWEgYml0bWFwcy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMTg2CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBCZWhhdmlvdXIgbm90IGNoYW5nZWQsIGJ1dCBuZWVkIHRoZSBhc3NlcnRzIHRvIGRl dGVjdCB3aGVuIGFzc3VtcHRpb25zIHZpb2xhdGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNJZkRpcnR5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dDNEU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0SW1hZ2VEYXRhKToKKwogMjAxMC0xMi0y MyAgTHVjYXMgRGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5j cHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1 bS5jcHAKaW5kZXggY2QyOTljMWEwY2UzYjMwZTk1ZDkxNGRlMDUxYjk2MzIxOTg0OWNhYi4uMTg2 ZDkyMjZiYWUxYmE0Y2UxOTIwYWJmNzU0ZmU5NzY2MTJlNTQwMyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNw cApAQCAtMTE5LDYgKzExOSw5IEBAIHZvaWQgSW1hZ2VMYXllckNocm9taXVtOjp1cGRhdGVDb250 ZW50c0lmRGlydHkoKQogICAgIC8vIEZJWE1FOiBkbyB3ZSBuZWVkIHRvIHN1cHBvcnQgbW9yZSBp bWFnZSBjb25maWd1cmF0aW9ucz8KICAgICBpZiAoc2tpYUNvbmZpZyA9PSBTa0JpdG1hcDo6a0FS R0JfODg4OF9Db25maWcpCiAgICAgICAgIHBpeGVscyA9IHNraWFCaXRtYXAtPmdldFBpeGVscygp OworICAgIC8vIFNpbmNlIHRoaXMgb3BlcmF0aW9uIHJlcXVpcmVzIGNvbnRpZ3VvdXMgcGl4ZWxz LCBtYWtlIHN1cmUgdGhlcmUncyBubyBwYWRkaW5nIGF0IHRoZQorICAgIC8vIGVuZCBvZiBlYWNo IGxpbmUuCisgICAgQVNTRVJUKCFwaXhlbHMgfHwgc2tpYUJpdG1hcC0+cm93Qnl0ZXMoKSA9PSBT a0JpdG1hcDo6Q29tcHV0ZVJvd0J5dGVzKHNraWFDb25maWcsIHNraWFCaXRtYXAtPndpZHRoKCkp KTsKICNlbGlmIFBMQVRGT1JNKENHKQogICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQgZ2V0IHJpZCBv ZiB0aGlzIHRlbXBvcmFyeSBjb3B5IHdoZXJlIHBvc3NpYmxlLgogICAgIGludCB0ZW1wUm93Qnl0 ZXMgPSB3aWR0aCAqIDQ7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvR3JhcGhpY3NDb250ZXh0M0RTa2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9HcmFwaGljc0NvbnRleHQzRFNraWEuY3BwCmluZGV4IDhiN2FjODZmZjc2MWM3NTczYjAz ZDM2ODUxZjYzNDIzMmM3Njg2NjYuLjdmZDdjNzA5NjQ4YzQwNzg4YmMwYTQxOTRjMjhiYzU2ZWQ3 ZGMzNzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGlj c0NvbnRleHQzRFNraWEuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9H cmFwaGljc0NvbnRleHQzRFNraWEuY3BwCkBAIC03OCw3ICs3OCw4IEBAIGJvb2wgR3JhcGhpY3ND b250ZXh0M0Q6OmdldEltYWdlRGF0YShJbWFnZSogaW1hZ2UsCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICBTa0JpdG1hcCYgc2tpYUltYWdlUmVmID0gKnNraWFJbWFnZTsKICAgICBTa0F1dG9M b2NrUGl4ZWxzIGxvY2soc2tpYUltYWdlUmVmKTsKLSAgICBBU1NFUlQoc2tpYUltYWdlLT5yb3dC eXRlcygpID09IHNraWFJbWFnZS0+d2lkdGgoKSAqIDQpOworICAgIEFTU0VSVChza2lhSW1hZ2Ut PmJ5dGVzUGVyUGl4ZWwoKSA9PSA0CisgICAgICAgICAgICYmIHNraWFJbWFnZS0+cm93Qnl0ZXMo KSA9PSBTa0JpdG1hcDo6Q29tcHV0ZVJvd0J5dGVzKHNraWFJbWFnZS0+Y29uZmlnKCksIHNraWFJ bWFnZS0+d2lkdGgoKSkpOwogICAgIG91dHB1dFZlY3Rvci5yZXNpemUoc2tpYUltYWdlLT5yb3dC eXRlcygpICogc2tpYUltYWdlLT5oZWlnaHQoKSk7CiAgICAgcmV0dXJuIHBhY2tQaXhlbHMocmVp bnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oc2tpYUltYWdlLT5nZXRQaXhlbHMoKSksCiAg ICAgICAgICAgICAgICAgICAgICAgU291cmNlRm9ybWF0QkdSQTgsIHNraWFJbWFnZS0+d2lkdGgo KSwgc2tpYUltYWdlLT5oZWlnaHQoKSwgMCwKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDMzNTczMmE0MmFiYTBm ODM0NjI0YmRlZDJlODAzMDZhMzg1ZjJjYTYuLjBmMzIyYzFhNTA5NTljMzBmYTEyZjZjNmRkNmQ3 ZWZhZjdkOTIyMTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTEyLTIzICBX LiBKYW1lcyBNYWNMZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCBhc3NlcnRz IHRvIHRlc3QgZm9yIGNvbnRpZ3VvdXMtcGl4ZWwgU2tpYSBiaXRtYXBzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTExODYKKworICAgICAgICBBZGQg YXNzZXJ0cyB0byBkZXRlY3QgaWYgYXNzdW1wdGlvbnMgKGFib3V0IGNvbnRpZ3VvdXMgcGl4ZWxz IGluIFNraWEgYml0bWFwcykgYXJlIHZpb2xhdGVkLgorCisgICAgICAgICogc3JjL0dyYXBoaWNz Q29udGV4dDNEQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 M0RJbnRlcm5hbDo6cGFpbnRSZW5kZXJpbmdSZXN1bHRzVG9DYW52YXMpOgorCiAyMDEwLTEyLTIy ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByNzQ1MDMuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3BwIGIvV2ViS2l0L2Nocm9taXVtL3Ny Yy9HcmFwaGljc0NvbnRleHQzRENocm9taXVtLmNwcAppbmRleCAyZGZmNTJiMzAyNGE3OWVlYTcz ZDE4ZDg0MTJjZjcwN2Q5MTdiNjcwLi42YTBjNjcyMTZjMTA5NzUyZTlmNWI4NDY5OTZiNDIyZTY4 Y2JlZTZiIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL0dyYXBoaWNzQ29udGV4dDNE Q2hyb21pdW0uY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvR3JhcGhpY3NDb250ZXh0M0RD aHJvbWl1bS5jcHAKQEAgLTE3Miw5ICsxNzIsMTMgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRElu dGVybmFsOjpwYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcyhDYW52YXNSZW5kZXJpbmdDb24K ICAgICBjb25zdCBTa0JpdG1hcCogY2FudmFzQml0bWFwID0gaW1hZ2VCdWZmZXItPmNvbnRleHQo KS0+cGxhdGZvcm1Db250ZXh0KCktPmJpdG1hcCgpOwogICAgIGNvbnN0IFNrQml0bWFwKiByZWFk YmFja0JpdG1hcCA9IDA7CiAgICAgQVNTRVJUKGNhbnZhc0JpdG1hcC0+Y29uZmlnKCkgPT0gU2tC aXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnKTsKKyAgICBBU1NFUlQoU2tCaXRtYXA6OkNvbXB1dGVC eXRlc1BlclBpeGVsKGNhbnZhc0JpdG1hcC0+Y29uZmlnKCkpID09IDQpOwogICAgIGlmIChjYW52 YXNCaXRtYXAtPndpZHRoKCkgPT0gbV9pbXBsLT53aWR0aCgpICYmIGNhbnZhc0JpdG1hcC0+aGVp Z2h0KCkgPT0gbV9pbXBsLT5oZWlnaHQoKSkgewogICAgICAgICAvLyBUaGlzIGlzIHRoZSBmYXN0 ZXN0IGFuZCBtb3N0IGNvbW1vbiBjYXNlLiBXZSByZWFkIGJhY2sKICAgICAgICAgLy8gZGlyZWN0 bHkgaW50byB0aGUgY2FudmFzJ3MgYmFja2luZyBzdG9yZS4KKyAgICAgICAgLy8gTWFrZSBzdXJl IG5vIGV4dHJhIHBhZGRpbmcgYXQgbGluZSBlbmRzIChlLmcuIGEgYml0bWFwIGV4dHJhY3RlZCBz dWJzZXQpLgorICAgICAgICBBU1NFUlQocmVhZGJhY2tCaXRtYXAtPnJvd0J5dGVzKCkgPT0KKyAg ICAgICAgICAgICAgIFNrQml0bWFwOjpDb21wdXRlUm93Qnl0ZXMocmVhZGJhY2tCaXRtYXAtPmNv bmZpZygpLCByZWFkYmFja0JpdG1hcC0+d2lkdGgoKSkpOwogICAgICAgICByZWFkYmFja0JpdG1h cCA9IGNhbnZhc0JpdG1hcDsKICAgICAgICAgbV9yZXNpemluZ0JpdG1hcC5yZXNldCgpOwogICAg IH0gZWxzZSB7Cg==