66876 2011-08-24 12:05:32 -0700 [EFL] Add auxiliary DRT API to ewk_frame. 2011-09-23 20:34:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 rakuco rakuco leandro oldest_to_newest 456288 0 rakuco 2011-08-24 12:05:32 -0700 [EFL] Add auxiliary DRT API to ewk_frame. 456293 1 105038 rakuco 2011-08-24 12:09:26 -0700 Created attachment 105038 Patch 465888 2 105038 kenneth 2011-09-12 15:53:52 -0700 Comment on attachment 105038 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105038&action=review > Source/WebKit/efl/ChangeLog:9 > + In a similar fashion to r93599 and r93599, add some API calls required > + by EFL's DumpRenderTree. Let's add these methods in a class like DumpRenderTreeSupport. Qt does something like that. That way we can keep more of the project in C++ and follow WebKit style. 467076 3 rakuco 2011-09-14 09:34:36 -0700 (In reply to comment #2) > Let's add these methods in a class like DumpRenderTreeSupport. Ack, closing this one. 472709 4 105038 rakuco 2011-09-23 20:34:15 -0700 Comment on attachment 105038 Patch Clearing the cq? flag. 105038 2011-08-24 12:09:26 -0700 2011-09-23 20:34:15 -0700 Patch bug-66876-20110824161258.patch text/plain 15529 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogOTM3MDQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NNYWtlTGlzdHNFZmwudHh0IGIvU291cmNlL1dlYktpdC9lZmwvQ01ha2VMaXN0c0VmbC50eHQK aW5kZXggZjBhNjI0ODJmYTI2YTcyMWI5ZWM2MDBkOTI4ZTUyZDJiNWMxZWE3MS4uNzk4YTg4YTNm ZDBmYjQxMGU4NjA0Y2MyZjg4MjNjN2NlODg5YTBlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9lZmwvQ01ha2VMaXN0c0VmbC50eHQKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ01ha2VMaXN0 c0VmbC50eHQKQEAgLTIyLDYgKzIyLDE0IEBAIExJU1QoQVBQRU5EIFdlYktpdF9JTkNMVURFX0RJ UkVDVE9SSUVTCiAgICAgJHtTUUxJVEVfSU5DTFVERV9ESVJTfQogKQogCitJRiAoRU5BQkxFX1NW RykKKyAgTElTVChBUFBFTkQgV2ViS2l0X0lOQ0xVREVfRElSRUNUT1JJRVMKKyAgICAiJHtXRUJD T1JFX0RJUn0vc3ZnIgorICAgICIke1dFQkNPUkVfRElSfS9zdmcvYW5pbWF0aW9uIgorICAgICIk e1dFQkNPUkVfRElSfS9yZW5kZXJpbmcvc3ZnIgorICApCitFTkRJRiAoKQorCiBJRiAoRU5BQkxF X1ZJREVPKQogTElTVChBUFBFTkQgV2ViS2l0X0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAiJHtX RUJDT1JFX0RJUn0vcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyIgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmlu ZGV4IGIwNWQ0NzAyNTU5NWZhYTMwMGE1ZDYxNWUyYmZmNWY4N2IwNzBiNTIuLjdiOWYzZmRlYzVj OWFiNTU3MTM3NTI4ZDQyZTlhY2E2MjIwZGE3NDUgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSw0MCBAQAorMjAxMS0wOC0yNCAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8a3Vib0Bwcm9mdXNp b24ubW9iaT4KKworICAgICAgICBbRUZMXSBBZGQgYXV4aWxpYXJ5IERSVCBBUEkgdG8gZXdrX2Zy YW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4 NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBh IHNpbWlsYXIgZmFzaGlvbiB0byByOTM1OTkgYW5kIHI5MzU5OSwgYWRkIHNvbWUgQVBJIGNhbGxz IHJlcXVpcmVkCisgICAgICAgIGJ5IEVGTCdzIER1bXBSZW5kZXJUcmVlLgorCisgICAgICAgIFRo ZSBjb2RlIHByZXR0eSBtdWNoIGRlYWxzIHdpdGggbWFuaXB1bGF0aW5nIGFuaW1hdGlvbiBzdGF0 ZSBhbmQKKyAgICAgICAgZHVtcGluZyB0aGUgcGFnZSdzIGNvbnRlbnRzIGluIGRpZmZlcmVudCB3 YXlzLgorCisgICAgICAgIEluIHRoZSBmdXR1cmUsIGl0IG1pZ2h0IG1ha2Ugc2Vuc2UgdG8gZ3Jv dXAgYWxsIHRoZXNlIGNhbGxzIGluIGEKKyAgICAgICAgc2VwYXJhdGUgRFJUIHN1cHBvcnQgZmls ZSwgYXMgUXQgYW5kIEdUSysgYWxyZWFkeSBkby4KKworICAgICAgICAqIENNYWtlTGlzdHNFZmwu dHh0OgorICAgICAgICAqIGV3ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAoZXdrX2ZyYW1lX2lu bmVyX3RleHRfZ2V0KToKKyAgICAgICAgKGV3a19mcmFtZV9yZW5kZXJfdHJlZV9kdW1wX2dldCk6 CisgICAgICAgIChld2tfZnJhbWVfY2hpbGRyZW5fZ2V0KToKKyAgICAgICAgKGV3a19mcmFtZV9w YWdlX251bWJlcl9ieV9lbGVtZW50X2lkX2dldCk6CisgICAgICAgIChld2tfZnJhbWVfcGFnZV9u dW1iZXJfZ2V0KToKKyAgICAgICAgKGV3a19mcmFtZV9jb3VudGVyX3ZhbHVlX2J5X2VsZW1lbnRf aWRfZ2V0KToKKyAgICAgICAgKGV3a19mcmFtZV9hbmltYXRpb25fcGF1c2UpOgorICAgICAgICAo ZXdrX2ZyYW1lX3RyYW5zaXRpb25fcGF1c2UpOgorICAgICAgICAoZXdrX2ZyYW1lX3N2Z19hbmlt YXRpb25fcGF1c2UpOgorICAgICAgICAoZXdrX2ZyYW1lX2FuaW1hdGlvbl9hY3RpdmVfbnVtYmVy X2dldCk6CisgICAgICAgIChld2tfZnJhbWVfYW5pbWF0aW9uX3N1c3BlbmQpOgorICAgICAgICAo ZXdrX2ZyYW1lX2FuaW1hdGlvbl9yZXN1bWUpOgorICAgICAgICAoZXdrX2ZyYW1lX3Jlc3BvbnNl X21pbWVfdHlwZV9nZXQpOgorICAgICAgICAoZXdrX2ZyYW1lX3NlbGVjdGlvbl9yZWN0YW5nbGVf Z2V0KToKKyAgICAgICAgKGV3a19mcmFtZV9vcGVuZXJfY2xlYXIpOgorICAgICAgICAoZXdrX2Zy YW1lX3BlbmRpbmdfdW5sb2FkX2V2ZW50X2NvdW50X2dldCk6CisgICAgICAgIChld2tfZnJhbWVf c3VpdGFibGVfZHJ0X25hbWVfZ2V0KToKKyAgICAgICAgKiBld2svZXdrX3ByaXZhdGUuaDoKKwog MjAxMS0wOC0yNCAgSmFlaHVuIExpbSAgPGxqYWVodW4ubGltQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdIEFkZCBkdW1teSBJY29uRGF0YWJhc2VDbGllbnRFZmwuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfZnJhbWUuY3BwCmluZGV4IDkxZjIyMzc5MTRiNmRhNDQ3NzI3YmE4YzNlMGM2MjRiZWY3 NmMzYzcuLjZmMzQxZjAxMzgyZWY2OWJmMDJiYmIwZjUwMWQxYjc0MGE2YjM5N2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCkBAIC0yNCw5ICsyNCwxMiBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgImV3a19mcmFtZS5oIgogCisjaW5jbHVkZSAiQW5pbWF0aW9uQ29u dHJvbGxlci5oIgorI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRVdlYktpdC5oIgogI2luY2x1ZGUgIkV2 ZW50SGFuZGxlci5oIgorI2luY2x1ZGUgIkZsb2F0U2l6ZS5oIgogI2luY2x1ZGUgIkZvY3VzQ29u dHJvbGxlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAi RnJhbWVUcmVlLmgiCkBAIC0zOCwxNCArNDEsMTcgQEAKICNpbmNsdWRlICJIVE1MUGx1Z0luRWxl bWVudC5oIgogI2luY2x1ZGUgIkhpc3RvcnlJdGVtLmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3Vs dC5oIgorI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJJbnRTaXplLmgiCiAjaW5jbHVk ZSAiS1VSTC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUg IlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtVG91Y2hFdmVudC5oIgog I2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgorI2luY2x1ZGUgIlByaW50Q29udGV4dC5o IgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgogI2luY2x1ZGUgIlJlZlB0ci5oIgorI2lu Y2x1ZGUgIlJlbmRlclRyZWVBc1RleHQuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIK ICNpbmNsdWRlICJTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgpAQCAt NTMsNiArNTksMTEgQEAKICNpbmNsdWRlICJXaW5kb3dzS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1 ZGUgImV3a19wcml2YXRlLmgiCiAKKyNpZiBFTkFCTEUoU1ZHKQorI2luY2x1ZGUgIlNWR0RvY3Vt ZW50RXh0ZW5zaW9ucy5oIgorI2luY2x1ZGUgIlNWR1NNSUxFbGVtZW50LmgiCisjZW5kaWYKKwog I2luY2x1ZGUgPEVpbmEuaD4KICNpbmNsdWRlIDxFdmFzLmg+CiAjaW5jbHVkZSA8YWxnb3JpdGht PgpAQCAtMTY0NSw2ICsxNjU2LDM3MCBAQCB2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3Nl bGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0ICpvKQogCiAvKioKICAqIEBpbnRlcm5hbAorICoK KyAqIER1bXBzIHdlYnBhZ2UncyBsYXlvdXQgYXMgcGxhaW4gdGV4dC4KKyAqCisgKiBAcGFyYW0g byBGcmFtZSB3aG9zZSB0ZXh0IHRvIGR1bXAuCisgKgorICogQHJldHVybiBBIFdURjo6U3RyaW5n IHdpdGggdGhlIGNvbnRlbnRzLCBvciBhbiBlbXB0eSBvbmUgaW4gY2FzZSBvZiBlcnJvci4KKyov CitXVEY6OlN0cmluZyBld2tfZnJhbWVfaW5uZXJfdGV4dF9nZXQoY29uc3QgRXZhc19PYmplY3Qg Km8pCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIFdURjo6U3RyaW5n KCkpOworCisgICAgV2ViQ29yZTo6RnJhbWVWaWV3ICpmcmFtZVZpZXcgPSBzZC0+ZnJhbWUtPnZp ZXcoKTsKKyAgICBpZiAoZnJhbWVWaWV3ICYmIGZyYW1lVmlldy0+bGF5b3V0UGVuZGluZygpKQor ICAgICAgICBmcmFtZVZpZXctPmxheW91dCgpOworCisgICAgV2ViQ29yZTo6RWxlbWVudCAqZG9j dW1lbnRFbGVtZW50ID0gc2QtPmZyYW1lLT5kb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKTsK KyAgICBpZiAoIWRvY3VtZW50RWxlbWVudCkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisg ICAgcmV0dXJuIGRvY3VtZW50RWxlbWVudC0+aW5uZXJUZXh0KCk7Cit9CisKKy8qKgorICogQGlu dGVybmFsCisgKgorICogRHVtcHMgd2VicGFnZSdzIGxheW91dCBhcyBhIHRyZWUgcmVwcmVzZW50 YXRpb24uCisgKgorICogQHBhcmFtIG8gRnJhbWUgd2hvc2UgbGF5b3V0IHRvIGR1bXAuCisgKgor ICogQHJldHVybiBBIHN0cmluZyB3aXRoIHRoZSBjb250ZW50cywgb3IgYW4gZW1wdHkgb25lIGlu IGNhc2UgYW4gZXJyb3Igb2NjdXJzLgorICovCitXVEY6OlN0cmluZyBld2tfZnJhbWVfcmVuZGVy X3RyZWVfZHVtcF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pCit7CisgICAgRVdLX0ZSQU1FX1NE X0dFVF9PUl9SRVRVUk4obywgc2QsIFdURjo6U3RyaW5nKCkpOworCisgICAgV2ViQ29yZTo6RnJh bWVWaWV3ICpmcmFtZVZpZXcgPSBzZC0+ZnJhbWUtPnZpZXcoKTsKKyAgICBpZiAoZnJhbWVWaWV3 ICYmIGZyYW1lVmlldy0+bGF5b3V0UGVuZGluZygpKQorICAgICAgICBmcmFtZVZpZXctPmxheW91 dCgpOworCisgICAgcmV0dXJuIFdlYkNvcmU6OmV4dGVybmFsUmVwcmVzZW50YXRpb24oc2QtPmZy YW1lKTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBSZXR1cm5zIGNoaWxkIGZyYW1l cyBpZiBleGlzdHMKKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICoKKyAqIEByZXR1cm4gQSBsaXN0 IG9mIGNoaWxkIGZyYW1lcywgb3IgQGMgTlVMTCBlbXB0eSBsaXN0LiBBZnRlciB1c2UsIGxpc3Qg bm9kZXMgc2hvdWxkIGJlIGZyZWVkLCBidXQgbm90IHRoZSBkYXRhIGFzIGl0CisgKiBpcyBvd25l ZCBieSBXZWJDb3JlLgorICovCitFaW5hX0xpc3QgKmV3a19mcmFtZV9jaGlsZHJlbl9nZXQoY29u c3QgRXZhc19PYmplY3QgKm8pCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4obywg c2QsIDApOworCisgICAgRWluYV9MaXN0ICpjaGlsZEZyYW1lcyA9IDA7CisKKyAgICBmb3IgKHVu c2lnbmVkIGluZGV4ID0gMDsgaW5kZXggPCBzZC0+ZnJhbWUtPnRyZWUoKS0+Y2hpbGRDb3VudCgp OyBpbmRleCsrKSB7CisgICAgICAgIFdlYkNvcmU6OkZyYW1lICpjaGlsZEZyYW1lID0gc2QtPmZy YW1lLT50cmVlKCktPmNoaWxkKGluZGV4KTsKKyAgICAgICAgV2ViQ29yZTo6RnJhbWVMb2FkZXJD bGllbnRFZmwgKmNsaWVudCA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50 RWZsKj4oY2hpbGRGcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKTsKKyAgICAgICAgaWYgKCFjbGll bnQpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgY2hpbGRGcmFtZXMgPSBlaW5hX2xp c3RfYXBwZW5kKGNoaWxkRnJhbWVzLCBjbGllbnQtPndlYkZyYW1lKCkpOworICAgIH0KKworICAg IHJldHVybiBjaGlsZEZyYW1lczsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBSZXR1 cm5zIG51bWJlciBvZiBwYWdlIGVsZW1lbnQKKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICogQHBh cmFtIGVsZW1lbnRfaWQgZWxlbWVudCBpZAorICogQHBhcmFtIHBhZ2VXaWR0aCBwYWdlIHdpZHRo CisgKiBAcGFyYW0gcGFnZUhlaWdodCBwYWdlIGhlaWdodAorICoKKyAqIEByZXR1cm4gbnVtYmVy IG9mIHBhZ2UgZWxlbWVudCBvciAwIG9uIGVycm9yCisgKi8KK2ludCBld2tfZnJhbWVfcGFnZV9u dW1iZXJfYnlfZWxlbWVudF9pZF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIg KmVsZW1lbnRfaWQsIGZsb2F0IHBhZ2VXaWR0aCwgZmxvYXQgcGFnZUhlaWdodCkKK3sKKyAgICBF V0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgV2ViQ29yZTo6RWxlbWVu dCAqZWxlbWVudCA9IHNkLT5mcmFtZS0+ZG9jdW1lbnQoKS0+Z2V0RWxlbWVudEJ5SWQoV1RGOjpB dG9taWNTdHJpbmcoZWxlbWVudF9pZCkpOworICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgcmV0 dXJuIDA7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6UHJpbnRDb250ZXh0OjpwYWdlTnVtYmVyRm9y RWxlbWVudChlbGVtZW50LCBXZWJDb3JlOjpGbG9hdFNpemUocGFnZVdpZHRoLCBwYWdlSGVpZ2h0 KSk7Cit9CisKKy8qKgorICogQGludGVybmFsCisgKgorICogUmV0dXJucyBudW1iZXIgb2YgcGFn ZXMKKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICogQHBhcmFtIHBhZ2VXaWR0aCBwYWdlIHdpZHRo CisgKiBAcGFyYW0gcGFnZUhlaWdodCBwYWdlIGhlaWdodAorICoKKyAqIEByZXR1cm4gcmV0dXJu cyBudW1iZXIgb2YgcGFnZXMgb3IgMCBvbiBlcnJvcgorICovCitpbnQgZXdrX2ZyYW1lX3BhZ2Vf bnVtYmVyX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgZmxvYXQgcGFnZVdpZHRoLCBmbG9hdCBw YWdlSGVpZ2h0KQoreworICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsK KworICAgIHJldHVybiBXZWJDb3JlOjpQcmludENvbnRleHQ6Om51bWJlck9mUGFnZXMoc2QtPmZy YW1lLCBXZWJDb3JlOjpGbG9hdFNpemUocGFnZVdpZHRoLCBwYWdlSGVpZ2h0KSk7Cit9CisKKy8q KgorICogQGludGVybmFsCisgKgorICogUmV0dXJucyBjb3VudGVyIHZhbHVlIGZvciBlbGVtZW50 CisgKgorICogQHBhcmFtIG8gRnJhbWUKKyAqIEBwYXJhbSBlbGVtZW50X2lkIGVsZW1lbnQgaWQK KyAqCisgKiBAcmV0dXJuIEEgc3RyaW5nIGNvbnRhaW5pbmcgdGhlIGNvdW50ZXIgdmFsdWUsIG9y IGFuIGVtcHR5IG9uZSBpbiBjYXNlIGFuIGVycm9yIG9jY3Vycy4KKyAqLworV1RGOjpTdHJpbmcg ZXdrX2ZyYW1lX2NvdW50ZXJfdmFsdWVfYnlfZWxlbWVudF9pZF9nZXQoY29uc3QgRXZhc19PYmpl Y3QgKm8sIGNvbnN0IGNoYXIgKmVsZW1lbnRfaWQpCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9P Ul9SRVRVUk4obywgc2QsIFdURjo6U3RyaW5nKCkpOworCisgICAgV2ViQ29yZTo6RWxlbWVudCAq ZWxlbWVudCA9IHNkLT5mcmFtZS0+ZG9jdW1lbnQoKS0+Z2V0RWxlbWVudEJ5SWQoV1RGOjpBdG9t aWNTdHJpbmcoZWxlbWVudF9pZCkpOworICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgcmV0dXJu IFdURjo6U3RyaW5nKCk7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6Y291bnRlclZhbHVlRm9yRWxl bWVudChlbGVtZW50KTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBTZXQgcGF1c2Ug b24gZnJhbWUncyBhbmltYXRpb24KKyAqCisgKiBAcGFyYW0gbmFtZSBuYW1lCisgKiBAcGFyYW0g ZWxlbWVudF9pZCBlbGVtZW50IGlkCisgKiBAZG91YmxlIHRpbWUgdGltZQorICoKKyAqIEByZXR1 cm4gQGMgVFJVRSBpZiBhbmltYXRpb24gd2FzIHBhdXNlZCwgQGMgRkFMU0Ugb3RoZXJ3aXNlLgor ICovCitFaW5hX0Jvb2wgZXdrX2ZyYW1lX2FuaW1hdGlvbl9wYXVzZShjb25zdCBFdmFzX09iamVj dCAqbywgY29uc3QgY2hhciAqbmFtZSwgY29uc3QgY2hhciAqZWxlbWVudElkLCBkb3VibGUgdGlt ZSkKK3sKKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisKKyAgICBX ZWJDb3JlOjpFbGVtZW50ICplbGVtZW50ID0gc2QtPmZyYW1lLT5kb2N1bWVudCgpLT5nZXRFbGVt ZW50QnlJZChXVEY6OkF0b21pY1N0cmluZyhlbGVtZW50SWQpKTsKKyAgICBpZiAoIWVsZW1lbnQg fHwgIWVsZW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJl dHVybiBzZC0+ZnJhbWUtPmFuaW1hdGlvbigpLT5wYXVzZUFuaW1hdGlvbkF0VGltZShlbGVtZW50 LT5yZW5kZXJlcigpLCBXVEY6OkF0b21pY1N0cmluZyhuYW1lKSwgdGltZSk7Cit9CisKKy8qKgor ICogQGludGVybmFsCisgKgorICogUGF1c2UgdHJhbnNpdGlvbgorICoKKyAqIEBwYXJhbSBvIEZy YW1lCisgKiBAcGFyYW0gbmFtZQorICogQHBhcmFtIGVsZW1lbnRJZAorICogQHBhcmFtIHRpbWUK KyAqCisgKiBAcmV0dXJuIEBjIFRSVUUgaWYgQ1NTIHRyYW5zaXRpb24gd2FzIHBhdXNlZCwgQGMg RkFMU0Ugb3RoZXJ3aXNlLgorICovCitFaW5hX0Jvb2wgZXdrX2ZyYW1lX3RyYW5zaXRpb25fcGF1 c2UoY29uc3QgRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKmVs ZW1lbnRJZCwgZG91YmxlIHRpbWUpCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4o bywgc2QsIDApOworCisgICAgV2ViQ29yZTo6RWxlbWVudCAqZWxlbWVudCA9IHNkLT5mcmFtZS0+ ZG9jdW1lbnQoKS0+Z2V0RWxlbWVudEJ5SWQoV1RGOjpBdG9taWNTdHJpbmcoZWxlbWVudElkKSk7 CisgICAgaWYgKCFlbGVtZW50IHx8ICFlbGVtZW50LT5yZW5kZXJlcigpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICByZXR1cm4gc2QtPmZyYW1lLT5hbmltYXRpb24oKS0+cGF1c2VUcmFu c2l0aW9uQXRUaW1lKGVsZW1lbnQtPnJlbmRlcmVyKCksIFdURjo6QXRvbWljU3RyaW5nKG5hbWUp LCB0aW1lKTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBQYXVzZSBzdmcgYW5pbWF0 aW9uCisgKgorICogQHBhcmFtIG8gRnJhbWUKKyAqIEBwYXJhbSBhbmltYXRpb25JZAorICogQHBh cmFtIGVsZW1lbnRJZAorICogQHBhcmFtIHRpbWUKKyAqCisgKiBAcmV0dXJuIEBjIFRSVUUgaWYg U1ZHIGFuaW1hdGlvbiB3YXMgcGF1c2VkLCBAYyBGQUxTRSBvdGhlcndpc2UuCisgKi8KK0VpbmFf Qm9vbCBld2tfZnJhbWVfc3ZnX2FuaW1hdGlvbl9wYXVzZShjb25zdCBFdmFzX09iamVjdCAqbywg Y29uc3QgY2hhciAqYW5pbWF0aW9uSWQsIGNvbnN0IGNoYXIgKmVsZW1lbnRJZCwgZG91YmxlIHRp bWUpCit7CisjaWYgRU5BQkxFKFNWRykKKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihv LCBzZCwgMCk7CisKKyAgICBXZWJDb3JlOjpEb2N1bWVudCAqZG9jdW1lbnQgPSBzZC0+ZnJhbWUt PmRvY3VtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudCAmJiAhZG9jdW1lbnQtPnN2Z0V4dGVuc2lv bnMoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgV2ViQ29yZTo6RWxlbWVudCAqZWxl bWVudCA9IGRvY3VtZW50LT5nZXRFbGVtZW50QnlJZChXVEY6OkF0b21pY1N0cmluZyhhbmltYXRp b25JZCkpOworICAgIGlmICghZWxlbWVudCAmJiAhV2ViQ29yZTo6U1ZHU01JTEVsZW1lbnQ6Omlz U01JTEVsZW1lbnQoZWxlbWVudCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVy biBkb2N1bWVudC0+YWNjZXNzU1ZHRXh0ZW5zaW9ucygpLT5zYW1wbGVBbmltYXRpb25BdFRpbWUo ZWxlbWVudElkLCBzdGF0aWNfY2FzdDxXZWJDb3JlOjpTVkdTTUlMRWxlbWVudCo+KGVsZW1lbnQp LCB0aW1lKTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKKy8qKgorICog QGludGVybmFsCisgKgorICogUmV0dXJucyBudW1iZXIgb2YgYWN0aXZlIGFuaW1hdGlvbnMKKyAq CisgKiBAcGFyYW0gbyBGcmFtZQorICoKKyAqIEByZXR1cm4gVGhlIG51bWJlciBvZiBhY3RpdmUg YW5pbWF0aW9ucywgb3IgQGMgMCBpZiBzb21ldGhpbmcgd2VudCB3cm9uZy4KKyAqLwordW5zaWdu ZWQgZXdrX2ZyYW1lX2FuaW1hdGlvbl9hY3RpdmVfbnVtYmVyX2dldChjb25zdCBFdmFzX09iamVj dCAqbykKK3sKKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisKKyAg ICBXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyICphQ29udHJvbGxlciA9IHNkLT5mcmFtZS0+ YW5pbWF0aW9uKCk7CisgICAgaWYgKCFhQ29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgcmV0dXJuIGFDb250cm9sbGVyLT5udW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoc2Qt PmZyYW1lLT5kb2N1bWVudCgpKTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBTdXNw ZW5kIGFuaW1hdGlvbnMuCisgKgorICogQHBhcmFtIG8gRnJhbWUKKyAqLwordm9pZCBld2tfZnJh bWVfYW5pbWF0aW9uX3N1c3BlbmQoY29uc3QgRXZhc19PYmplY3QgKm8pCit7CisgICAgRVdLX0ZS QU1FX1NEX0dFVF9PUl9SRVRVUk4obywgc2QpOworCisgICAgV2ViQ29yZTo6QW5pbWF0aW9uQ29u dHJvbGxlciAqYUNvbnRyb2xsZXIgPSBzZC0+ZnJhbWUtPmFuaW1hdGlvbigpOworICAgIGlmIChh Q29udHJvbGxlcikKKyAgICAgICAgYUNvbnRyb2xsZXItPnN1c3BlbmRBbmltYXRpb25zKCk7Cit9 CisKKy8qKgorICogQGludGVybmFsCisgKgorICogUmVzdW1lIGFuaW1hdGlvbnMuCisgKgorICog QHBhcmFtIG8gRnJhbWUKKyAqLwordm9pZCBld2tfZnJhbWVfYW5pbWF0aW9uX3Jlc3VtZShjb25z dCBFdmFzX09iamVjdCAqbykKK3sKKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBz ZCk7CisKKyAgICBXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyICphQ29udHJvbGxlciA9IHNk LT5mcmFtZS0+YW5pbWF0aW9uKCk7CisgICAgaWYgKGFDb250cm9sbGVyKQorICAgICAgICBhQ29u dHJvbGxlci0+cmVzdW1lQW5pbWF0aW9ucygpOworfQorCisvKioKKyAqIEBpbnRlcm5hbAorICoK KyAqIEdldHMgcmVzcG9uc2UgTUlNRSB0eXBlCisgKgorICogQHBhcmFtIG8gRnJhbWUKKyAqCisg KiBAcmV0dXJuIFRoZSByZXNwb25zZSdzIE1JTUUgdHlwZSwgb3IgYW4gZW1wdHkgc3RyaW5nIGlm IGFuIGVycm9yIG9jY3Vycy4KKyAqLworV1RGOjpTdHJpbmcgZXdrX2ZyYW1lX3Jlc3BvbnNlX21p bWVfdHlwZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pCit7CisgICAgRVdLX0ZSQU1FX1NEX0dF VF9PUl9SRVRVUk4obywgc2QsIFdURjo6U3RyaW5nKCkpOworCisgICAgV2ViQ29yZTo6RG9jdW1l bnRMb2FkZXIgKmRvY0xvYWRlciA9IHNkLT5mcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVy KCk7CisgICAgaWYgKCFkb2NMb2FkZXIpCisgICAgICAgIHJldHVybiBXVEY6OlN0cmluZygpOwor CisgICAgcmV0dXJuIGRvY0xvYWRlci0+cmVzcG9uc2VNSU1FVHlwZSgpOworfQorCisvKioKKyAq IEBpbnRlcm5hbAorICoKKyAqIEdldHMgdGhlIHJlY3RhbmdsZSBmb3IgdGhlIGN1cnJlbnQgc2Vs ZWN0aW9uLgorICoKKyAqIEBwYXJhbSBvIEZyYW1lCisgKiBAcGFyYW0geCBQb2ludGVyIHRvIHJl Y3RhbmdsZSdzIHgKKyAqIEBwYXJhbSB5IFBvaW50ZXIgdG8gcmVjdGFuZ2xlJ3MgeQorICogQHBh cmFtIHdpZHRoIFBvaW50ZXIgdG8gcmVjdGFuZ2xlJ3Mgd2lkdGgKKyAqIEBwYXJhbSB3aWR0aCBQ b2ludGVyIHRvIHJlY3RhbmdsZSdzIGhlaWdodAorICogQHJldHVybiBFSU5BX1RSVUUgaWYgc3Vj Y2Vzc2Z1bCwgRUlOQV9GQUxTRSBvdGhlcndpc2UKKyAqLworRWluYV9Cb29sIGV3a19mcmFtZV9z ZWxlY3Rpb25fcmVjdGFuZ2xlX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgaW50ICp4LCBpbnQg KnksIGludCAqd2lkdGgsIGludCAqaGVpZ2h0KQoreworICAgIEVXS19GUkFNRV9TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKKworICAgIGlmICghc2QtPmZyYW1lKQorICAgICAg ICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIFdlYkNvcmU6OkludFJlY3QgYm91bmRzID0gZW5j bG9zaW5nSW50UmVjdChzZC0+ZnJhbWUtPnNlbGVjdGlvbigpLT5ib3VuZHMoKSk7CisgICAgaWYg KHgpCisgICAgICAgICp4ID0gYm91bmRzLngoKTsKKyAgICBpZiAoeSkKKyAgICAgICAgKnkgPSBi b3VuZHMueSgpOworICAgIGlmICh3aWR0aCkKKyAgICAgICAgKndpZHRoID0gYm91bmRzLndpZHRo KCk7CisgICAgaWYgKGhlaWdodCkKKyAgICAgICAgKmhlaWdodCA9IGJvdW5kcy5oZWlnaHQoKTsK KworICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKKy8qKgorICogQGludGVybmFsCisgKgorICog Q2xlYXJzIHRoZSBvcGVuZXIgZm9yIGEgZ2l2ZW4gZnJhbWUuCisgKgorICogQHBhcmFtIG8gRnJh bWUKKyAqLwordm9pZCBld2tfZnJhbWVfb3BlbmVyX2NsZWFyKGNvbnN0IEV2YXNfT2JqZWN0ICpv KQoreworICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkKTsKKworICAgIGlmIChz ZC0+ZnJhbWUpCisgICAgICAgIHNkLT5mcmFtZS0+bG9hZGVyKCktPnNldE9wZW5lcigwKTsKK30K KworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBSZXR1cm5zIHRoZSBudW1iZXIgb2YgcGVuZGlu ZyBKYXZhU2NyaXB0IHVubG9hZCBldmVudHMuCisgKi8KK3Vuc2lnbmVkIGludCBld2tfZnJhbWVf cGVuZGluZ191bmxvYWRfZXZlbnRfY291bnRfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKQorewor ICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKKworICAgIHJldHVybiBz ZC0+ZnJhbWUtPmRvbVdpbmRvdygpLT5wZW5kaW5nVW5sb2FkRXZlbnRMaXN0ZW5lcnMoKTsKK30K KworLyoqCisgKiBAaW50ZXJuYWwKKyAqCisgKiBSZXR1cm5zIHRoZSBmcmFtZSdzIG5hbWUgaW4g dGhlIGZvcm1hdCByZXF1aXJlZCBieSBEdW1wUmVuZGVyVHJlZS4KKyAqLworV1RGOjpTdHJpbmcg ZXdrX2ZyYW1lX3N1aXRhYmxlX2RydF9uYW1lX2dldChjb25zdCBFdmFzX09iamVjdCAqbykKK3sK KyAgICAvLyBDb21wYXJlIHdpdGggIldlYktpdC9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRnJh bWVMb2FkRGVsZWdhdGUubW0KKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwg V1RGOjpTdHJpbmcoKSk7CisKKyAgICBjb25zdCBTdHJpbmcgZnJhbWVOYW1lKGV3a19mcmFtZV9u YW1lX2dldChvKSk7CisKKyAgICBpZiAobyA9PSBld2tfdmlld19mcmFtZV9tYWluX2dldChzZC0+ dmlldykpIHsKKyAgICAgICAgaWYgKCFmcmFtZU5hbWUuaXNFbXB0eSgpKQorICAgICAgICAgICAg cmV0dXJuIFdURjo6U3RyaW5nKCJtYWluIGZyYW1lIFwiIikgKyBmcmFtZU5hbWUgKyBXVEY6OlN0 cmluZygiXCIiKTsKKworICAgICAgICByZXR1cm4gV1RGOjpTdHJpbmcoIm1haW4gZnJhbWUiKTsK KyAgICB9CisKKyAgICBpZiAoIWZyYW1lTmFtZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBX VEY6OlN0cmluZygiZnJhbWUgXCIiKSArIGZyYW1lTmFtZSArIFdURjo6U3RyaW5nKCJcIiIpOwor CisgICAgcmV0dXJuIFdURjo6U3RyaW5nKCJmcmFtZSAoYW5vbnltb3VzKSIpOworfQorCisvKioK KyAqIEBpbnRlcm5hbAogICogUmVwb3J0cyB0aGF0IGVkaXRvciBjbGllbnQncyBjb250ZW50cyB3 ZXJlIGNoYW5nZWQuCiAgKgogICogQHBhcmFtIG8gRnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19w cml2YXRlLmgKaW5kZXggM2Q2MjI4NDc2MzZhODRiZWIwNjM4MTc4ODQ4NTMyYzNmMzU0MzhlZS4u MTkyZGQyNDdlMTM1ODljZDI0ZjRiMzVhOGJmY2I1MzQ4ZDMzN2Y1YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a19wcml2YXRlLmgKQEAgLTIxOCw2ICsyMTgsMjQgQEAgY29uc3QgY2hhciogZXdrX3Nl dHRpbmdzX2RlZmF1bHRfdXNlcl9hZ2VudF9nZXQodm9pZCk7CiB2b2lkIGV3a19mcmFtZV9lZGl0 b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoRXZhc19PYmplY3QgKm8pOwogdm9pZCBld2tfZnJh bWVfZWRpdG9yX2NsaWVudF9zZWxlY3Rpb25fY2hhbmdlZChFdmFzX09iamVjdCAqbyk7CiAKK1dU Rjo6U3RyaW5nICBld2tfZnJhbWVfY291bnRlcl92YWx1ZV9ieV9lbGVtZW50X2lkX2dldChjb25z dCBFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogZWxlbWVudF9pZCk7CitXVEY6OlN0cmluZyAg ZXdrX2ZyYW1lX2lubmVyX3RleHRfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKTsKK1dURjo6U3Ry aW5nICBld2tfZnJhbWVfcmVuZGVyX3RyZWVfZHVtcF9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8p OworV1RGOjpTdHJpbmcgIGV3a19mcmFtZV9yZXNwb25zZV9taW1lX3R5cGVfZ2V0KGNvbnN0IEV2 YXNfT2JqZWN0KiBvKTsKK0VpbmFfQm9vbCAgICBld2tfZnJhbWVfYW5pbWF0aW9uX3BhdXNlKGNv bnN0IEV2YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBjaGFyKiBlbGVtZW50 SWQsIGRvdWJsZSB0aW1lKTsKK3Vuc2lnbmVkICAgICBld2tfZnJhbWVfYW5pbWF0aW9uX2FjdGl2 ZV9udW1iZXJfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKTsKK3ZvaWQgICAgICAgICBld2tfZnJh bWVfYW5pbWF0aW9uX3N1c3BlbmQoY29uc3QgRXZhc19PYmplY3QgKm8pOwordm9pZCAgICAgICAg IGV3a19mcmFtZV9hbmltYXRpb25fcmVzdW1lKGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKK0VpbmFf Qm9vbCAgICBld2tfZnJhbWVfc3ZnX2FuaW1hdGlvbl9wYXVzZShjb25zdCBFdmFzX09iamVjdCog bywgY29uc3QgY2hhciogYW5pbWF0aW9uSWQsIGNvbnN0IGNoYXIqIGVsZW1lbnRJZCwgZG91Ymxl IHRpbWUpOworRWluYV9Cb29sICAgIGV3a19mcmFtZV90cmFuc2l0aW9uX3BhdXNlKGNvbnN0IEV2 YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBjaGFyKiBlbGVtZW50SWQsIGRv dWJsZSB0aW1lKTsKK0VpbmFfTGlzdCogICBld2tfZnJhbWVfY2hpbGRyZW5fZ2V0KGNvbnN0IEV2 YXNfT2JqZWN0KiBvKTsKK2ludCAgICAgICAgICBld2tfZnJhbWVfcGFnZV9udW1iZXJfYnlfZWxl bWVudF9pZF9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIGVsZW1lbnRfaWQs IGZsb2F0IHBhZ2VXaWR0aCwgZmxvYXQgcGFnZUhlaWdodCk7CitpbnQgICAgICAgICAgZXdrX2Zy YW1lX3BhZ2VfbnVtYmVyX2dldChjb25zdCBFdmFzX09iamVjdCogbywgZmxvYXQgcGFnZVdpZHRo LCBmbG9hdCBwYWdlSGVpZ2h0KTsKK3ZvaWQgICAgICAgICBld2tfZnJhbWVfb3BlbmVyX2NsZWFy KGNvbnN0IEV2YXNfT2JqZWN0KiBvKTsKK0VpbmFfQm9vbCAgICBld2tfZnJhbWVfc2VsZWN0aW9u X3JlY3RhbmdsZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8sIGludCogeCwgaW50KiB5LCBpbnQq IHdpZHRoLCBpbnQqIGhlaWdodCk7Cit1bnNpZ25lZCBpbnQgZXdrX2ZyYW1lX3BlbmRpbmdfdW5s b2FkX2V2ZW50X2NvdW50X2dldChjb25zdCBFdmFzX09iamVjdCogbyk7CitXVEY6OlN0cmluZyAg ZXdrX2ZyYW1lX3N1aXRhYmxlX2RydF9uYW1lX2dldChjb25zdCBFdmFzX09iamVjdCogbyk7CisK ICNpZmRlZiBfX2NwbHVzcGx1cwogCiB9Cg==