116254 2013-05-16 17:11:27 -0700 Remove WKBundlePageGetHeaderLayer/Footer SPI 2013-05-16 22:22:54 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin andersca bdakin sam oldest_to_newest 890060 0 bdakin 2013-05-16 17:11:27 -0700 We should remove the Remove WKBundlePageGetHeaderLayer/Footer SPI. It was only recently added and have been replaced by WKBundlePageSetHeaderBanner/Footer. 890062 1 202005 bdakin 2013-05-16 17:12:01 -0700 Created attachment 202005 Patch 890080 2 202005 benjamin 2013-05-16 17:33:04 -0700 Comment on attachment 202005 Patch A changelog would be nice ;) 890083 3 202005 benjamin 2013-05-16 17:33:36 -0700 Comment on attachment 202005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202005&action=review > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:826 > +{ Extra spaces here. 890203 4 bdakin 2013-05-16 21:42:23 -0700 (In reply to comment #2) > (From update of attachment 202005 [details]) > A changelog would be nice ;) Heh, good call. Thanks for the review! 890211 5 bdakin 2013-05-16 22:22:54 -0700 http://trac.webkit.org/changeset/150243 202005 2013-05-16 17:12:01 -0700 2013-05-16 17:33:36 -0700 Patch wk2-remove-stuff.txt text/plain 11546 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oJKHJldmlzaW9uIDE1MDIxMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNjA5LDggKzYwOSw2IEBACiAJ CTkzNUVFQkE0MTI3NzYxRDYwMDMzMjJCOCAvKiBJbmplY3RlZEJ1bmRsZUJhY2tGb3J3YXJkTGlz dEl0ZW0uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkz NUVFQjkyMTI3NzYxNUQwMDMzMjJCOCAvKiBJbmplY3RlZEJ1bmRsZUJhY2tGb3J3YXJkTGlzdEl0 ZW0uaCAqLzsgfTsKIAkJOTM5MUYyQ0ExMjFCNjc5QTAwRUJGN0U4IC8qIFdlYkZyYW1lTmV0d29y a2luZ0NvbnRleHQubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA5MzkxRjI4NDEyMUIzOEY1MDBFQkY3RTggLyogV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4 dC5tbSAqLzsgfTsKIAkJOTM5MUYyQ0IxMjFCNjdBRDAwRUJGN0U4IC8qIFdlYkZyYW1lTmV0d29y a2luZ0NvbnRleHQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDkzOTFGMjgzMTIxQjM4RjUwMEVCRjdFOCAvKiBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0 LmggKi87IH07Ci0JCTkzOTRBRTQ0MTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQcml2 YXRlTWFjLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5 Mzk0QUU0MjE3MDJCMjVCMDAzNDQyMzIgLyogV0tCdW5kbGVQYWdlUHJpdmF0ZU1hYy5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCTkzOTRBRTQ1MTcw MkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM5NEFFNDMxNzAyQjI1QjAwMzQ0MjMy IC8qIFdLQnVuZGxlUGFnZVByaXZhdGVNYWMubW0gKi87IH07CiAJCTkzOUFFNzY2MTMxNkU5OUMw MEFFMDZBNiAvKiBXZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM5QUU3NjUxMzE2RTk5QzAwQUUwNkE2IC8qIFdl YkNvcmVBcmd1bWVudENvZGVycy5jcHAgKi87IH07CiAJCTkzQkRFQjAxMTcxREQ3QUYwMEJGRUUx QiAvKiBXS1BhZ2VMb2FkVHlwZXNQcml2YXRlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA5M0JERUIwMDE3MUREN0FGMDBCRkVFMUIgLyogV0tQYWdlTG9h ZFR5cGVzUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7 IH07IH07CiAJCTkzRkM2N0JEMTJEM0NDRjIwMEE2MDYxMCAvKiBEZWNvZGVyQWRhcHRlci5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0ZDNjc5RDEy RDNDQzc0MDBBNjA2MTAgLyogRGVjb2RlckFkYXB0ZXIuY3BwICovOyB9OwpAQCAtMjA5NCw4ICsy MDkyLDYgQEAKIAkJOTM1RUVCOTgxMjc3NjE2RDAwMzMyMkI4IC8qIFdLQnVuZGxlQmFja0Zvcndh cmRMaXN0SXRlbS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS0J1bmRsZUJh Y2tGb3J3YXJkTGlzdEl0ZW0uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM5MUYy ODMxMjFCMzhGNTAwRUJGN0U4IC8qIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzkxRjI4NDEyMUIzOEY1MDBFQkY3RTggLyog V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9i amNwcDsgcGF0aCA9IFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW07IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07Ci0JCTkzOTRBRTQyMTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQ cml2YXRlTWFjLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLQnVuZGxlUGFn ZVByaXZhdGVNYWMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJOTM5NEFFNDMxNzAy QjI1QjAwMzQ0MjMyIC8qIFdLQnVuZGxlUGFnZVByaXZhdGVNYWMubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLm1tOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzlBRTc2NTEzMTZFOTlDMDBBRTA2QTYgLyogV2Vi Q29yZUFyZ3VtZW50Q29kZXJzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFdlYkNvcmVBcmd1bWVudENvZGVycy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTkzQkRFQjAwMTcxREQ3QUYwMEJGRUUxQiAvKiBXS1BhZ2VMb2FkVHlwZXNQcml2YXRlLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLUGFnZUxvYWRUeXBlc1ByaXZhdGUu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNGQzY3OUQxMkQzQ0M3NDAwQTYwNjEw IC8qIERlY29kZXJBZGFwdGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IERlY29kZXJBZGFwdGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTM4 MzYsOCArMzgzMiw2IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQk3Q0Y0N0ZGRDE3Mjc2QUUzMDA4 QUNCOTEgLyogV0tCdW5kbGVQYWdlQmFubmVyTWFjLmggKi8sCiAJCQkJN0NGNDdGRkMxNzI3NkFF MzAwOEFDQjkxIC8qIFdLQnVuZGxlUGFnZUJhbm5lck1hYy5tbSAqLywKLQkJCQk5Mzk0QUU0MjE3 MDJCMjVCMDAzNDQyMzIgLyogV0tCdW5kbGVQYWdlUHJpdmF0ZU1hYy5oICovLAotCQkJCTkzOTRB RTQzMTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLm1tICovLAogCQkJ KTsKIAkJCXBhdGggPSBtYWM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtNTgyOSw3 ICs1ODIzLDYgQEAKIAkJCQlFMTRBOTU0QTE2RTAxNkE0MDA2OERFODIgLyogTmV0d29ya1Byb2Nl c3NQbGF0Zm9ybVN0cmF0ZWdpZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCUUxNzk4QzdBMTZFNjgx ODgwMDI0MDEzOSAvKiBOZXR3b3JrQmxvYlJlZ2lzdHJ5LmggaW4gSGVhZGVycyAqLywKIAkJCQlF MTUyNTUxQjE3MDExODE5MDAzRDdBREIgLyogTmV0d29ya1Jlc291cmNlTG9hZGVyTWVzc2FnZXMu aCBpbiBIZWFkZXJzICovLAotCQkJCTkzOTRBRTQ0MTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRs ZVBhZ2VQcml2YXRlTWFjLmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVw bG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTcwODAsNyArNzA3Myw2IEBACiAJ CQkJRTE0QTk1NDkxNkUwMTZBNDAwNjhERTgyIC8qIE5ldHdvcmtQcm9jZXNzUGxhdGZvcm1TdHJh dGVnaWVzLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUUxNzk4Qzc5MTZFNjgxODgwMDI0MDEzOSAv KiBOZXR3b3JrQmxvYlJlZ2lzdHJ5LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUUxNTI1NTFBMTcw MTE4MTkwMDNEN0FEQiAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3Bw IGluIFNvdXJjZXMgKi8sCi0JCQkJOTM5NEFFNDUxNzAyQjI1QjAwMzQ0MjMyIC8qIFdLQnVuZGxl UGFnZVByaXZhdGVNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVw bG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZVByaXZhdGVNYWMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL21hYy9XS0J1bmRsZVBhZ2VQcml2YXRlTWFjLmgJKHJldmlzaW9uIDE1MDIxMCkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVu ZGxlUGFnZVByaXZhdGVNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtMSw0NiArMCwwIEBACi0vKgot ICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAq Ci0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0g KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5E IElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBM SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExF IElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQg T0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBP UiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBB TkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu Ci0gKi8KLQotI2lmbmRlZiBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjX2gKLSNkZWZpbmUgV0tCdW5k bGVQYWdlUHJpdmF0ZU1hY19oCi0KLSNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgotCi1AY2xh c3MgQ0FMYXllcjsKLQotI2lmZGVmIF9fY3BsdXNwbHVzCi1leHRlcm4gIkMiIHsKLSNlbmRpZgot Ci1XS19FWFBPUlQgQ0FMYXllciAqIFdLQnVuZGxlUGFnZUdldEhlYWRlckxheWVyKFdLQnVuZGxl UGFnZVJlZiBwYWdlKTsKLVdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZVNldEhlYWRlckxheWVy KFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBDQUxheWVyICpoZWFkZXJMYXllciwgaW50IGhlaWdodCk7 Ci1XS19FWFBPUlQgQ0FMYXllciAqIFdLQnVuZGxlUGFnZUdldEZvb3RlckxheWVyKFdLQnVuZGxl UGFnZVJlZiBwYWdlKTsKLVdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZVNldEZvb3RlckxheWVy KFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBDQUxheWVyICpmb290ZXJMYXllciwgaW50IGhlaWdodCk7 Ci0KLSNpZmRlZiBfX2NwbHVzcGx1cwotfQotI2VuZGlmCi0KLSNlbmRpZiAvKiBXS0J1bmRsZVBh Z2VQcml2YXRlTWFjX2ggKi8KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZVByaXZhdGVNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9tYWMvV0tC dW5kbGVQYWdlUHJpdmF0ZU1hYy5tbQkocmV2aXNpb24gMTUwMjEwKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9tYWMvV0tCdW5kbGVQYWdlUHJpdmF0 ZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1MiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0 IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0g KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0g KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2lu Y2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIldLQnVuZGxlUGFnZVByaXZhdGVNYWMuaCIKLQot I2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgotI2luY2x1ZGUgIldlYlBhZ2UuaCIKLQotdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKLQotQ0FMYXllciAqIFdLQnVuZGxlUGFnZUdldEhlYWRlckxh eWVyKFdLQnVuZGxlUGFnZVJlZiBwYWdlKQotewotICAgIHJldHVybiB0b0ltcGwocGFnZSktPmdl dEhlYWRlckxheWVyKCk7Ci19Ci0KLXZvaWQgV0tCdW5kbGVQYWdlU2V0SGVhZGVyTGF5ZXIoV0tC dW5kbGVQYWdlUmVmIHBhZ2UsIENBTGF5ZXIgKmhlYWRlckxheWVyLCBpbnQgaGVpZ2h0KQotewot ICAgIHRvSW1wbChwYWdlKS0+c2V0SGVhZGVyTGF5ZXJXaXRoSGVpZ2h0KGhlYWRlckxheWVyLCBo ZWlnaHQpOwotfQotCi1DQUxheWVyICogV0tCdW5kbGVQYWdlR2V0Rm9vdGVyTGF5ZXIoV0tCdW5k bGVQYWdlUmVmIHBhZ2UpCi17Ci0gICAgcmV0dXJuIHRvSW1wbChwYWdlKS0+Z2V0Rm9vdGVyTGF5 ZXIoKTsKLX0KLQotdm9pZCBXS0J1bmRsZVBhZ2VTZXRGb290ZXJMYXllcihXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgQ0FMYXllciAqZm9vdGVyTGF5ZXIsIGludCBoZWlnaHQpCi17Ci0gICAgdG9JbXBs KHBhZ2UpLT5zZXRGb290ZXJMYXllcldpdGhIZWlnaHQoZm9vdGVyTGF5ZXIsIGhlaWdodCk7Ci19 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9X ZWJQYWdlTWFjLm1tCShyZXZpc2lvbiAxNTAyMTApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTgyMiw2NiAr ODIyLDggQEAgdm9pZCBXZWJQYWdlOjpzZXRCb3R0b21PdmVyaGFuZ0ltYWdlKFBhcwogICAgIGxh eWVyLT5wbGF0Zm9ybUxheWVyKCkuY29udGVudHMgPSAoaWQpY2dJbWFnZS5nZXQoKTsKIH0KIAot Q0FMYXllciAqV2ViUGFnZTo6Z2V0SGVhZGVyTGF5ZXIoKSBjb25zdAotewotICAgIHJldHVybiBt X2hlYWRlckxheWVyLmdldCgpOwotfQotCi12b2lkIFdlYlBhZ2U6OnNldEhlYWRlckxheWVyV2l0 aEhlaWdodChDQUxheWVyICpsYXllciwgaW50IGhlaWdodCkKLXsKLSAgICBGcmFtZVZpZXcqIGZy YW1lVmlldyA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpOwotICAgIGlmICghZnJh bWVWaWV3KQotICAgICAgICByZXR1cm47Ci0KLSAgICBmcmFtZVZpZXctPnNldEhlYWRlckhlaWdo dChoZWlnaHQpOwotCi0gICAgbV9oZWFkZXJMYXllciA9IGxheWVyOwotICAgIEdyYXBoaWNzTGF5 ZXIqIHBhcmVudExheWVyID0gZnJhbWVWaWV3LT5zZXRXYW50c0xheWVyRm9ySGVhZGVyKG1faGVh ZGVyTGF5ZXIpOwotICAgIGlmICghcGFyZW50TGF5ZXIpIHsKLSAgICAgICAgbV9wYWdlLT5yZW1v dmVMYXlvdXRNaWxlc3RvbmVzKERpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcik7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX3BhZ2UtPmFkZExheW91dE1pbGVzdG9uZXMoRGlkRmly c3RGbHVzaEZvckhlYWRlckxheWVyKTsKLQotICAgIG1faGVhZGVyTGF5ZXIuZ2V0KCkuYm91bmRz ID0gQ0dSZWN0TWFrZSgwLCAwLCBwYXJlbnRMYXllci0+c2l6ZSgpLndpZHRoKCksIHBhcmVudExh eWVyLT5zaXplKCkuaGVpZ2h0KCkpOwotICAgIFtwYXJlbnRMYXllci0+cGxhdGZvcm1MYXllcigp IGFkZFN1YmxheWVyOm1faGVhZGVyTGF5ZXIuZ2V0KCldOwotfQotCi1DQUxheWVyICpXZWJQYWdl OjpnZXRGb290ZXJMYXllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fZm9vdGVyTGF5ZXIuZ2V0 KCk7Ci19Ci0KLXZvaWQgV2ViUGFnZTo6c2V0Rm9vdGVyTGF5ZXJXaXRoSGVpZ2h0KENBTGF5ZXIg KmxheWVyLCBpbnQgaGVpZ2h0KQotewotICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV9tYWlu RnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCk7Ci0gICAgaWYgKCFmcmFtZVZpZXcpCi0gICAgICAg IHJldHVybjsKLQotICAgIGZyYW1lVmlldy0+c2V0Rm9vdGVySGVpZ2h0KGhlaWdodCk7Ci0KLSAg ICBtX2Zvb3RlckxheWVyID0gbGF5ZXI7Ci0gICAgR3JhcGhpY3NMYXllciogcGFyZW50TGF5ZXIg PSBmcmFtZVZpZXctPnNldFdhbnRzTGF5ZXJGb3JGb290ZXIobV9mb290ZXJMYXllcik7Ci0gICAg aWYgKCFwYXJlbnRMYXllcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9mb290ZXJMYXllci5n ZXQoKS5ib3VuZHMgPSBDR1JlY3RNYWtlKDAsIDAsIHBhcmVudExheWVyLT5zaXplKCkud2lkdGgo KSwgcGFyZW50TGF5ZXItPnNpemUoKS5oZWlnaHQoKSk7Ci0gICAgW3BhcmVudExheWVyLT5wbGF0 Zm9ybUxheWVyKCkgYWRkU3VibGF5ZXI6bV9mb290ZXJMYXllci5nZXQoKV07Ci19Ci0KIHZvaWQg V2ViUGFnZTo6dXBkYXRlSGVhZGVyQW5kRm9vdGVyTGF5ZXJzRm9yRGV2aWNlU2NhbGVDaGFuZ2Uo ZmxvYXQgc2NhbGVGYWN0b3IpCi17Ci0gICAgaWYgKG1faGVhZGVyTGF5ZXIpIHsKLSAgICAgICAg bV9oZWFkZXJMYXllci5nZXQoKS5jb250ZW50c1NjYWxlID0gc2NhbGVGYWN0b3I7Ci0gICAgICAg IFttX2hlYWRlckxheWVyLmdldCgpIHNldE5lZWRzRGlzcGxheV07Ci0gICAgfQotCi0gICAgaWYg KG1fZm9vdGVyTGF5ZXIpIHsKLSAgICAgICAgbV9mb290ZXJMYXllci5nZXQoKS5jb250ZW50c1Nj YWxlID0gc2NhbGVGYWN0b3I7Ci0gICAgICAgIFttX2Zvb3RlckxheWVyLmdldCgpIHNldE5lZWRz RGlzcGxheV07Ci0gICAgfQotICAgIAoreyAgICAKICAgICBpZiAobV9oZWFkZXJCYW5uZXIpCiAg ICAgICAgIG1faGVhZGVyQmFubmVyLT5kaWRDaGFuZ2VEZXZpY2VTY2FsZUZhY3RvcihzY2FsZUZh Y3Rvcik7CiAgICAgaWYgKG1fZm9vdGVyQmFubmVyKQo=