138990 2014-11-21 15:50:27 -0800 Page previews should have a margin 2014-11-21 16:07:36 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 conrad_shultz conrad_shultz andersca bdakin conrad_shultz thorton webkit-bug-importer oldest_to_newest 1050617 0 conrad_shultz 2014-11-21 15:50:27 -0800 Page previews should have a margin. 1050618 1 webkit-bug-importer 2014-11-21 15:51:24 -0800 <rdar://problem/19064523> 1050622 2 242090 conrad_shultz 2014-11-21 15:55:35 -0800 Created attachment 242090 Patch 1050629 3 conrad_shultz 2014-11-21 16:07:36 -0800 Committed r176483: <http://trac.webkit.org/changeset/176483> 242090 2014-11-21 15:55:35 -0800 2014-11-21 15:58:52 -0800 Patch bug-138990-20141121155552.patch text/plain 9594 conrad_shultz U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2EzZWQwNWU0NThlZGQx YmMyMTcwZjJiZjc0N2YwNmQ1MmY2YTk2MC4uOWJhZjc1ODlkYjI0YWQyYTcyOGRjM2I5Njk1MWQ0 Mjc0OGMyNzI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTExLTIxICBDb25y YWQgU2h1bHR6ICA8Y29ucmFkX3NodWx0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUGFnZSBwcmV2 aWV3cyBzaG91bGQgaGF2ZSBhIG1hcmdpbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzODk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEVuY2xvc2UgdGhlIFdLV2ViVmlldyAob3IgY2xpZW50LXN1cHBs aWVkIHByZXZpZXcgdmlldykgaW4gYSBjb250YWluZXIgc2xpZ2h0bHkgbGFyZ2VyCisgICAgICAg IHRoYW4gdGhlIHByZXZpZXcgdmlldy4gQWRqdXN0IHNpemluZyBjb2RlIHRvIGFjY29tbW9kYXRl IHRoZSBtYXJnaW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRy b2xsZXIubW06CisgICAgICAgICgrW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBwcmV2aWV3 UGFkZGluZ10pOgorICAgICAgICBSZXR1cm4gdGhlIHRvdGFsIGFtb3VudCBvZiBmaXhlZCBwYWRk aW5nIHN1cnJvdW5kaW5nIHRoZSBwcmV2aWV3CisgICAgICAgICgtW1dLUGFnZVByZXZpZXdWaWV3 Q29udHJvbGxlciBsb2FkVmlld10pOgorICAgICAgICBTdG9yZSB0aGUgYWN0dWFsIHByZXZpZXdW aWV3IGluIGFuIGl2YXIgc28gdGhhdCBjbGllbnRzIGNhbiBkaXN0aW5ndWlzaCBpdCBmcm9tIHRo ZSBjb250YWluZXIKKyAgICAgICAgdmlldzsgd3JhcCB0aGUgcHJldmlldyBpbiBhIGNvbnRhaW5l ciB2aWV3OyBzZXQgZnJhbWVzIGFwcHJvcHJpYXRlbHkuCisgICAgICAgICgtW1dLQWN0aW9uTWVu dUNvbnRyb2xsZXIgX2NyZWF0ZVByZXZpZXdQb3BvdmVyXSk6CisgICAgICAgIFVwZGF0ZSB0byBy ZWZsZWN0IG1ldGhvZCByZW5hbWU7IHN1cHBsZW1lbnQgdGhlIHBvcG92ZXIgc2l6ZSB3aXRoIHRo ZSBmaXhlZCBwYWRkaW5nLgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9wcmVm ZXJyZWRQb3BvdmVyU2l6ZVdpdGhQcmV2aWV3UGFkZGluZzpdKToKKyAgICAgICAgUmVuYW1lZCBm cm9tIC1fcHJlZmVycmVkUG9wb3ZlclNpemU7IGFjY291bnQgZm9yIHRoZSBmaXhlZCBwYWRkaW5n IHdoZW4gY29tcHV0aW5nIHRoZSBwcmVmZXJyZWQgc2l6ZS4KKyAgICAgICAgKC1bV0tBY3Rpb25N ZW51Q29udHJvbGxlciBfY2xlYXJQcmV2aWV3UG9wb3Zlcl0pOgorICAgICAgICBVc2UgdGhlIHBy ZXZpZXdWaWV3IGl2YXIgaW5zdGVhZCBvZiB0aGUgdmlldyBjb250cm9sbGVyJ3Mgdmlldy4KKyAg ICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBwYWdlUHJldmlld1ZpZXdDb250cm9sbGVy V2FzQ2xpY2tlZDpdKToKKyAgICAgICAgRGl0dG8uCisgICAgICAgICgtW1dLQWN0aW9uTWVudUNv bnRyb2xsZXIgX3ByZWZlcnJlZFBvcG92ZXJTaXplXSk6IERlbGV0ZWQuCisKIDIwMTQtMTEtMjEg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBU ZXh0SW5kaWNhdG9ye1dpbmRvd30gdG8gV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IGVjYmU3ZjVk YzliMTdiNGJiNDE3MzRmN2ZmNjcyNzVmMWNlZmQ2MTQuLjM2ZTA2NTUxOTMzODgwZjliMjU5YTMy N2FmODczNWMxMjE1MzU2YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KQEAgLTcxLDYgKzcxLDggQEAgdXNpbmcg bmFtZXNwYWNlIFdlYktpdDsKIAogI2lmIFdLX0FQSV9FTkFCTEVECiAKK3N0YXRpYyBjb25zdCBD R0Zsb2F0IHByZXZpZXdWaWV3SW5zZXQgPSAzOworCiBAY2xhc3MgV0tQYWdlUHJldmlld1ZpZXdD b250cm9sbGVyOwogCiBAcHJvdG9jb2wgV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyRGVsZWdh dGUgPE5TT2JqZWN0PgpAQCAtODIsMTIgKzg0LDE1IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7 CiBAcHVibGljCiAgICAgTlNTaXplIF9tYWluVmlld1NpemU7CiAgICAgUmV0YWluUHRyPE5TVVJM PiBfdXJsOworICAgIFJldGFpblB0cjxOU1ZpZXc+IF9wcmV2aWV3VmlldzsKICAgICBpZCA8V0tQ YWdlUHJldmlld1ZpZXdDb250cm9sbGVyRGVsZWdhdGU+IF9kZWxlZ2F0ZTsKICAgICBDR0Zsb2F0 IF9wb3BvdmVyVG9WaWV3U2NhbGU7CiB9CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2VV Ukw6KE5TVVJMICopVVJMIG1haW5WaWV3U2l6ZTooTlNTaXplKXNpemUgcG9wb3ZlclRvVmlld1Nj YWxlOihDR0Zsb2F0KXNjYWxlOwogCisrIChOU1NpemUpcHJldmlld1BhZGRpbmc7CisKIEBlbmQK IAogQGltcGxlbWVudGF0aW9uIFdLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcgpAQCAtMTA0LDI2 ICsxMDksNDIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKICAgICByZXR1cm4gc2VsZjsKIH0K IAorKyAoTlNTaXplKXByZXZpZXdQYWRkaW5nCit7CisgICAgcmV0dXJuIE5TTWFrZVNpemUoMiAq IHByZXZpZXdWaWV3SW5zZXQsIDIgKiBwcmV2aWV3Vmlld0luc2V0KTsKK30KKwogLSAodm9pZCls b2FkVmlldwogewogICAgIE5TUmVjdCBkZWZhdWx0RnJhbWUgPSBOU01ha2VSZWN0KDAsIDAsIF9t YWluVmlld1NpemUud2lkdGgsIF9tYWluVmlld1NpemUuaGVpZ2h0KTsKLSAgICBSZXRhaW5QdHI8 TlNWaWV3PiBwcmV2aWV3VmlldyA9IFtfZGVsZWdhdGUgcGFnZVByZXZpZXdWaWV3Q29udHJvbGxl cjpzZWxmIHZpZXdGb3JQcmV2aWV3aW5nVVJMOl91cmwuZ2V0KCkgaW5pdGlhbEZyYW1lU2l6ZTpk ZWZhdWx0RnJhbWUuc2l6ZV07Ci0gICAgaWYgKCFwcmV2aWV3VmlldykgeworICAgIF9wcmV2aWV3 VmlldyA9IFtfZGVsZWdhdGUgcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcjpzZWxmIHZpZXdGb3JQ cmV2aWV3aW5nVVJMOl91cmwuZ2V0KCkgaW5pdGlhbEZyYW1lU2l6ZTpkZWZhdWx0RnJhbWUuc2l6 ZV07CisgICAgaWYgKCFfcHJldmlld1ZpZXcpIHsKICAgICAgICAgUmV0YWluUHRyPFdLV2ViVmll dz4gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6ZGVm YXVsdEZyYW1lXSk7CiAgICAgICAgIFt3ZWJWaWV3IF9zZXRJZ25vcmVzTm9uV2hlZWxNb3VzZUV2 ZW50czpZRVNdOwogICAgICAgICBpZiAoX3VybCkgewogICAgICAgICAgICAgTlNVUkxSZXF1ZXN0 ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpfdXJsLmdldCgpXTsKICAg ICAgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwogICAgICAgICB9Ci0gICAg ICAgIHByZXZpZXdWaWV3ID0gd2ViVmlldzsKKyAgICAgICAgX3ByZXZpZXdWaWV3ID0gd2ViVmll dzsKICAgICB9CiAKKyAgICBSZXRhaW5QdHI8TlNDbGlja0dlc3R1cmVSZWNvZ25pemVyPiBjbGlj a1JlY29nbml6ZXIgPSBhZG9wdE5TKFtbTlNDbGlja0dlc3R1cmVSZWNvZ25pemVyIGFsbG9jXSBp bml0V2l0aFRhcmdldDpzZWxmIGFjdGlvbjpAc2VsZWN0b3IoX2NsaWNrUmVjb2duaXplZDopXSk7 CisgICAgW19wcmV2aWV3VmlldyBhZGRHZXN0dXJlUmVjb2duaXplcjpjbGlja1JlY29nbml6ZXIu Z2V0KCldOworCisgICAgTlNSZWN0IHByZXZpZXdGcmFtZSA9IFtfcHJldmlld1ZpZXcgZnJhbWVd OworICAgIE5TUmVjdCBjb250YWluZXJGcmFtZSA9IHByZXZpZXdGcmFtZTsKKyAgICBjb250YWlu ZXJGcmFtZS5zaXplLndpZHRoICs9IDIgKiBwcmV2aWV3Vmlld0luc2V0OworICAgIGNvbnRhaW5l ckZyYW1lLnNpemUuaGVpZ2h0ICs9IDIgKiBwcmV2aWV3Vmlld0luc2V0OworICAgIHByZXZpZXdG cmFtZSA9IE5TT2Zmc2V0UmVjdChwcmV2aWV3RnJhbWUsIHByZXZpZXdWaWV3SW5zZXQsIHByZXZp ZXdWaWV3SW5zZXQpOworCisgICAgUmV0YWluUHRyPE5TVmlldz4gY29udGFpbmVyVmlldyA9IGFk b3B0TlMoW1tOU1ZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Y29udGFpbmVyRnJhbWVdKTsKKyAg ICBbY29udGFpbmVyVmlldyBhZGRTdWJ2aWV3Ol9wcmV2aWV3Vmlldy5nZXQoKV07CisgICAgW19w cmV2aWV3VmlldyBzZXRGcmFtZTpwcmV2aWV3RnJhbWVdOworCiAgICAgLy8gU2V0dGluZyB0aGUg d2ViVmlldyBib3VuZHMgd2lsbCBzY2FsZSBpdCB0byA3NSUgb2YgdGhlIF9tYWluVmlld1NpemUu Ci0gICAgW3ByZXZpZXdWaWV3IHNldEJvdW5kczpOU01ha2VSZWN0KDAsIDAsIF9tYWluVmlld1Np emUud2lkdGggLyBfcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFpblZpZXdTaXplLmhlaWdodCAvIF9w b3BvdmVyVG9WaWV3U2NhbGUpXTsKKyAgICBbX3ByZXZpZXdWaWV3IHNldEJvdW5kczpOU01ha2VS ZWN0KDAsIDAsIF9tYWluVmlld1NpemUud2lkdGggLyBfcG9wb3ZlclRvVmlld1NjYWxlLCBfbWFp blZpZXdTaXplLmhlaWdodCAvIF9wb3BvdmVyVG9WaWV3U2NhbGUpXTsKIAotICAgIFJldGFpblB0 cjxOU0NsaWNrR2VzdHVyZVJlY29nbml6ZXI+IGNsaWNrUmVjb2duaXplciA9IGFkb3B0TlMoW1tO U0NsaWNrR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnNlbGYgYWN0aW9u OkBzZWxlY3RvcihfY2xpY2tSZWNvZ25pemVkOildKTsKLSAgICBbcHJldmlld1ZpZXcgYWRkR2Vz dHVyZVJlY29nbml6ZXI6Y2xpY2tSZWNvZ25pemVyLmdldCgpXTsKLSAgICBzZWxmLnZpZXcgPSBw cmV2aWV3Vmlldy5nZXQoKTsKKyAgICBzZWxmLnZpZXcgPSBjb250YWluZXJWaWV3LmdldCgpOwog fQogCiAtICh2b2lkKV9jbGlja1JlY29nbml6ZWQ6KE5TR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0 dXJlUmVjb2duaXplcgpAQCAtMzQyLDggKzM2MywxMiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogICAgIE5TVVJMICp1cmwgPSBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmhpdFRlc3RS ZXN1bHQtPmFic29sdXRlTGlua1VSTCgpXTsKICAgICBfcG9wb3Zlck9yaWdpblJlY3QgPSBoaXRU ZXN0UmVzdWx0LT5lbGVtZW50Qm91bmRpbmdCb3goKTsKIAotICAgIE5TU2l6ZSBwb3BvdmVyU2l6 ZSA9IFtzZWxmIF9wcmVmZXJyZWRQb3BvdmVyU2l6ZV07CisgICAgTlNTaXplIHByZXZpZXdQYWRk aW5nID0gW1dLUGFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBwcmV2aWV3UGFkZGluZ107CisgICAg TlNTaXplIHBvcG92ZXJTaXplID0gW3NlbGYgX3ByZWZlcnJlZFBvcG92ZXJTaXplV2l0aFByZXZp ZXdQYWRkaW5nOnByZXZpZXdQYWRkaW5nXTsKICAgICBDR0Zsb2F0IGFjdHVhbFBvcG92ZXJUb1Zp ZXdTY2FsZSA9IHBvcG92ZXJTaXplLndpZHRoIC8gTlNXaWR0aChfd2tWaWV3LmJvdW5kcyk7Cisg ICAgcG9wb3ZlclNpemUud2lkdGggKz0gcHJldmlld1BhZGRpbmcud2lkdGg7CisgICAgcG9wb3Zl clNpemUuaGVpZ2h0ICs9IHByZXZpZXdQYWRkaW5nLmhlaWdodDsKKwogICAgIF9wcmV2aWV3Vmll d0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tQYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIGFsbG9j XSBpbml0V2l0aFBhZ2VVUkw6dXJsIG1haW5WaWV3U2l6ZTpfd2tWaWV3LmJvdW5kcy5zaXplIHBv cG92ZXJUb1ZpZXdTY2FsZTphY3R1YWxQb3BvdmVyVG9WaWV3U2NhbGVdKTsKICAgICBfcHJldmll d1ZpZXdDb250cm9sbGVyLT5fZGVsZWdhdGUgPSBzZWxmOwogICAgIFtfcHJldmlld1ZpZXdDb250 cm9sbGVyIGxvYWRWaWV3XTsKQEAgLTM3OSwxMiArNDA0LDE0IEBAIHN0YXRpYyBib29sIHRhcmdl dFNpemVGaXRzSW5BdmFpbGFibGVTcGFjZShOU1NpemUgdGFyZ2V0U2l6ZSwgTlNTaXplIGF2YWls YWJsZVNwCiAgICAgcmV0dXJuIE5TTWFrZVNpemUoMTMyNCwgOTQwKTsKIH0KIAotLSAoTlNTaXpl KV9wcmVmZXJyZWRQb3BvdmVyU2l6ZQorLSAoTlNTaXplKV9wcmVmZXJyZWRQb3BvdmVyU2l6ZVdp dGhQcmV2aWV3UGFkZGluZzooTlNTaXplKXByZXZpZXdQYWRkaW5nCiB7CiAgICAgc3RhdGljIGNv bnN0IENHRmxvYXQgcHJlZmVycmVkUG9wb3ZlclRvVmlld1NjYWxlID0gMC43NTsKLSAgICBzdGF0 aWMgY29uc3QgQ0dGbG9hdCBzY3JlZW5QYWRkaW5nID0gNDA7CisgICAgc3RhdGljIGNvbnN0IE5T U2l6ZSBzY3JlZW5QYWRkaW5nID0gezQwLCA0MH07CiAgICAgc3RhdGljIGNvbnN0IE5TU2l6ZSBz bWFsbGVzdFBvcG92ZXJTaXplID0gTlNNYWtlU2l6ZSg1MDAsIDMwMCk7CiAKKyAgICBjb25zdCBO U1NpemUgZWZmZWN0aXZlUGFkZGluZyA9IE5TTWFrZVNpemUoc2NyZWVuUGFkZGluZy53aWR0aCAr IHByZXZpZXdQYWRkaW5nLndpZHRoLCBzY3JlZW5QYWRkaW5nLmhlaWdodCArIHByZXZpZXdQYWRk aW5nLmhlaWdodCk7CisKICAgICBOU1dpbmRvdyAqd2luZG93ID0gX3drVmlldy53aW5kb3c7CiAg ICAgTlNSZWN0IG9yaWdpblNjcmVlblJlY3QgPSBbd2luZG93IGNvbnZlcnRSZWN0VG9TY3JlZW46 W193a1ZpZXcgY29udmVydFJlY3Q6X3BvcG92ZXJPcmlnaW5SZWN0IHRvVmlldzpuaWxdXTsKICAg ICBOU1JlY3Qgc2NyZWVuRnJhbWUgPSB3aW5kb3cuc2NyZWVuLnZpc2libGVGcmFtZTsKQEAgLTM5 NSwxNSArNDIyLDE1IEBAIHN0YXRpYyBib29sIHRhcmdldFNpemVGaXRzSW5BdmFpbGFibGVTcGFj ZShOU1NpemUgdGFyZ2V0U2l6ZSwgTlNTaXplIGF2YWlsYWJsZVNwCiAKICAgICBDR0Zsb2F0IGF2 YWlsYWJsZVNwYWNlQWJvdmUgPSBOU01heFkoc2NyZWVuRnJhbWUpIC0gTlNNYXhZKG9yaWdpblNj cmVlblJlY3QpOwogICAgIENHRmxvYXQgYXZhaWxhYmxlU3BhY2VCZWxvdyA9IE5TTWluWShvcmln aW5TY3JlZW5SZWN0KSAtIE5TTWluWShzY3JlZW5GcmFtZSk7Ci0gICAgQ0dGbG9hdCBtYXhBdmFp bGFibGVWZXJ0aWNhbFNwYWNlID0gZm1heChhdmFpbGFibGVTcGFjZUFib3ZlLCBhdmFpbGFibGVT cGFjZUJlbG93KSAtIHNjcmVlblBhZGRpbmc7Ci0gICAgTlNTaXplIG1heFNwYWNlQXZhaWxhYmxl T25ZRWRnZSA9IE5TTWFrZVNpemUoc2NyZWVuRnJhbWUuc2l6ZS53aWR0aCAtIHNjcmVlblBhZGRp bmcsIG1heEF2YWlsYWJsZVZlcnRpY2FsU3BhY2UpOworICAgIENHRmxvYXQgbWF4QXZhaWxhYmxl VmVydGljYWxTcGFjZSA9IGZtYXgoYXZhaWxhYmxlU3BhY2VBYm92ZSwgYXZhaWxhYmxlU3BhY2VC ZWxvdykgLSBlZmZlY3RpdmVQYWRkaW5nLmhlaWdodDsKKyAgICBOU1NpemUgbWF4U3BhY2VBdmFp bGFibGVPbllFZGdlID0gTlNNYWtlU2l6ZShzY3JlZW5GcmFtZS5zaXplLndpZHRoIC0gZWZmZWN0 aXZlUGFkZGluZy5oZWlnaHQsIG1heEF2YWlsYWJsZVZlcnRpY2FsU3BhY2UpOwogICAgIGlmICh0 YXJnZXRTaXplRml0c0luQXZhaWxhYmxlU3BhY2UodGFyZ2V0U2l6ZSwgbWF4U3BhY2VBdmFpbGFi bGVPbllFZGdlKSAmJiB0YXJnZXRTaXplRml0c0luQXZhaWxhYmxlU3BhY2UodGFyZ2V0U2l6ZSwg bGFyZ2VzdFBvcG92ZXJTaXplKSkKICAgICAgICAgcmV0dXJuIHRhcmdldFNpemU7CiAKICAgICBD R0Zsb2F0IGF2YWlsYWJsZVNwYWNlQXRMZWZ0ID0gTlNNaW5YKG9yaWdpblNjcmVlblJlY3QpIC0g TlNNaW5YKHNjcmVlbkZyYW1lKTsKICAgICBDR0Zsb2F0IGF2YWlsYWJsZVNwYWNlQXRSaWdodCA9 IE5TTWF4WChzY3JlZW5GcmFtZSkgLSBOU01heFgob3JpZ2luU2NyZWVuUmVjdCk7Ci0gICAgQ0dG bG9hdCBtYXhBdmFpbGFibGVIb3Jpem9udGFsU3BhY2UgPSBmbWF4KGF2YWlsYWJsZVNwYWNlQXRM ZWZ0LCBhdmFpbGFibGVTcGFjZUF0UmlnaHQpIC0gc2NyZWVuUGFkZGluZzsKLSAgICBOU1NpemUg bWF4U3BhY2VBdmFpbGFibGVPblhFZGdlID0gTlNNYWtlU2l6ZShtYXhBdmFpbGFibGVIb3Jpem9u dGFsU3BhY2UsIHNjcmVlbkZyYW1lLnNpemUuaGVpZ2h0IC0gc2NyZWVuUGFkZGluZyk7CisgICAg Q0dGbG9hdCBtYXhBdmFpbGFibGVIb3Jpem9udGFsU3BhY2UgPSBmbWF4KGF2YWlsYWJsZVNwYWNl QXRMZWZ0LCBhdmFpbGFibGVTcGFjZUF0UmlnaHQpIC0gZWZmZWN0aXZlUGFkZGluZy53aWR0aDsK KyAgICBOU1NpemUgbWF4U3BhY2VBdmFpbGFibGVPblhFZGdlID0gTlNNYWtlU2l6ZShtYXhBdmFp bGFibGVIb3Jpem9udGFsU3BhY2UsIHNjcmVlbkZyYW1lLnNpemUuaGVpZ2h0IC0gZWZmZWN0aXZl UGFkZGluZy53aWR0aCk7CiAgICAgaWYgKHRhcmdldFNpemVGaXRzSW5BdmFpbGFibGVTcGFjZSh0 YXJnZXRTaXplLCBtYXhTcGFjZUF2YWlsYWJsZU9uWEVkZ2UpICYmIHRhcmdldFNpemVGaXRzSW5B dmFpbGFibGVTcGFjZSh0YXJnZXRTaXplLCBsYXJnZXN0UG9wb3ZlclNpemUpKQogICAgICAgICBy ZXR1cm4gdGFyZ2V0U2l6ZTsKIApAQCAtNDUwLDcgKzQ3Nyw3IEBAIHN0YXRpYyBib29sIHRhcmdl dFNpemVGaXRzSW5BdmFpbGFibGVTcGFjZShOU1NpemUgdGFyZ2V0U2l6ZSwgTlNTaXplIGF2YWls YWJsZVNwCiAjaWYgV0tfQVBJX0VOQUJMRUQKICAgICBpZiAoX3ByZXZpZXdWaWV3Q29udHJvbGxl cikgewogICAgICAgICBfcHJldmlld1ZpZXdDb250cm9sbGVyLT5fZGVsZWdhdGUgPSBuaWw7Ci0g ICAgICAgIFtfd2tWaWV3IF9maW5pc2hQcmV2aWV3aW5nVVJMOl9wcmV2aWV3Vmlld0NvbnRyb2xs ZXItPl91cmwuZ2V0KCkgd2l0aFByZXZpZXdWaWV3OltfcHJldmlld1ZpZXdDb250cm9sbGVyIHZp ZXddXTsKKyAgICAgICAgW193a1ZpZXcgX2ZpbmlzaFByZXZpZXdpbmdVUkw6X3ByZXZpZXdWaWV3 Q29udHJvbGxlci0+X3VybC5nZXQoKSB3aXRoUHJldmlld1ZpZXc6X3ByZXZpZXdWaWV3Q29udHJv bGxlci0+X3ByZXZpZXdWaWV3LmdldCgpXTsKICAgICAgICAgX3ByZXZpZXdWaWV3Q29udHJvbGxl ciA9IG5pbDsKICAgICB9CiAjZW5kaWYKQEAgLTEwNDYsNyArMTA3Myw3IEBAIHN0YXRpYyBOU1N0 cmluZyAqcGF0aFRvUGhvdG9PbkRpc2soTlNTdHJpbmcgKnN1Z2dlc3RlZEZpbGVuYW1lKQogLSAo dm9pZClwYWdlUHJldmlld1ZpZXdDb250cm9sbGVyV2FzQ2xpY2tlZDooV0tQYWdlUHJldmlld1Zp ZXdDb250cm9sbGVyICopcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlcgogewogICAgIGlmIChOU1VS TCAqdXJsID0gcGFnZVByZXZpZXdWaWV3Q29udHJvbGxlci0+X3VybC5nZXQoKSkKLSAgICAgICAg W193a1ZpZXcgX2hhbmRsZUNsaWNrSW5QcmV2aWV3VmlldzpwYWdlUHJldmlld1ZpZXdDb250cm9s bGVyLnZpZXcgVVJMOnVybF07CisgICAgICAgIFtfd2tWaWV3IF9oYW5kbGVDbGlja0luUHJldmll d1ZpZXc6cGFnZVByZXZpZXdWaWV3Q29udHJvbGxlci0+X3ByZXZpZXdWaWV3LmdldCgpIFVSTDp1 cmxdOwogfQogCiAjZW5kaWYK