79233 2012-02-22 06:06:21 -0800 [Qt] Move QMenu dependant scrollbar context menu handling out of WebCore 2012-02-22 07:10:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78109 1 hausmann hausmann oldest_to_newest 561908 0 hausmann 2012-02-22 06:06:21 -0800 [Qt] Move QMenu dependant scrollbar context menu handling out of WebCore 561910 1 128193 hausmann 2012-02-22 06:09:46 -0800 Created attachment 128193 Patch 561955 2 hausmann 2012-02-22 07:10:58 -0800 Committed r108498: <http://trac.webkit.org/changeset/108498> 128193 2012-02-22 06:09:46 -0800 2012-02-22 06:13:51 -0800 Patch bug-79233-20120222150944.patch text/plain 13406 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmExMjM0NmViMDI2ODQy NDA5Njc2N2I4ODg4NzJlYWMyNzdjY2Q0OC4uMzUwYTJlYmM5ODc1MTFlMmQ5YzBjNDc3OGM0OGNk ODM1MTdiOGYzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTIyICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIE1v dmUgUU1lbnUgZGVwZW5kYW50IHNjcm9sbGJhciBjb250ZXh0IG1lbnUgaGFuZGxpbmcgb3V0IG9m IFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc5MjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW92ZSB0aGUgY29kZSBpbnRvIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwLCB0aGUgb25seSBw bGFjZSB3aGVyZSBpdCBpcyBjYWxsZWQgZnJvbS4KKworICAgICAgICAqIFRhcmdldC5wcmk6IFJl bW92ZSBTY3JvbGxiYXJRdC5jcHAgZnJvbSBidWlsZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3Jv bGxiYXIuaDogUmVtb3ZlIFF0LW9ubHkgY29udGV4dCBtZW51IGhhbmRsaW5nIGJ1dCBtYWtlIG1v dmVUaHVtCisgICAgICAgIGFjY2Vzc2libGUgZnJvbSB0aGUgb3V0c2lkZS4KKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9TY3JvbGxiYXJRdC5jcHA6IFJlbW92ZWQuIE5vdCBuZWVkZWQgYW55bW9yZS4K KwogMjAxMi0wMi0yMiAgQW5kcmFzIEJlY3NpICA8YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KIAog ICAgICAgICBbUXRdW1dLMl0gRml4IHRoZSBOOSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAxMzJl OTc1NGY5YjI5N2M3MzgyYmUzNDVhMzBlYmIzNDI3YmJmMzg2Li40NzE0NjVjNTY2NWVjNzRhZDcy YzdkNzg0ZmE2MmMwZGNmNDIyODAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDEyLTAyLTIyICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKwor ICAgICAgICBbUXRdIE1vdmUgUU1lbnUgZGVwZW5kYW50IHNjcm9sbGJhciBjb250ZXh0IG1lbnUg aGFuZGxpbmcgb3V0IG9mIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc5MjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTW92ZSBzY3JvbGxiYXIgY29udGV4dCBtZW51IGhhbmRsaW5nIGhlcmUs IGl0J3MgdGhlIG9ubHkgcGxhY2Ugd2hlcmUgaXQgaXMKKyAgICAgICAgdXNlZC4KKworICAgICAg ICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChoYW5kbGVTY3JvbGxiYXJDb250ZXh0TWVu dUV2ZW50KToKKyAgICAgICAgKFFXZWJQYWdlOjpzd2FsbG93Q29udGV4dE1lbnVFdmVudCk6CisK IDIwMTItMDItMjIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmVtb3ZlIHRoZSByZW1haW5pbmcgdXNlcyBvZiBDU1NTdHlsZURlY2xhcmF0aW9uIGluIEVkaXRv cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJDb3Jl L1RhcmdldC5wcmkKaW5kZXggZmU0YjIyODE0ZWVjMGE4Y2NjNmMyMDM5ZTg1OThiNjkzZjEyNDAz OS4uOWM0MTNmZmYyODYwMmJlZGM0ZWRlNjJkNmExMTY0MDA5NDIwMTEzOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJp CkBAIC0yODY2LDggKzI4NjYsNyBAQCBjb250YWlucyhERUZJTkVTLCBIQVZFX1FTVFlMRT0xKSB7 CiAgICAgSEVBREVSUyArPSBwbGF0Zm9ybS9xdC9RdFN0eWxlT3B0aW9uV2ViQ29tYm9Cb3guaCBc CiAgICAgICAgICAgICAgICBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5oIFwKICAgICAg ICAgICAgICAgIHBsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuaAotICAgIFNPVVJDRVMgKz0g cGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwIFwKLSAgICAgICAgICAgICAgIHBsYXRm b3JtL3F0L1Njcm9sbGJhclF0LmNwcAorICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vcXQvUmVuZGVy VGhlbWVRU3R5bGUuY3BwCiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TTU9PVEhfU0NS T0xMSU5HPTEpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJh ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKaW5kZXggZTRlNzI0NjVi ZWY3ZmEwYTZkZTZiMmFkZGE0MDI5ZWM4MzJjYjBlNy4uMzlhYzI1NDY1ZDE0NTVhNTk5MmNkMjVj MjIyOGRkMmI2NTM0YTYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYmFyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKQEAgLTEw MywxMyArMTAzLDYgQEAgcHVibGljOgogCiAgICAgYm9vbCBtb3VzZURvd24oY29uc3QgUGxhdGZv cm1Nb3VzZUV2ZW50Jik7CiAKLSNpZiBQTEFURk9STShRVCkKLSAgICAvLyBGb3IgcGxhdGZvcm1z IHRoYXQgd2lzaCB0byBoYW5kbGUgY29udGV4dCBtZW51IGV2ZW50cy4KLSAgICAvLyBGSVhNRTog VGhpcyBpcyBtaXNwbGFjZWQuICBOb3JtYWwgaGl0IHRlc3Rpbmcgc2hvdWxkIGJlIHVzZWQgdG8g cG9wdWxhdGUgYSBjb3JyZWN0Ci0gICAgLy8gY29udGV4dCBtZW51LiAgVGhlcmUncyBubyByZWFz b24gd2h5IHRoZSBzY3JvbGxiYXIgc2hvdWxkIGhhdmUgdG8gZG8gaXQuCi0gICAgYm9vbCBjb250 ZXh0TWVudShjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KTsKLSNlbmRpZgotCiAgICAg U2Nyb2xsYmFyVGhlbWUqIHRoZW1lKCkgY29uc3QgeyByZXR1cm4gbV90aGVtZTsgfQogCiAgICAg dmlydHVhbCB2b2lkIHNldFBhcmVudChTY3JvbGxWaWV3Kik7CkBAIC0xMjgsNiArMTIxLDggQEAg cHVibGljOgogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydFRvQ29udGFpbmluZ1ZpZXcoY29u c3QgSW50UG9pbnQmKSBjb25zdDsKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZlcnRGcm9tQ29u dGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAorICAgIHZvaWQgbW92ZVRodW1i KGludCBwb3MsIGJvb2wgZHJhZ2dpbmdEb2N1bWVudCA9IGZhbHNlKTsKKwogcHJvdGVjdGVkOgog ICAgIFNjcm9sbGJhcihTY3JvbGxhYmxlQXJlYSosIFNjcm9sbGJhck9yaWVudGF0aW9uLCBTY3Jv bGxiYXJDb250cm9sU2l6ZSwgU2Nyb2xsYmFyVGhlbWUqID0gMCk7CiAKQEAgLTE0Miw4ICsxMzcs NiBAQCBwcm90ZWN0ZWQ6CiAgICAgU2Nyb2xsRGlyZWN0aW9uIHByZXNzZWRQYXJ0U2Nyb2xsRGly ZWN0aW9uKCk7CiAgICAgU2Nyb2xsR3JhbnVsYXJpdHkgcHJlc3NlZFBhcnRTY3JvbGxHcmFudWxh cml0eSgpOwogICAgIAotICAgIHZvaWQgbW92ZVRodW1iKGludCBwb3MsIGJvb2wgZHJhZ2dpbmdE b2N1bWVudCA9IGZhbHNlKTsKLQogICAgIFNjcm9sbGFibGVBcmVhKiBtX3Njcm9sbGFibGVBcmVh OwogICAgIFNjcm9sbGJhck9yaWVudGF0aW9uIG1fb3JpZW50YXRpb247CiAgICAgU2Nyb2xsYmFy Q29udHJvbFNpemUgbV9jb250cm9sU2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3F0L1Njcm9sbGJhclF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Nj cm9sbGJhclF0LmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTkwZjA4ZGE5ODhi MDFhZGY2ZTczOTRlZjlmNDNiNTcxYWYyOGExYy4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJR dC5jcHAKKysrIC9kZXYvbnVsbApAQCAtMSwxMDIgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAo QykgMjAwNywgMjAwOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmln aHQgKEMpIDIwMDcgU3RhaWtvcyBDb21wdXRpbmcgU2VydmljZXMgSW5jLiA8aW5mb0BzdGFpa29z Lm5ldD4KLSAqIENvcHlyaWdodCAoQykgMjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRz IHN1YnNpZGlhcnkoLWllcykKLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJl IG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRI RQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAotICogRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAotICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAi U2Nyb2xsYmFyLmgiCi0KLSNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKLSNpbmNsdWRlICJGcmFt ZS5oIgotI2luY2x1ZGUgIkZyYW1lVmlldy5oIgotI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5o IgotI2luY2x1ZGUgIkludFJlY3QuaCIKLSNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIK LSNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5oIgotI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgi Ci0KLSNpbmNsdWRlIDxRQXBwbGljYXRpb24+Ci0jaW5jbHVkZSA8UURlYnVnPgotI2luY2x1ZGUg PFFNZW51PgotI2luY2x1ZGUgPFFQYWludGVyPgotI2luY2x1ZGUgPFFTdHlsZT4KLQotdXNpbmcg bmFtZXNwYWNlIHN0ZDsKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1ib29sIFNjcm9sbGJhcjo6 Y29udGV4dE1lbnUoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkKLXsKLSNpZm5kZWYg UVRfTk9fQ09OVEVYVE1FTlUKLSAgICBpZiAoIVFBcHBsaWNhdGlvbjo6c3R5bGUoKS0+c3R5bGVI aW50KFFTdHlsZTo6U0hfU2Nyb2xsQmFyX0NvbnRleHRNZW51KSkKLSAgICAgICAgcmV0dXJuIHRy dWU7Ci0KLSAgICBib29sIGhvcml6b250YWwgPSAobV9vcmllbnRhdGlvbiA9PSBIb3Jpem9udGFs U2Nyb2xsYmFyKTsKLQotICAgIFFNZW51IG1lbnU7Ci0gICAgUUFjdGlvbiogYWN0U2Nyb2xsSGVy ZSA9IG1lbnUuYWRkQWN0aW9uKFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2Ui LCAiU2Nyb2xsIGhlcmUiKSk7Ci0gICAgbWVudS5hZGRTZXBhcmF0b3IoKTsKLQotICAgIFFBY3Rp b24qIGFjdFNjcm9sbFRvcCA9IG1lbnUuYWRkQWN0aW9uKGhvcml6b250YWwgPyBRQ29yZUFwcGxp Y2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIkxlZnQgZWRnZSIpIDogUUNvcmVBcHBsaWNh dGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJUb3AiKSk7Ci0gICAgUUFjdGlvbiogYWN0U2Ny b2xsQm90dG9tID0gbWVudS5hZGRBY3Rpb24oaG9yaXpvbnRhbCA/IFFDb3JlQXBwbGljYXRpb246 OnRyYW5zbGF0ZSgiUVdlYlBhZ2UiLCAiUmlnaHQgZWRnZSIpIDogUUNvcmVBcHBsaWNhdGlvbjo6 dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJCb3R0b20iKSk7Ci0gICAgbWVudS5hZGRTZXBhcmF0b3Io KTsKLQotICAgIFFBY3Rpb24qIGFjdFBhZ2VVcCA9IG1lbnUuYWRkQWN0aW9uKGhvcml6b250YWwg PyBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIlBhZ2UgbGVmdCIpIDog UUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJQYWdlIHVwIikpOwotICAg IFFBY3Rpb24qIGFjdFBhZ2VEb3duID0gbWVudS5hZGRBY3Rpb24oaG9yaXpvbnRhbCA/IFFDb3Jl QXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2UiLCAiUGFnZSByaWdodCIpIDogUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJQYWdlIGRvd24iKSk7Ci0gICAgbWVu dS5hZGRTZXBhcmF0b3IoKTsKLQotICAgIFFBY3Rpb24qIGFjdFNjcm9sbFVwID0gbWVudS5hZGRB Y3Rpb24oaG9yaXpvbnRhbCA/IFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2Ui LCAiU2Nyb2xsIGxlZnQiKSA6IFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2Ui LCAiU2Nyb2xsIHVwIikpOwotICAgIFFBY3Rpb24qIGFjdFNjcm9sbERvd24gPSBtZW51LmFkZEFj dGlvbihob3Jpem9udGFsID8gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIs ICJTY3JvbGwgcmlnaHQiKSA6IFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2Ui LCAiU2Nyb2xsIGRvd24iKSk7Ci0KLSAgICBjb25zdCBRUG9pbnQgZ2xvYmFsUG9zID0gUVBvaW50 KGV2ZW50Lmdsb2JhbFBvc2l0aW9uKCkueCgpLCBldmVudC5nbG9iYWxQb3NpdGlvbigpLnkoKSk7 Ci0gICAgUUFjdGlvbiogYWN0aW9uU2VsZWN0ZWQgPSBtZW51LmV4ZWMoZ2xvYmFsUG9zKTsKLQot ICAgIGlmIChhY3Rpb25TZWxlY3RlZCA9PSBhY3RTY3JvbGxIZXJlKSB7Ci0gICAgICAgIC8vIFNl dCB0aGUgcHJlc3NlZCBwb3NpdGlvbiB0byB0aGUgbWlkZGxlIG9mIHRoZSB0aHVtYiBzbyB0aGF0 IHdoZW4gd2UgCi0gICAgICAgIC8vIGRvIG1vdmUsIHRoZSBkZWx0YSB3aWxsIGJlIGZyb20gdGhl IGN1cnJlbnQgcGl4ZWwgcG9zaXRpb24gb2YgdGhlCi0gICAgICAgIC8vIHRodW1iIHRvIHRoZSBu ZXcgcG9zaXRpb24KLSAgICAgICAgaW50IHBvc2l0aW9uID0gdGhlbWUoKS0+dHJhY2tQb3NpdGlv bih0aGlzKSArIHRoZW1lKCktPnRodW1iUG9zaXRpb24odGhpcykgKyB0aGVtZSgpLT50aHVtYkxl bmd0aCh0aGlzKSAvIDI7Ci0gICAgICAgIHNldFByZXNzZWRQb3MocG9zaXRpb24pOyAKLSAgICAg ICAgY29uc3QgUVBvaW50IHBvcyA9IGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyhldmVudC5w b3NpdGlvbigpKTsKLSAgICAgICAgbW92ZVRodW1iKGhvcml6b250YWwgPyBwb3MueCgpIDogcG9z LnkoKSk7Ci0gICAgfSBlbHNlIGlmIChhY3Rpb25TZWxlY3RlZCA9PSBhY3RTY3JvbGxUb3ApCi0g ICAgICAgIHNjcm9sbGFibGVBcmVhKCktPnNjcm9sbChob3Jpem9udGFsID8gU2Nyb2xsTGVmdCA6 IFNjcm9sbFVwLCBTY3JvbGxCeURvY3VtZW50KTsKLSAgICBlbHNlIGlmIChhY3Rpb25TZWxlY3Rl ZCA9PSBhY3RTY3JvbGxCb3R0b20pCi0gICAgICAgIHNjcm9sbGFibGVBcmVhKCktPnNjcm9sbCho b3Jpem9udGFsID8gU2Nyb2xsUmlnaHQgOiBTY3JvbGxEb3duLCBTY3JvbGxCeURvY3VtZW50KTsK LSAgICBlbHNlIGlmIChhY3Rpb25TZWxlY3RlZCA9PSBhY3RQYWdlVXApCi0gICAgICAgIHNjcm9s bGFibGVBcmVhKCktPnNjcm9sbChob3Jpem9udGFsID8gU2Nyb2xsTGVmdCA6IFNjcm9sbFVwLCBT Y3JvbGxCeVBhZ2UpOwotICAgIGVsc2UgaWYgKGFjdGlvblNlbGVjdGVkID09IGFjdFBhZ2VEb3du KQotICAgICAgICBzY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGwoaG9yaXpvbnRhbCA/IFNjcm9sbFJp Z2h0IDogU2Nyb2xsRG93biwgU2Nyb2xsQnlQYWdlKTsKLSAgICBlbHNlIGlmIChhY3Rpb25TZWxl Y3RlZCA9PSBhY3RTY3JvbGxVcCkKLSAgICAgICAgc2Nyb2xsYWJsZUFyZWEoKS0+c2Nyb2xsKGhv cml6b250YWwgPyBTY3JvbGxMZWZ0IDogU2Nyb2xsVXAsIFNjcm9sbEJ5TGluZSk7Ci0gICAgZWxz ZSBpZiAoYWN0aW9uU2VsZWN0ZWQgPT0gYWN0U2Nyb2xsRG93bikKLSAgICAgICAgc2Nyb2xsYWJs ZUFyZWEoKS0+c2Nyb2xsKGhvcml6b250YWwgPyBTY3JvbGxSaWdodCA6IFNjcm9sbERvd24sIFNj cm9sbEJ5TGluZSk7Ci0jZW5kaWYgLy8gUVRfTk9fQ09OVEVYVE1FTlUKLSAgICByZXR1cm4gdHJ1 ZTsKLX0KLQotfQotCi0vLyB2aW06IHRzPTQgc3c9NCBldApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwCmluZGV4IDViMjRiMTc4NGM0Y2ZjOTYwZGU2NmRiMDkxMzVkZTA0NzU0MWViYjUuLmUwZGM3 NzhjMjQwNGNiN2Q5N2IwNDM0NTFlNzk4ODUxNWExMmE4MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vi cGFnZS5jcHAKQEAgLTEwNSw2ICsxMDUsNyBAQAogI2luY2x1ZGUgIlJlbmRlclRoZW1lUXQuaCIK ICNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgorI2lu Y2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNp bmNsdWRlICJTZXR0aW5ncy5oIgogI2lmIGRlZmluZWQgUV9PU19XSU4zMgpAQCAtMzIyNCw2ICsz MjI1LDU1IEBAIFFXZWJQYWdlOjpMaW5rRGVsZWdhdGlvblBvbGljeSBRV2ViUGFnZTo6bGlua0Rl bGVnYXRpb25Qb2xpY3koKSBjb25zdAogfQogCiAjaWZuZGVmIFFUX05PX0NPTlRFWFRNRU5VCisK K3N0YXRpYyBib29sIGhhbmRsZVNjcm9sbGJhckNvbnRleHRNZW51RXZlbnQoU2Nyb2xsYmFyKiBz Y3JvbGxCYXIsIFFDb250ZXh0TWVudUV2ZW50KiBldmVudCkKK3sKKyAgICBpZiAoIVFBcHBsaWNh dGlvbjo6c3R5bGUoKS0+c3R5bGVIaW50KFFTdHlsZTo6U0hfU2Nyb2xsQmFyX0NvbnRleHRNZW51 KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBib29sIGhvcml6b250YWwgPSAoc2Nyb2xs QmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpOworCisgICAgUU1lbnUg bWVudTsKKyAgICBRQWN0aW9uKiBhY3RTY3JvbGxIZXJlID0gbWVudS5hZGRBY3Rpb24oUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJTY3JvbGwgaGVyZSIpKTsKKyAgICBt ZW51LmFkZFNlcGFyYXRvcigpOworCisgICAgUUFjdGlvbiogYWN0U2Nyb2xsVG9wID0gbWVudS5h ZGRBY3Rpb24oaG9yaXpvbnRhbCA/IFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBh Z2UiLCAiTGVmdCBlZGdlIikgOiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdl IiwgIlRvcCIpKTsKKyAgICBRQWN0aW9uKiBhY3RTY3JvbGxCb3R0b20gPSBtZW51LmFkZEFjdGlv bihob3Jpem9udGFsID8gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJS aWdodCBlZGdlIikgOiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIkJv dHRvbSIpKTsKKyAgICBtZW51LmFkZFNlcGFyYXRvcigpOworCisgICAgUUFjdGlvbiogYWN0UGFn ZVVwID0gbWVudS5hZGRBY3Rpb24oaG9yaXpvbnRhbCA/IFFDb3JlQXBwbGljYXRpb246OnRyYW5z bGF0ZSgiUVdlYlBhZ2UiLCAiUGFnZSBsZWZ0IikgOiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xh dGUoIlFXZWJQYWdlIiwgIlBhZ2UgdXAiKSk7CisgICAgUUFjdGlvbiogYWN0UGFnZURvd24gPSBt ZW51LmFkZEFjdGlvbihob3Jpem9udGFsID8gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJR V2ViUGFnZSIsICJQYWdlIHJpZ2h0IikgOiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFX ZWJQYWdlIiwgIlBhZ2UgZG93biIpKTsKKyAgICBtZW51LmFkZFNlcGFyYXRvcigpOworCisgICAg UUFjdGlvbiogYWN0U2Nyb2xsVXAgPSBtZW51LmFkZEFjdGlvbihob3Jpem9udGFsID8gUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJTY3JvbGwgbGVmdCIpIDogUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJTY3JvbGwgdXAiKSk7CisgICAgUUFj dGlvbiogYWN0U2Nyb2xsRG93biA9IG1lbnUuYWRkQWN0aW9uKGhvcml6b250YWwgPyBRQ29yZUFw cGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIlNjcm9sbCByaWdodCIpIDogUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJTY3JvbGwgZG93biIpKTsKKworICAg IFFBY3Rpb24qIGFjdGlvblNlbGVjdGVkID0gbWVudS5leGVjKGV2ZW50LT5nbG9iYWxQb3MoKSk7 CisKKyAgICBpZiAoYWN0aW9uU2VsZWN0ZWQgPT0gYWN0U2Nyb2xsSGVyZSkgeworICAgICAgICBT Y3JvbGxiYXJUaGVtZSogdGhlbWUgPSBzY3JvbGxCYXItPnRoZW1lKCk7CisgICAgICAgIC8vIFNl dCB0aGUgcHJlc3NlZCBwb3NpdGlvbiB0byB0aGUgbWlkZGxlIG9mIHRoZSB0aHVtYiBzbyB0aGF0 IHdoZW4gd2UKKyAgICAgICAgLy8gZG8gbW92ZSwgdGhlIGRlbHRhIHdpbGwgYmUgZnJvbSB0aGUg Y3VycmVudCBwaXhlbCBwb3NpdGlvbiBvZiB0aGUKKyAgICAgICAgLy8gdGh1bWIgdG8gdGhlIG5l dyBwb3NpdGlvbgorICAgICAgICBpbnQgcG9zaXRpb24gPSB0aGVtZS0+dHJhY2tQb3NpdGlvbihz Y3JvbGxCYXIpICsgdGhlbWUtPnRodW1iUG9zaXRpb24oc2Nyb2xsQmFyKSArIHRoZW1lLT50aHVt Ykxlbmd0aChzY3JvbGxCYXIpIC8gMjsKKyAgICAgICAgc2Nyb2xsQmFyLT5zZXRQcmVzc2VkUG9z KHBvc2l0aW9uKTsKKyAgICAgICAgY29uc3QgUVBvaW50IHBvcyA9IHNjcm9sbEJhci0+Y29udmVy dEZyb21Db250YWluaW5nV2luZG93KGV2ZW50LT5wb3MoKSk7CisgICAgICAgIHNjcm9sbEJhci0+ bW92ZVRodW1iKGhvcml6b250YWwgPyBwb3MueCgpIDogcG9zLnkoKSk7CisgICAgfSBlbHNlIGlm IChhY3Rpb25TZWxlY3RlZCA9PSBhY3RTY3JvbGxUb3ApCisgICAgICAgIHNjcm9sbEJhci0+c2Ny b2xsYWJsZUFyZWEoKS0+c2Nyb2xsKGhvcml6b250YWwgPyBTY3JvbGxMZWZ0IDogU2Nyb2xsVXAs IFNjcm9sbEJ5RG9jdW1lbnQpOworICAgIGVsc2UgaWYgKGFjdGlvblNlbGVjdGVkID09IGFjdFNj cm9sbEJvdHRvbSkKKyAgICAgICAgc2Nyb2xsQmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGwo aG9yaXpvbnRhbCA/IFNjcm9sbFJpZ2h0IDogU2Nyb2xsRG93biwgU2Nyb2xsQnlEb2N1bWVudCk7 CisgICAgZWxzZSBpZiAoYWN0aW9uU2VsZWN0ZWQgPT0gYWN0UGFnZVVwKQorICAgICAgICBzY3Jv bGxCYXItPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbChob3Jpem9udGFsID8gU2Nyb2xsTGVmdCA6 IFNjcm9sbFVwLCBTY3JvbGxCeVBhZ2UpOworICAgIGVsc2UgaWYgKGFjdGlvblNlbGVjdGVkID09 IGFjdFBhZ2VEb3duKQorICAgICAgICBzY3JvbGxCYXItPnNjcm9sbGFibGVBcmVhKCktPnNjcm9s bChob3Jpem9udGFsID8gU2Nyb2xsUmlnaHQgOiBTY3JvbGxEb3duLCBTY3JvbGxCeVBhZ2UpOwor ICAgIGVsc2UgaWYgKGFjdGlvblNlbGVjdGVkID09IGFjdFNjcm9sbFVwKQorICAgICAgICBzY3Jv bGxCYXItPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbChob3Jpem9udGFsID8gU2Nyb2xsTGVmdCA6 IFNjcm9sbFVwLCBTY3JvbGxCeUxpbmUpOworICAgIGVsc2UgaWYgKGFjdGlvblNlbGVjdGVkID09 IGFjdFNjcm9sbERvd24pCisgICAgICAgIHNjcm9sbEJhci0+c2Nyb2xsYWJsZUFyZWEoKS0+c2Ny b2xsKGhvcml6b250YWwgPyBTY3JvbGxSaWdodCA6IFNjcm9sbERvd24sIFNjcm9sbEJ5TGluZSk7 CisgICAgcmV0dXJuIHRydWU7Cit9CisKIC8qIQogICAgIEZpbHRlcnMgdGhlIGNvbnRleHQgbWVu dSBldmVudCwgXGEgZXZlbnQsIHRocm91Z2ggaGFuZGxlcnMgZm9yIHNjcm9sbGJhcnMgYW5kCiAg ICAgY3VzdG9tIGV2ZW50IGhhbmRsZXJzIGluIHRoZSB3ZWIgcGFnZS4gUmV0dXJucyB0cnVlIGlm IHRoZSBldmVudCB3YXMgaGFuZGxlZDsKQEAgLTMyNDIsNyArMzI5Miw3IEBAIGJvb2wgUVdlYlBh Z2U6OnN3YWxsb3dDb250ZXh0TWVudUV2ZW50KFFDb250ZXh0TWVudUV2ZW50ICpldmVudCkKICAg ICAgICAgaWYgKFFXZWJGcmFtZSogd2ViRnJhbWUgPSBmcmFtZUF0KGV2ZW50LT5wb3MoKSkpIHsK ICAgICAgICAgICAgIEZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUod2ViRnJh bWUpOwogICAgICAgICAgICAgaWYgKFNjcm9sbGJhciogc2Nyb2xsYmFyID0gZnJhbWUtPnZpZXco KS0+c2Nyb2xsYmFyQXRQb2ludChjb252ZXJ0TW91c2VFdmVudChldmVudCwgMSkucG9zaXRpb24o KSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+Y29udGV4dE1lbnUoY29udmVy dE1vdXNlRXZlbnQoZXZlbnQsIDEpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gaGFuZGxlU2Ny b2xsYmFyQ29udGV4dE1lbnVFdmVudChzY3JvbGxiYXIsIGV2ZW50KTsKICAgICAgICAgfQogICAg IH0KICNlbmRpZgo=