76993 2012-01-25 02:16:16 -0800 [chromium] Refactor Clipboard invalidate for DataTransferItem/DataTransferItemList into a wrapper 2012-01-25 14:33:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dcheng dcheng oldest_to_newest 542101 0 dcheng 2012-01-25 02:16:16 -0800 [chromium] Refactor Clipboard invalidate for DataTransferItem/DataTransferItemList into a wrapper 542108 1 123904 dcheng 2012-01-25 02:21:59 -0800 Created attachment 123904 Patch 542483 2 123904 tony 2012-01-25 11:26:42 -0800 Comment on attachment 123904 Patch I'm not in love with the name Wrapper. Maybe DataTransferItemListPolicyWrapper or DataTransferItemListClipboardPolicy or something. 542636 3 dcheng 2012-01-25 14:33:42 -0800 Committed r105928: <http://trac.webkit.org/changeset/105928> 123904 2012-01-25 02:21:59 -0800 2012-01-25 11:26:41 -0800 Patch bug-76993-20120125022158.patch text/plain 11219 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDcwNTBjYmU0MDU3NTJl ZDhkMDlhZjU4Yzg3ZGYwZDUwODViNDNjMy4uZGU4MjNjODVmMzI2NWNiYWIxNzQyZjExYzRkZDg0 YjdlYWFkNTdhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAxLTI1ICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVm YWN0b3IgQ2xpcGJvYXJkIGludmFsaWRhdGUgZm9yIERhdGFUcmFuc2Zlckl0ZW0vRGF0YVRyYW5z ZmVySXRlbUxpc3QgaW50byBhIHdyYXBwZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc2OTkzCisKKyAgICAgICAgV2Ugd2FudCB0byB1bmlmeSB0aGUg YmFja2luZyBkYXRhIHN0b3JlIGZvciBDbGlwYm9hcmRDaHJvbWl1bSBhbmQgRGF0YVRyYW5zZmVy SXRlbXMuIEZvcgorICAgICAgICB0aGF0LCB3ZSB3YW50IHVzZSBhIHNpbWlsYXIgcmVwcmVzZW50 YXRpb24gdG8gRGF0YVRyYW5zZmVySXRlbSBsaXN0IGluc2lkZQorICAgICAgICBDaHJvbWl1bURh dGFPYmplY3QuICBIb3dldmVyLCBzaW5jZSBDaHJvbWl1bURhdGFPYmplY3Qgc2hvdWxkIGJlIHZh bGlkIGluIHNjb3BlcyB3aGVyZQorICAgICAgICBDbGlwYm9hcmQgaXMgbm90IChlLmcuIGRlZmF1 bHQgZHJhZyBwcm9jZXNzaW5nKSwgd2UgbmVlZCB0byBzZXBhcmF0ZSB0aGUgY2xpcGJvYXJkCisg ICAgICAgIGludmFsaWRhdGlvbiBsb2dpYyBpbnRvIGEgd3JhcHBlciBjbGFzcy4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21p dW0uY3BwOgorICAgICAgICAoKToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBib2FyZENocm9taXVt OjppdGVtcyk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRGF0YVRyYW5zZmVySXRlbUNo cm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFUcmFuc2Zlckl0ZW1DaHJvbWl1bTo6 Z2V0QXNTdHJpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0RhdGFUcmFuc2Zlckl0 ZW1MaXN0Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YVRyYW5zZmVySXRlbUxp c3RDaHJvbWl1bTo6bGVuZ3RoKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFUcmFuc2Zlckl0ZW1M aXN0Q2hyb21pdW06Oml0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6RGF0YVRyYW5zZmVySXRlbUxp c3RDaHJvbWl1bTo6ZGVsZXRlSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVHJhbnNmZXJJ dGVtTGlzdENocm9taXVtOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVHJhbnNmZXJJ dGVtTGlzdENocm9taXVtOjphZGQpOgorCiAyMDEyLTAxLTI0ICBEYW5pZWwgQmF0ZXMgIDxkYmF0 ZXNAd2Via2l0Lm9yZz4KIAogICAgICAgICBBdHRlbXB0IHRvIGZpeCBNYWMgYnVpbGQgYWZ0ZXIg Y2hhbmdlc2V0IDxodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xMDU4NDM+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1 bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1 bS5jcHAKaW5kZXggOWEyNjg3NjA1N2E4MGRmYTQ4MTI5ZThkMDUxNDBiMzEwZGEzODE1ZC4uMWIx OWQzMGZiMjM2MDJkN2Y1Mjg2NzY2MDRiYWM1YTMzNDBiMDQ3YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcApAQCAt MzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRHJhZ0RhdGEu aCIKICNpbmNsdWRlICJFbGVtZW50LmgiCisjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgogI2lu Y2x1ZGUgIkZpbGUuaCIKICNpbmNsdWRlICJGaWxlTGlzdC5oIgogI2luY2x1ZGUgIkZyYW1lLmgi CkBAIC00NywxMyArNDgsMTYwIEBACiAjaW5jbHVkZSAiUGxhdGZvcm1TdXBwb3J0LmgiCiAjaW5j bHVkZSAiUmFuZ2UuaCIKICNpbmNsdWRlICJSZW5kZXJJbWFnZS5oIgotI2luY2x1ZGUgIlNjcmlw dEV4ZWN1dGlvbkNvbnRleHQuaCIKKyNpbmNsdWRlICJTdHJpbmdDYWxsYmFjay5oIgogI2luY2x1 ZGUgIm1hcmt1cC5oIgogCiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorbmFtZXNwYWNlIHsKKworLy8gVGhlc2Ugd3JhcHBlciBjbGFzc2Vz IGludmFsaWRhdGUgYSBEYXRhVHJhbnNmZXJJdGVtL0RhdGFUcmFuc2Zlckl0ZW1MaXN0IHdoZW4g dGhlIGFzc29jaWF0ZWQKKy8vIENsaXBib2FyZCBvYmplY3QgZ29lcyBvdXQgb2Ygc2NvcGUuCitj bGFzcyBEYXRhVHJhbnNmZXJJdGVtTGlzdFdyYXBwZXIgOiBwdWJsaWMgRGF0YVRyYW5zZmVySXRl bUxpc3QgeworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPERhdGFUcmFuc2Zlckl0ZW1M aXN0V3JhcHBlcj4gY3JlYXRlKAorICAgICAgICBQYXNzUmVmUHRyPENsaXBib2FyZENocm9taXVt PiwgUGFzc1JlZlB0cjxEYXRhVHJhbnNmZXJJdGVtTGlzdENocm9taXVtPik7CisKKyAgICB2aXJ0 dWFsIHNpemVfdCBsZW5ndGgoKSBjb25zdDsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8RGF0YVRy YW5zZmVySXRlbT4gaXRlbSh1bnNpZ25lZCBsb25nIGluZGV4KTsKKyAgICB2aXJ0dWFsIHZvaWQg ZGVsZXRlSXRlbSh1bnNpZ25lZCBsb25nIGluZGV4LCBFeGNlcHRpb25Db2RlJik7CisgICAgdmly dHVhbCB2b2lkIGNsZWFyKCk7CisgICAgdmlydHVhbCB2b2lkIGFkZChjb25zdCBTdHJpbmcmIGRh dGEsIGNvbnN0IFN0cmluZyYgdHlwZSwgRXhjZXB0aW9uQ29kZSYpOworICAgIHZpcnR1YWwgdm9p ZCBhZGQoUGFzc1JlZlB0cjxGaWxlPik7CisKK3ByaXZhdGU6CisgICAgRGF0YVRyYW5zZmVySXRl bUxpc3RXcmFwcGVyKFBhc3NSZWZQdHI8Q2xpcGJvYXJkQ2hyb21pdW0+LCBQYXNzUmVmUHRyPERh dGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21pdW0+KTsKKworICAgIFJlZlB0cjxDbGlwYm9hcmRDaHJv bWl1bT4gbV9jbGlwYm9hcmQ7CisgICAgUmVmUHRyPERhdGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21p dW0+IG1fbGlzdDsKK307CisKK2NsYXNzIERhdGFUcmFuc2Zlckl0ZW1XcmFwcGVyIDogcHVibGlj IERhdGFUcmFuc2Zlckl0ZW0geworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPERhdGFU cmFuc2Zlckl0ZW1XcmFwcGVyPiBjcmVhdGUoCisgICAgICAgIFBhc3NSZWZQdHI8Q2xpcGJvYXJk Q2hyb21pdW0+LCBQYXNzUmVmUHRyPERhdGFUcmFuc2Zlckl0ZW0+KTsKKworICAgIHZpcnR1YWwg U3RyaW5nIGtpbmQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyB0eXBlKCkgY29uc3Q7CisK KyAgICB2aXJ0dWFsIHZvaWQgZ2V0QXNTdHJpbmcoUGFzc1JlZlB0cjxTdHJpbmdDYWxsYmFjaz4p IGNvbnN0OworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCbG9iPiBnZXRBc0ZpbGUoKSBjb25zdDsK KworcHJpdmF0ZToKKyAgICBEYXRhVHJhbnNmZXJJdGVtV3JhcHBlcihQYXNzUmVmUHRyPENsaXBi b2FyZENocm9taXVtPiwgUGFzc1JlZlB0cjxEYXRhVHJhbnNmZXJJdGVtPik7CisKKyAgICBSZWZQ dHI8Q2xpcGJvYXJkQ2hyb21pdW0+IG1fY2xpcGJvYXJkOworICAgIFJlZlB0cjxEYXRhVHJhbnNm ZXJJdGVtPiBtX2l0ZW07Cit9OworCitQYXNzUmVmUHRyPERhdGFUcmFuc2Zlckl0ZW1MaXN0V3Jh cHBlcj4gRGF0YVRyYW5zZmVySXRlbUxpc3RXcmFwcGVyOjpjcmVhdGUoCisgICAgUGFzc1JlZlB0 cjxDbGlwYm9hcmRDaHJvbWl1bT4gY2xpcGJvYXJkLCBQYXNzUmVmUHRyPERhdGFUcmFuc2Zlckl0 ZW1MaXN0Q2hyb21pdW0+IGxpc3QpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBEYXRhVHJh bnNmZXJJdGVtTGlzdFdyYXBwZXIoY2xpcGJvYXJkLCBsaXN0KSk7Cit9CisKK3NpemVfdCBEYXRh VHJhbnNmZXJJdGVtTGlzdFdyYXBwZXI6Omxlbmd0aCgpIGNvbnN0Cit7CisgICAgaWYgKG1fY2xp cGJvYXJkLT5wb2xpY3koKSA9PSBDbGlwYm9hcmROdW1iKQorICAgICAgICByZXR1cm4gMDsKKyAg ICByZXR1cm4gbV9saXN0LT5sZW5ndGgoKTsKK30KKworUGFzc1JlZlB0cjxEYXRhVHJhbnNmZXJJ dGVtPiBEYXRhVHJhbnNmZXJJdGVtTGlzdFdyYXBwZXI6Oml0ZW0odW5zaWduZWQgbG9uZyBpbmRl eCkKK3sKKyAgICBpZiAobV9jbGlwYm9hcmQtPnBvbGljeSgpID09IENsaXBib2FyZE51bWIpCisg ICAgICAgIHJldHVybiAwOworICAgIFJlZlB0cjxEYXRhVHJhbnNmZXJJdGVtPiBpdGVtID0gbV9s aXN0LT5pdGVtKGluZGV4KTsKKyAgICBpZiAoIWl0ZW0pCisgICAgICAgIHJldHVybiAwOworICAg IHJldHVybiBEYXRhVHJhbnNmZXJJdGVtV3JhcHBlcjo6Y3JlYXRlKG1fY2xpcGJvYXJkLCBpdGVt KTsKK30KKwordm9pZCBEYXRhVHJhbnNmZXJJdGVtTGlzdFdyYXBwZXI6OmRlbGV0ZUl0ZW0odW5z aWduZWQgbG9uZyBpbmRleCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgaWYgKG1fY2xpcGJv YXJkLT5wb2xpY3koKSAhPSBDbGlwYm9hcmRXcml0YWJsZSkgeworICAgICAgICBlYyA9IElOVkFM SURfU1RBVEVfRVJSOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIC8vIEZJWE1FOiBXZSBo YW5kbGUgYWxsIHRoZSBleGNlcHRpb25zIGhlcmUsIHNvIHdlIGRvbid0IG5lZWQgdG8gcHJvcG9n YXRlIGVjLgorICAgIG1fbGlzdC0+ZGVsZXRlSXRlbShpbmRleCwgZWMpOworfQorCit2b2lkIERh dGFUcmFuc2Zlckl0ZW1MaXN0V3JhcHBlcjo6Y2xlYXIoKQoreworICAgIGlmIChtX2NsaXBib2Fy ZC0+cG9saWN5KCkgIT0gQ2xpcGJvYXJkV3JpdGFibGUpCisgICAgICAgIHJldHVybjsKKyAgICBt X2xpc3QtPmNsZWFyKCk7Cit9CisKK3ZvaWQgRGF0YVRyYW5zZmVySXRlbUxpc3RXcmFwcGVyOjph ZGQoY29uc3QgU3RyaW5nJiBkYXRhLCBjb25zdCBTdHJpbmcmIHR5cGUsIEV4Y2VwdGlvbkNvZGUm IGVjKQoreworICAgIGlmIChtX2NsaXBib2FyZC0+cG9saWN5KCkgIT0gQ2xpcGJvYXJkV3JpdGFi bGUpCisgICAgICAgIHJldHVybjsKKyAgICBtX2xpc3QtPmFkZChkYXRhLCB0eXBlLCBlYyk7Cit9 CisKK3ZvaWQgRGF0YVRyYW5zZmVySXRlbUxpc3RXcmFwcGVyOjphZGQoUGFzc1JlZlB0cjxGaWxl PiBmaWxlKQoreworICAgIGlmIChtX2NsaXBib2FyZC0+cG9saWN5KCkgIT0gQ2xpcGJvYXJkV3Jp dGFibGUpCisgICAgICAgIHJldHVybjsKKyAgICBtX2xpc3QtPmFkZChmaWxlKTsKK30KKworRGF0 YVRyYW5zZmVySXRlbUxpc3RXcmFwcGVyOjpEYXRhVHJhbnNmZXJJdGVtTGlzdFdyYXBwZXIoCisg ICAgUGFzc1JlZlB0cjxDbGlwYm9hcmRDaHJvbWl1bT4gY2xpcGJvYXJkLCBQYXNzUmVmUHRyPERh dGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21pdW0+IGxpc3QpCisgICAgOiBtX2NsaXBib2FyZChjbGlw Ym9hcmQpCisgICAgLCBtX2xpc3QobGlzdCkKK3sKK30KKworUGFzc1JlZlB0cjxEYXRhVHJhbnNm ZXJJdGVtV3JhcHBlcj4gRGF0YVRyYW5zZmVySXRlbVdyYXBwZXI6OmNyZWF0ZSgKKyAgICBQYXNz UmVmUHRyPENsaXBib2FyZENocm9taXVtPiBjbGlwYm9hcmQsIFBhc3NSZWZQdHI8RGF0YVRyYW5z ZmVySXRlbT4gaXRlbSkKK3sKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IERhdGFUcmFuc2Zlckl0 ZW1XcmFwcGVyKGNsaXBib2FyZCwgaXRlbSkpOworfQorCitTdHJpbmcgRGF0YVRyYW5zZmVySXRl bVdyYXBwZXI6OmtpbmQoKSBjb25zdAoreworICAgIGlmIChtX2NsaXBib2FyZC0+cG9saWN5KCkg PT0gQ2xpcGJvYXJkTnVtYikKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgIHJldHVybiBt X2l0ZW0tPmtpbmQoKTsKK30KKworU3RyaW5nIERhdGFUcmFuc2Zlckl0ZW1XcmFwcGVyOjp0eXBl KCkgY29uc3QKK3sKKyAgICBpZiAobV9jbGlwYm9hcmQtPnBvbGljeSgpID09IENsaXBib2FyZE51 bWIpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gbV9pdGVtLT50eXBlKCk7 Cit9CisKK3ZvaWQgRGF0YVRyYW5zZmVySXRlbVdyYXBwZXI6OmdldEFzU3RyaW5nKFBhc3NSZWZQ dHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrKSBjb25zdAoreworICAgIGlmIChtX2NsaXBib2Fy ZC0+cG9saWN5KCkgIT0gQ2xpcGJvYXJkUmVhZGFibGUgJiYgbV9jbGlwYm9hcmQtPnBvbGljeSgp ICE9IENsaXBib2FyZFdyaXRhYmxlKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2l0ZW0tPmdl dEFzU3RyaW5nKGNhbGxiYWNrKTsKK30KKworUGFzc1JlZlB0cjxCbG9iPiBEYXRhVHJhbnNmZXJJ dGVtV3JhcHBlcjo6Z2V0QXNGaWxlKCkgY29uc3QKK3sKKyAgICBpZiAobV9jbGlwYm9hcmQtPnBv bGljeSgpICE9IENsaXBib2FyZFJlYWRhYmxlICYmIG1fY2xpcGJvYXJkLT5wb2xpY3koKSAhPSBD bGlwYm9hcmRXcml0YWJsZSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gbV9pdGVt LT5nZXRBc0ZpbGUoKTsKK30KKworRGF0YVRyYW5zZmVySXRlbVdyYXBwZXI6OkRhdGFUcmFuc2Zl ckl0ZW1XcmFwcGVyKAorICAgIFBhc3NSZWZQdHI8Q2xpcGJvYXJkQ2hyb21pdW0+IGNsaXBib2Fy ZCwgUGFzc1JlZlB0cjxEYXRhVHJhbnNmZXJJdGVtPiBpdGVtKQorICAgIDogbV9jbGlwYm9hcmQo Y2xpcGJvYXJkKQorICAgICwgbV9pdGVtKGl0ZW0pCit7Cit9CisKK30gLy8gbmFtZXNwYWNlCisK IHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIC8vIFdlIHByb3ZpZGUgdGhlIElFIGNsaXBi b2FyZCB0eXBlcyAoVVJMIGFuZCBUZXh0KSwgYW5kIHRoZSBjbGlwYm9hcmQgdHlwZXMgc3BlY2lm aWVkIGluIHRoZSBXSEFUV0cgV2ViIEFwcGxpY2F0aW9ucyAxLjAgZHJhZnQKQEAgLTM0MywxNSAr NDkxLDE3IEBAIGJvb2wgQ2xpcGJvYXJkQ2hyb21pdW06Omhhc0RhdGEoKQogI2lmIEVOQUJMRShE QVRBX1RSQU5TRkVSX0lURU1TKQogUGFzc1JlZlB0cjxEYXRhVHJhbnNmZXJJdGVtTGlzdD4gQ2xp cGJvYXJkQ2hyb21pdW06Oml0ZW1zKCkKIHsKLSAgICBpZiAoIW1fZGF0YU9iamVjdCB8fCAocG9s aWN5KCkgIT0gQ2xpcGJvYXJkUmVhZGFibGUgJiYgcG9saWN5KCkgIT0gQ2xpcGJvYXJkV3JpdGFi bGUpKSB7CisgICAgaWYgKCFtX2RhdGFPYmplY3QpCiAgICAgICAgIC8vIFJldHVybiBhbiB1bmFz c29jaWF0ZWQgZW1wdHkgbGlzdC4KICAgICAgICAgcmV0dXJuIERhdGFUcmFuc2Zlckl0ZW1MaXN0 Q2hyb21pdW06OmNyZWF0ZSh0aGlzLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zY3JpcHRFeGVjdXRp b25Db250ZXh0KCkpOwotICAgIH0KIAogICAgIGlmICghbV9pdGVtTGlzdCkKICAgICAgICAgbV9p dGVtTGlzdCA9IERhdGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21pdW06OmNyZWF0ZSh0aGlzLCBtX2Zy YW1lLT5kb2N1bWVudCgpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogCi0gICAgcmV0dXJu IG1faXRlbUxpc3Q7CisgICAgLy8gRklYTUU6IEFjY29yZGluZyB0byB0aGUgc3BlYywgd2UgYXJl IHN1cHBvc2VkIHRvIHJldHVybiB0aGUgc2FtZSBjb2xsZWN0aW9uIG9mIGl0ZW1zIGVhY2gKKyAg ICAvLyB0aW1lLiBXZSBub3cgcmV0dXJuIGEgd3JhcHBlciB0aGF0IGFsd2F5cyB3cmFwcyB0aGUg KnNhbWUqIHNldCBvZiBpdGVtcywgc28gSlMgc2hvdWxkbid0IGJlCisgICAgLy8gYWJsZSB0byB0 ZWxsLCBidXQgd2UgcHJvYmFibHkgc3RpbGwgd2FudCB0byBmaXggdGhpcy4KKyAgICByZXR1cm4g RGF0YVRyYW5zZmVySXRlbUxpc3RXcmFwcGVyOjpjcmVhdGUodGhpcywgbV9pdGVtTGlzdCk7CiB9 CiAKIC8vIEZJWE1FOiBpbnRlZ3JhdGUgQ2hyb21pdW1EYXRhT2JqZWN0IGFuZCBEYXRhVHJhbnNm ZXJJdGVtTGlzdCByYXRoZXIgdGhhbiBob2xkaW5nIHRoZW0gc2VwYXJhdGVseSBhbmQga2VlcGlu ZyB0aGVtIHN5bmNlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0RhdGFUcmFuc2Zlckl0ZW1DaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9EYXRhVHJhbnNmZXJJdGVtQ2hyb21pdW0uY3BwCmluZGV4IDdhMTEzMjQ4OWQ2 Y2Y1M2NmMjJmOTJjOTQ4ZmQwOTJjMjQyNDIxMDkuLjY5NmVlNjUzZWFhNjdkYzkzMjViZTI2NGQy MzIwOTIzMDY0NGRlOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0RhdGFUcmFuc2Zlckl0ZW1DaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vRGF0YVRyYW5zZmVySXRlbUNocm9taXVtLmNwcApAQCAtOTAsOCArOTAs NyBAQCBEYXRhVHJhbnNmZXJJdGVtQ2hyb21pdW06OkRhdGFUcmFuc2Zlckl0ZW1DaHJvbWl1bShQ YXNzUmVmUHRyPENsaXBib2FyZD4gb3duZXIsCiAKIHZvaWQgRGF0YVRyYW5zZmVySXRlbUNocm9t aXVtOjpnZXRBc1N0cmluZyhQYXNzUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBjYWxsYmFjaykgY29u c3QKIHsKLSAgICBpZiAoKG1fb3duZXItPnBvbGljeSgpICE9IENsaXBib2FyZFJlYWRhYmxlICYm IG1fb3duZXItPnBvbGljeSgpICE9IENsaXBib2FyZFdyaXRhYmxlKQotICAgICAgICB8fCBraW5k KCkgIT0ga2luZFN0cmluZykKKyAgICBpZiAoa2luZCgpICE9IGtpbmRTdHJpbmcpCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChjbGlwYm9hcmRDaHJvbWl1bSgpLT5zdG9yYWdlSGFzVXBkYXRl ZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRGF0YVRy YW5zZmVySXRlbUxpc3RDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9EYXRhVHJhbnNmZXJJdGVtTGlzdENocm9taXVtLmNwcAppbmRleCA1NmYwYWYwYmQxOThh YzlkOWM0OGY4MjI0ZmRhNmZiM2ZlNjU0ODVlLi4zYTI4MGZlM2I1NDBkMmVjOGZjZjdiOWNhOTE5 OGQyNjMwMTg2Zjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9EYXRhVHJhbnNmZXJJdGVtTGlzdENocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9EYXRhVHJhbnNmZXJJdGVtTGlzdENocm9taXVtLmNwcApAQCAtNjAs MTcgKzYwLDEyIEBAIERhdGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21pdW06OkRhdGFUcmFuc2Zlckl0 ZW1MaXN0Q2hyb21pdW0oUGFzc1JlZlB0cjxDbGlwYm9hcmQ+CiAKIHNpemVfdCBEYXRhVHJhbnNm ZXJJdGVtTGlzdENocm9taXVtOjpsZW5ndGgoKSBjb25zdAogewotICAgIGlmIChtX293bmVyLT5w b2xpY3koKSA9PSBDbGlwYm9hcmROdW1iKQotICAgICAgICByZXR1cm4gMDsKICAgICBjbGlwYm9h cmRDaHJvbWl1bSgpLT5tYXlVcGRhdGVJdGVtcyhtX2l0ZW1zKTsKICAgICByZXR1cm4gbV9pdGVt cy5zaXplKCk7CiB9CiAKIFBhc3NSZWZQdHI8RGF0YVRyYW5zZmVySXRlbT4gRGF0YVRyYW5zZmVy SXRlbUxpc3RDaHJvbWl1bTo6aXRlbSh1bnNpZ25lZCBsb25nIGluZGV4KQogewotICAgIGlmICht X293bmVyLT5wb2xpY3koKSA9PSBDbGlwYm9hcmROdW1iKQotICAgICAgICByZXR1cm4gMDsKLQog ICAgIGNsaXBib2FyZENocm9taXVtKCktPm1heVVwZGF0ZUl0ZW1zKG1faXRlbXMpOwogICAgIGlm IChpbmRleCA+PSBsZW5ndGgoKSkKICAgICAgICAgcmV0dXJuIDA7CkBAIC03OSwxMSArNzQsNiBA QCBQYXNzUmVmUHRyPERhdGFUcmFuc2Zlckl0ZW0+IERhdGFUcmFuc2Zlckl0ZW1MaXN0Q2hyb21p dW06Oml0ZW0odW5zaWduZWQgbG9uZyBpbgogCiB2b2lkIERhdGFUcmFuc2Zlckl0ZW1MaXN0Q2hy b21pdW06OmRlbGV0ZUl0ZW0odW5zaWduZWQgbG9uZyBpbmRleCwgRXhjZXB0aW9uQ29kZSYgZWMp CiB7Ci0gICAgaWYgKG1fb3duZXItPnBvbGljeSgpICE9IENsaXBib2FyZFdyaXRhYmxlKSB7Ci0g ICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9FUlI7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K ICAgICBjbGlwYm9hcmRDaHJvbWl1bSgpLT5tYXlVcGRhdGVJdGVtcyhtX2l0ZW1zKTsKICAgICBp ZiAoaW5kZXggPj0gbGVuZ3RoKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTExNiwxOCArMTA2LDEy IEBAIHZvaWQgRGF0YVRyYW5zZmVySXRlbUxpc3RDaHJvbWl1bTo6ZGVsZXRlSXRlbSh1bnNpZ25l ZCBsb25nIGluZGV4LCBFeGNlcHRpb25Db2RlCiAKIHZvaWQgRGF0YVRyYW5zZmVySXRlbUxpc3RD aHJvbWl1bTo6Y2xlYXIoKQogewotICAgIGlmIChtX293bmVyLT5wb2xpY3koKSAhPSBDbGlwYm9h cmRXcml0YWJsZSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV9pdGVtcy5jbGVhcigpOwogICAg IGNsaXBib2FyZENocm9taXVtKCktPmNsZWFyQWxsRGF0YSgpOwogfQogCiB2b2lkIERhdGFUcmFu c2Zlckl0ZW1MaXN0Q2hyb21pdW06OmFkZChjb25zdCBTdHJpbmcmIGRhdGEsIGNvbnN0IFN0cmlu ZyYgdHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgaWYgKG1fb3duZXItPnBvbGljeSgp ICE9IENsaXBib2FyZFdyaXRhYmxlKQotICAgICAgICByZXR1cm47Ci0KICAgICBSZWZQdHI8Q2hy b21pdW1EYXRhT2JqZWN0PiBkYXRhT2JqZWN0ID0gY2xpcGJvYXJkQ2hyb21pdW0oKS0+ZGF0YU9i amVjdCgpOwogICAgIGlmICghZGF0YU9iamVjdCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTQ2LDcg KzEzMCw3IEBAIHZvaWQgRGF0YVRyYW5zZmVySXRlbUxpc3RDaHJvbWl1bTo6YWRkKGNvbnN0IFN0 cmluZyYgZGF0YSwgY29uc3QgU3RyaW5nJiB0eXBlLCBFCiAKIHZvaWQgRGF0YVRyYW5zZmVySXRl bUxpc3RDaHJvbWl1bTo6YWRkKFBhc3NSZWZQdHI8RmlsZT4gZmlsZSkKIHsKLSAgICBpZiAobV9v d25lci0+cG9saWN5KCkgIT0gQ2xpcGJvYXJkV3JpdGFibGUgfHwgIWZpbGUpCisgICAgaWYgKCFm aWxlKQogICAgICAgICByZXR1cm47CiAKICAgICBSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBk YXRhT2JqZWN0ID0gY2xpcGJvYXJkQ2hyb21pdW0oKS0+ZGF0YU9iamVjdCgpOwo=