44076 2010-08-16 15:07:32 -0700 [Cairo] Remove unnecessary full-surface copies from ImageCairo and GraphicsContextCairo 2010-08-18 07:10:51 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned abarth antognolli+webkit eric hyatt krit webkit.review.bot oldest_to_newest 265251 0 mrobinson 2010-08-16 15:07:32 -0700 r65451 exposed a couple unnecessary full-surface copies in the Cairo code. This patch tracks removing them. 265261 1 64527 mrobinson 2010-08-16 15:24:32 -0700 Created attachment 64527 Patch for this issue 265263 2 webkit.review.bot 2010-08-16 15:26:08 -0700 Attachment 64527 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/graphics/cairo/GRefPtrCairo.h:25: cairo_t is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebCore/platform/graphics/cairo/GRefPtrCairo.h:26: cairo_surface_t is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 265265 3 mrobinson 2010-08-16 15:30:00 -0700 These style issues are false positives from new forward declarations. 265323 4 64527 hyatt 2010-08-16 18:07:06 -0700 Comment on attachment 64527 Patch for this issue r=me 265684 5 64527 mrobinson 2010-08-17 12:05:09 -0700 Comment on attachment 64527 Patch for this issue Clearing flags on attachment: 64527 Committed r65530: <http://trac.webkit.org/changeset/65530> 265685 6 mrobinson 2010-08-17 12:05:15 -0700 All reviewed patches have been landed. Closing bug. 265705 7 webkit.review.bot 2010-08-17 12:46:08 -0700 http://trac.webkit.org/changeset/65530 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/65529 http://trac.webkit.org/changeset/65530 64527 2010-08-16 15:24:32 -0700 2010-08-17 12:05:09 -0700 Patch for this issue bug-44076-20100816152429.patch text/plain 8639 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTViYmM3NGE5NzVmZGI1MDU2Y2NjOTc4ZGIyNTI5YWNlZDZhMTk2MS4uOWM4NzhhOGQ4MGIwZmQ3 MTAwMTc0MDFhNTFmMWNiMDY3ZjBiZDAxZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wOC0xNiAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0NhaXJvXSBSZW1vdmUgdW5uZWNlc3Nhcnkg ZnVsbC1zdXJmYWNlIGNvcGllcyBmcm9tIEltYWdlQ2Fpcm8gYW5kIEdyYXBoaWNzQ29udGV4dENh aXJvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDA3 NgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyBmdW5jdGlvbmFsaXR5IGhhcyBub3QgY2hhbmdl ZC4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBBZGRlZCBHUmVmUHRyQ2Fpcm8gdG8gdGhl IHNvdXJjZXMgbGlzdC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HUmVmUHRy Q2Fpcm8uY3BwOiBBZGRlZC4KKyAgICAgICAgKFdURjo6cmVmR1B0cik6IEFkZGVkIHNwZWNpYWxp emF0aW9ucyBmb3IgY2Fpcm9fdCBhbmQgY2Fpcm9fc3VyZmFjZV90LgorICAgICAgICAoV1RGOjpk ZXJlZkdQdHIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dSZWZQdHJDYWly by5oOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNyZWF0 ZVBsYXRmb3JtU2hhZG93KTogQWNjZXNzIHRoZSBpbWFnZSBzdXJmYWNlIGRpcmVjdGx5CisgICAg ICAgIGZyb20gdGhlIEltYWdlQnVmZmVyIGluc3RlYWQgb2Ygd3JhcHBpbmcgaXQgaW4gYW4gSW1h Z2UuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VDYWlyby5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZTo6ZHJhd1BhdHRlcm4pOiBDcmVhdGUgdGhlIHRlbXBvcmFy eSBzdXJmYWNlIHVzaW5nIGNhaXJvIHByaW1pdGl2ZXMKKyAgICAgICAgaW5zdGVhZCBvZiB0aHJv dWdoIHRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBXZWJDb3JlIGNvZGUuCisKIDIwMTAtMDgtMTYg IERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFu ZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9XZWJD b3JlL0dOVW1ha2VmaWxlLmFtCmluZGV4IDE5YjI1ZWU0OGFmODZmYzIyOGRiOTc5M2Y3OGIxM2My NTYxMTBhODkuLjQ4OGIyMGViYTczOGQyZjliMGIxYjM4YjQ5ODUyNDcxYTAyMTMyODIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5h bQpAQCAtMjQ0Miw2ICsyNDQyLDggQEAgd2ViY29yZWd0a19zb3VyY2VzICs9IFwKIAlXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRQbGF0Zm9ybURhdGEuaCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uY3BwIFwKIAlXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5oIFwKKwlXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dSZWZQdHJDYWlyby5jcHAgXAorCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vR1JlZlB0ckNhaXJvLmggXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vR3JhZGllbnRDYWlyby5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v R3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0dyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNhaXJvLmggXApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HUmVmUHRyQ2Fpcm8uY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HUmVmUHRyQ2Fpcm8uY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQy NDQ5NTQ5MDg0MWVjMjM3N2MwNDgzYjZkZmI0MDU2NGE0MTQwZjgKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dSZWZQdHJDYWlyby5jcHAKQEAgLTAs MCArMSw1MiBAQAorLyoKKyAqICBDb3B5cmlnaHQgKEMpIDIwMTAgSWdhbGlhIFMuTC4KKyAqCisg KiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vcgorICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIg R2VuZXJhbCBQdWJsaWMKKyAqICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9y IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogIFRoaXMgbGlicmFy eSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICog IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQ VVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqICBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBm b3IgbW9yZSBkZXRhaWxzLgorICoKKyAqICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5 IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiAgTGljZW5zZSBhbG9uZyB3aXRo IHRoaXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICogIEZv dW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3Rvbiwg TUEgIDAyMTEwLTEzMDEgIFVTQQorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRl ICJHUmVmUHRyQ2Fpcm8uaCIKKworI2luY2x1ZGUgPGNhaXJvLmg+CisKK25hbWVzcGFjZSBXVEYg eworCit0ZW1wbGF0ZSA8PiBjYWlyb190KiByZWZHUHRyKGNhaXJvX3QqIHB0cikKK3sKKyAgICBp ZiAocHRyKQorICAgICAgICBjYWlyb19yZWZlcmVuY2UocHRyKTsKKyAgICByZXR1cm4gcHRyOwor fQorCit0ZW1wbGF0ZSA8PiB2b2lkIGRlcmVmR1B0cihjYWlyb190KiBwdHIpCit7CisgICAgaWYg KHB0cikKKyAgICAgICAgY2Fpcm9fZGVzdHJveShwdHIpOworfQorCit0ZW1wbGF0ZSA8PiBjYWly b19zdXJmYWNlX3QqIHJlZkdQdHIoY2Fpcm9fc3VyZmFjZV90KiBwdHIpCit7CisgICAgaWYgKHB0 cikKKyAgICAgICAgY2Fpcm9fc3VyZmFjZV9yZWZlcmVuY2UocHRyKTsKKyAgICByZXR1cm4gcHRy OworfQorCit0ZW1wbGF0ZSA8PiB2b2lkIGRlcmVmR1B0cihjYWlyb19zdXJmYWNlX3QqIHB0cikK K3sKKyAgICBpZiAocHRyKQorICAgICAgICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3kocHRyKTsKK30K KworfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HUmVmUHRy Q2Fpcm8uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR1JlZlB0ckNhaXJvLmgK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYWVmNTFmZWFlYmIxNjM2OTllZjJjZjZmOGQ3MmVlNDY3NmRlOGM4YwotLS0g L2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR1JlZlB0ckNh aXJvLmgKQEAgLTAsMCArMSwzOCBAQAorLyoKKyAqICBDb3B5cmlnaHQgKEMpIDIwMTAgSWdhbGlh IFMuTC4KKyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVk aXN0cmlidXRlIGl0IGFuZC9vcgorICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiAgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkg dGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiAgdmVyc2lvbiAyIG9mIHRo ZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAq ICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJl IHVzZWZ1bCwKKyAqICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUg aW1wbGllZCB3YXJyYW50eSBvZgorICogIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiAgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogIFlvdSBzaG91bGQgaGF2ZSBy ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UK KyAqICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAg SWYgbm90LCB3cml0ZSB0bworICogIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4s IDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgKiAgQm9zdG9uLCBNQSAwMjExMC0x MzAxLCBVU0EuCisgKi8KKworI2lmbmRlZiBHUmVmUHRyQ2Fpcm9faAorI2RlZmluZSBHUmVmUHRy Q2Fpcm9faAorCisjaW5jbHVkZSAiR1JlZlB0ci5oIgorCit0eXBlZGVmIHN0cnVjdCBfY2Fpcm8g Y2Fpcm9fdDsKK3R5cGVkZWYgc3RydWN0IF9jYWlyb19zdXJmYWNlIGNhaXJvX3N1cmZhY2VfdDsK KworbmFtZXNwYWNlIFdURiB7CisKK3RlbXBsYXRlIDw+IGNhaXJvX3QqIHJlZkdQdHIoY2Fpcm9f dCogcHRyKTsKK3RlbXBsYXRlIDw+IHZvaWQgZGVyZWZHUHRyKGNhaXJvX3QqIHB0cik7CisKK3Rl bXBsYXRlIDw+IGNhaXJvX3N1cmZhY2VfdCogcmVmR1B0cihjYWlyb19zdXJmYWNlX3QqIHB0cik7 Cit0ZW1wbGF0ZSA8PiB2b2lkIGRlcmVmR1B0cihjYWlyb19zdXJmYWNlX3QqIHB0cik7CisKK30K KworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dy YXBoaWNzQ29udGV4dENhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v R3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IDNlNjJlZTI1YzhkNTA4Y2UxZDA5YTMxNjgw ZDlhNTJlYzc2NTQ0ZjIuLjliMzA5NmVkNTQyZDJkMmFkMmY3YTc2YjBkZmM1NTU5MWM4MDllNDgg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhp Y3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC05MjgsOCArOTI4LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmNyZWF0ZVBsYXRmb3JtU2hhZG93KFBhc3NPd25QdHI8SW1hZ2VCdWZmZXI+IGJ1ZmZlciwg Y29uc3QKICAgICAvLyBkcmF3IHRoZSBzaGFkb3cgd2l0aG91dCBibHVycmluZywgaWYga2VybmVs U2l6ZSBpcyB6ZXJvCiAgICAgaWYgKCFrZXJuZWxTaXplKSB7CiAgICAgICAgIHNldENvbG9yKGNy LCBzaGFkb3dDb2xvcik7Ci0gICAgICAgIFJlZlB0cjxJbWFnZT4gY29waWVkSW1hZ2UgPSBidWZm ZXItPmNvcHlJbWFnZSgpOyAvLyBGSVhNRTogQ29weWluZyB0aGUgaW1hZ2UgaXMgd2FzdGVmdWwu Ci0gICAgICAgIGNhaXJvX21hc2tfc3VyZmFjZShjciwgY29waWVkSW1hZ2UtPm5hdGl2ZUltYWdl Rm9yQ3VycmVudEZyYW1lKCksIHNoYWRvd1JlY3QueCgpLCBzaGFkb3dSZWN0LnkoKSk7CisgICAg ICAgIGNhaXJvX21hc2tfc3VyZmFjZShjciwgYnVmZmVyLT5tX2RhdGEubV9zdXJmYWNlLCBzaGFk b3dSZWN0LngoKSwgc2hhZG93UmVjdC55KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBA IC05NDksOCArOTQ4LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNyZWF0ZVBsYXRmb3JtU2hh ZG93KFBhc3NPd25QdHI8SW1hZ2VCdWZmZXI+IGJ1ZmZlciwgY29uc3QKICAgICAvLyBNYXNrIHRo ZSBmaWx0ZXIgd2l0aCB0aGUgc2hhZG93IGNvbG9yIGFuZCBkcmF3IGl0IHRvIHRoZSBjb250ZXh0 LgogICAgIC8vIE1hc2tpbmcgbWFrZXMgaXQgcG9zc2libGUgdG8ganVzdCBibHVyIHRoZSBhbHBo YSBjaGFubmVsLgogICAgIHNldENvbG9yKGNyLCBzaGFkb3dDb2xvcik7Ci0gICAgUmVmUHRyPElt YWdlPiBjb3BpZWRJbWFnZSA9IGJsdXItPnJlc3VsdEltYWdlKCktPmNvcHlJbWFnZSgpOyAvLyBG SVhNRTogQ29weWluZyB0aGUgaW1hZ2UgaXMgd2FzdGVmdWwuCi0gICAgY2Fpcm9fbWFza19zdXJm YWNlKGNyLCBjb3BpZWRJbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKSwgc2hhZG93 UmVjdC54KCksIHNoYWRvd1JlY3QueSgpKTsKKyAgICBjYWlyb19tYXNrX3N1cmZhY2UoY3IsIGJs dXItPnJlc3VsdEltYWdlKCktPm1fZGF0YS5tX3N1cmZhY2UsIHNoYWRvd1JlY3QueCgpLCBzaGFk b3dSZWN0LnkoKSk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9JbWFnZUNhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vSW1hZ2VDYWlyby5jcHAKaW5kZXggYThhODZiOTA4YjNkYTUxYjM1MmNlNGNiNTM4Y2Qx OWY1MDljOWJiNy4uMTU4MjY3MWUxOGRlYWI4NWRlZjZmNmZiNmRiNDcyMWJlZGRkMjgzMCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUNhaXJvLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ltYWdlQ2Fpcm8uY3BwCkBAIC0z Myw2ICszMyw3IEBACiAjaW5jbHVkZSAiQWZmaW5lVHJhbnNmb3JtLmgiCiAjaW5jbHVkZSAiQ29s b3IuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKKyNpbmNsdWRlICJHUmVmUHRyQ2Fpcm8uaCIK ICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJJbWFnZUJ1ZmZlci5oIgog I2luY2x1ZGUgIkltYWdlT2JzZXJ2ZXIuaCIKQEAgLTE4NCwxOCArMTg1LDE0IEBAIHZvaWQgSW1h Z2U6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRSZWN0 JiB0aWxlUmVjdCwgY29uCiAgICAgY2Fpcm9fdCogY3IgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKTsKICAgICBjb250ZXh0LT5zYXZlKCk7CiAKLSAgICBJbnRSZWN0IGltYWdlU2l6ZSA9IGVu Y2xvc2luZ0ludFJlY3QodGlsZVJlY3QpOwotICAgIE93blB0cjxJbWFnZUJ1ZmZlcj4gaW1hZ2VT dXJmYWNlID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZShpbWFnZVNpemUuc2l6ZSgpKTsKLQotICAgIGlm ICghaW1hZ2VTdXJmYWNlKQotICAgICAgICByZXR1cm47Ci0KKyAgICBHUmVmUHRyPGNhaXJvX3N1 cmZhY2VfdD4gY2xpcHBlZEltYWdlU3VyZmFjZSA9IDA7CiAgICAgaWYgKHRpbGVSZWN0LnNpemUo KSAhPSBzaXplKCkpIHsKLSAgICAgICAgY2Fpcm9fdCogY2xpcHBlZEltYWdlQ29udGV4dCA9IGlt YWdlU3VyZmFjZS0+Y29udGV4dCgpLT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICAgICAgY2Fpcm9f c2V0X3NvdXJjZV9zdXJmYWNlKGNsaXBwZWRJbWFnZUNvbnRleHQsIGltYWdlLCAtdGlsZVJlY3Qu eCgpLCAtdGlsZVJlY3QueSgpKTsKLSAgICAgICAgY2Fpcm9fcGFpbnQoY2xpcHBlZEltYWdlQ29u dGV4dCk7Ci0gICAgICAgIFJlZlB0cjxJbWFnZT4gY29waWVkSW1hZ2UgPSBpbWFnZVN1cmZhY2Ut PmNvcHlJbWFnZSgpOyAvLyBGSVhNRTogQ29weWluZyBoZXJlIGlzIHdhc3RlZnVsLgotICAgICAg ICBpbWFnZSA9IGNvcGllZEltYWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpOworICAg ICAgICBJbnRSZWN0IGltYWdlU2l6ZSA9IGVuY2xvc2luZ0ludFJlY3QodGlsZVJlY3QpOworICAg ICAgICBjbGlwcGVkSW1hZ2VTdXJmYWNlID0gYWRvcHRHUmVmKGNhaXJvX2ltYWdlX3N1cmZhY2Vf Y3JlYXRlKENBSVJPX0ZPUk1BVF9BUkdCMzIsIGltYWdlU2l6ZS53aWR0aCgpLCBpbWFnZVNpemUu aGVpZ2h0KCkpKTsKKyAgICAgICAgR1JlZlB0cjxjYWlyb190PiBjbGlwcGVkSW1hZ2VDb250ZXh0 KGNhaXJvX2NyZWF0ZShjbGlwcGVkSW1hZ2VTdXJmYWNlLmdldCgpKSk7CisgICAgICAgIGNhaXJv X3NldF9zb3VyY2Vfc3VyZmFjZShjbGlwcGVkSW1hZ2VDb250ZXh0LmdldCgpLCBpbWFnZSwgLXRp bGVSZWN0LngoKSwgLXRpbGVSZWN0LnkoKSk7CisgICAgICAgIGNhaXJvX3BhaW50KGNsaXBwZWRJ bWFnZUNvbnRleHQuZ2V0KCkpOworICAgICAgICBpbWFnZSA9IGNsaXBwZWRJbWFnZVN1cmZhY2Uu Z2V0KCk7CiAgICAgfQogCiAgICAgY2Fpcm9fcGF0dGVybl90KiBwYXR0ZXJuID0gY2Fpcm9fcGF0 dGVybl9jcmVhdGVfZm9yX3N1cmZhY2UoaW1hZ2UpOwo=