71219 2011-10-31 05:37:04 -0700 [Qt] Make QWebPreferences hold a QtWebPageProxy 2011-10-31 06:51:41 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 cmarcelo cmarcelo menard webkit.review.bot zoltan oldest_to_newest 493263 0 cmarcelo 2011-10-31 05:37:04 -0700 Currently it holds a WKPreferencesRef, but in the future we will have features in our port that are not controlled by this C API. Changing it to hold a QtWebPageProxy is more flexible. 493271 1 113043 cmarcelo 2011-10-31 06:16:26 -0700 Created attachment 113043 Patch 493272 2 113043 menard 2011-10-31 06:24:20 -0700 Comment on attachment 113043 Patch I think it's a good thing. At some point we will have to add APIs that are not in the C API but still public. 493278 3 113043 kling 2011-10-31 06:31:59 -0700 Comment on attachment 113043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113043&action=review Great idea, r=me! > Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp:108 > - , m_preferences(0) > + , m_preferences() Remove this line completely. 493289 4 cmarcelo 2011-10-31 06:51:41 -0700 Committed r98851: <http://trac.webkit.org/changeset/98851> 113043 2011-10-31 06:16:26 -0700 2011-10-31 06:31:59 -0700 Patch bug-71219-20111031141624.patch text/plain 15449 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTg4NDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1MmJhNGM1ZTRiMjE3NWU1 NmFlNGI1MDI1NGQxY2Q5MTQ5MzEzNmY2Li5hZGUxYjQyYjdkY2M5ZjI1MDU0YzVmYjc1OGI0MWRl Y2E0YTIwYjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMTAtMzEgIENhaW8g TWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4K KworICAgICAgICBbUXRdIE1ha2UgUVdlYlByZWZlcmVuY2VzIGhvbGQgYSBRdFdlYlBhZ2VQcm94 eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEyMTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2Ug UVdlYlByZWZlcmVuY2VzIHRvIGtlZXAgYSBwb2ludGVyIHRvIFF0V2ViUGFnZVByb3h5LiAgVGhl IHJlYXNvbiBpcyB0aGF0CisgICAgICAgIHNvbWUgZmVhdHVyZXMgd2Ugd2FudCB0byBjb250cm9s IChsaWtlIHRoZSBtZXNzYWdpbmcgZXhjaGFuZ2UgYmV0d2VlbiBXZWJWaWV3IGFuZAorICAgICAg ICB0aGUgd2ViIHByb2Nlc3MpIGFyZSBub3QgYXZhaWxhYmxlIHZpYSBXS1ByZWZlcmVuY2VzUmVm LgorCisgICAgICAgIFF0V2ViUGFnZVByb3h5IG5vdyB1c2VzIGFuIE93blB0ciB0byBrZWVwIHRo ZSBRV2ViUHJlZmVyZW5jZXMgdG8gY2xhcmlmeSB0aGUKKyAgICAgICAgb3duZXJzaGlwIHJlbGF0 aW9uc2hpcC4gQmVmb3JlIHRoaXMgY2hhbmdlIHRoZSBRV2ViUHJlZmVyZW5jZXMgY3JlYXRlZCB3 YXMgbGVha2luZy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2Vz LmNwcDoKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVByZWZlcmVuY2Vz KToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnRlc3RBdHRyaWJ1dGUpOgorICAg ICAgICAoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6c2V0QXR0cmlidXRlKToKKyAgICAgICAgKFFX ZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnNldEZvbnRGYW1pbHkpOgorICAgICAgICAoUVdlYlByZWZl cmVuY2VzUHJpdmF0ZTo6Zm9udEZhbWlseSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2 YXRlOjpzZXRGb250U2l6ZSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpmb250 U2l6ZSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpwcmVmZXJlbmNlc1JlZik6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wLmg6CisgICAgICAgICogVUlQcm9j ZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjpRdFdl YlBhZ2VQcm94eSk6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6cHJlZmVyZW5jZXMpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oOgorCiAyMDExLTEwLTI4ICBKZWZm IE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3JlIHdvcmsgb24gV2ViS2l0 MiBzaG91bGQgcmVzcGVjdCBXZWJLaXRPbWl0UERGU3VwcG9ydCBwcmVmZXJlbmNlIG9uIHRoZSBN YWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZl cmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVu Y2VzLmNwcAppbmRleCBjMGJhMjFkMDE3NjllOWFmN2RhYzczZmI4YmQzMDU0MzBmNjg2OWM5Li4y MmRhZTU0ZTJiZDFiNGUyYjhmOWZkNjI1ODc3ZTE4MTFkMmU5MzFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlcy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3BwCkBAIC0yMCw2 ICsyMCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicXdlYnByZWZlcmVuY2Vz LmgiCiAKKyNpbmNsdWRlICJRdFdlYlBhZ2VQcm94eS5oIgogI2luY2x1ZGUgIldLUGFnZUdyb3Vw LmgiCiAjaW5jbHVkZSAiV0tQcmVmZXJlbmNlcy5oIgogI2luY2x1ZGUgIldLUHJlZmVyZW5jZXNQ cml2YXRlLmgiCkBAIC0yNywxMCArMjgsMTAgQEAKICNpbmNsdWRlICJXS1N0cmluZ1F0LmgiCiAj aW5jbHVkZSAicXdlYnByZWZlcmVuY2VzX3AuaCIKIAotUVdlYlByZWZlcmVuY2VzKiBRV2ViUHJl ZmVyZW5jZXNQcml2YXRlOjpjcmVhdGVQcmVmZXJlbmNlcyhXS1BhZ2VHcm91cFJlZiBwYWdlR3Jv dXBSZWYpCitRV2ViUHJlZmVyZW5jZXMqIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVBy ZWZlcmVuY2VzKFF0V2ViUGFnZVByb3h5KiBxdFdlYlBhZ2VQcm94eSkKIHsKICAgICBRV2ViUHJl ZmVyZW5jZXMqIHByZWZzID0gbmV3IFFXZWJQcmVmZXJlbmNlczsKLSAgICBwcmVmcy0+ZC0+cmVm ID0gV0tQYWdlR3JvdXBHZXRQcmVmZXJlbmNlcyhwYWdlR3JvdXBSZWYpOworICAgIHByZWZzLT5k LT5xdFdlYlBhZ2VQcm94eSA9IHF0V2ViUGFnZVByb3h5OwogICAgIHJldHVybiBwcmVmczsKIH0K IApAQCAtMzgsMjMgKzM5LDIzIEBAIGJvb2wgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6dGVzdEF0 dHJpYnV0ZShRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpXZWJBdHRyaWJ1dGUKIHsKICAgICBzd2l0 Y2ggKGF0dHIpIHsKICAgICBjYXNlIEF1dG9Mb2FkSW1hZ2VzOgotICAgICAgICByZXR1cm4gV0tQ cmVmZXJlbmNlc0dldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShyZWYpOworICAgICAgICByZXR1 cm4gV0tQcmVmZXJlbmNlc0dldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShwcmVmZXJlbmNlc1Jl ZigpKTsKICAgICBjYXNlIEphdmFzY3JpcHRFbmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVm ZXJlbmNlc0dldEphdmFTY3JpcHRFbmFibGVkKHJlZik7CisgICAgICAgIHJldHVybiBXS1ByZWZl cmVuY2VzR2V0SmF2YVNjcmlwdEVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CiAgICAgY2FzZSBQ bHVnaW5zRW5hYmxlZDoKLSAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRQbHVnaW5zRW5h YmxlZChyZWYpOworICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFBsdWdpbnNFbmFibGVk KHByZWZlcmVuY2VzUmVmKCkpOwogICAgIGNhc2UgT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVF bmFibGVkOgotICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldE9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlRW5hYmxlZChyZWYpOworICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldE9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpKTsKICAgICBj YXNlIExvY2FsU3RvcmFnZUVuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0 TG9jYWxTdG9yYWdlRW5hYmxlZChyZWYpOworICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dl dExvY2FsU3RvcmFnZUVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CiAgICAgY2FzZSBYU1NBdWRp dGluZ0VuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0WFNTQXVkaXRvckVu YWJsZWQocmVmKTsKKyAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRYU1NBdWRpdG9yRW5h YmxlZChwcmVmZXJlbmNlc1JlZigpKTsKICAgICBjYXNlIFByaXZhdGVCcm93c2luZ0VuYWJsZWQ6 Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChy ZWYpOworICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFByaXZhdGVCcm93c2luZ0VuYWJs ZWQocHJlZmVyZW5jZXNSZWYoKSk7CiAgICAgY2FzZSBEbnNQcmVmZXRjaEVuYWJsZWQ6Ci0gICAg ICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0RE5TUHJlZmV0Y2hpbmdFbmFibGVkKHJlZik7Cisg ICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0RE5TUHJlZmV0Y2hpbmdFbmFibGVkKHByZWZl cmVuY2VzUmVmKCkpOwogICAgIGNhc2UgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQ6Ci0g ICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQocmVmKTsKKyAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRBY2NlbGVyYXRlZENvbXBv c2l0aW5nRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpKTsKICAgICBkZWZhdWx0OgogICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNjUsMzEgKzY2 LDMxIEBAIHZvaWQgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6c2V0QXR0cmlidXRlKFFXZWJQcmVm ZXJlbmNlc1ByaXZhdGU6OldlYkF0dHJpYnV0ZSBhCiB7CiAgICAgc3dpdGNoIChhdHRyKSB7CiAg ICAgY2FzZSBBdXRvTG9hZEltYWdlczoKLSAgICAgICAgV0tQcmVmZXJlbmNlc1NldExvYWRzSW1h Z2VzQXV0b21hdGljYWxseShyZWYsIGVuYWJsZSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRM b2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBKYXZhc2NyaXB0RW5hYmxlZDoKLSAgICAgICAgV0tQcmVmZXJl bmNlc1NldEphdmFTY3JpcHRFbmFibGVkKHJlZiwgZW5hYmxlKTsKKyAgICAgICAgV0tQcmVmZXJl bmNlc1NldEphdmFTY3JpcHRFbmFibGVkKHByZWZlcmVuY2VzUmVmKCksIGVuYWJsZSk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgUGx1Z2luc0VuYWJsZWQ6Ci0gICAgICAgIFdLUHJlZmVyZW5j ZXNTZXRQbHVnaW5zRW5hYmxlZChyZWYsIGVuYWJsZSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNT ZXRQbHVnaW5zRW5hYmxlZChwcmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOwogICAgICAgICBicmVh azsKICAgICBjYXNlIE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZDoKLSAgICAgICAg V0tQcmVmZXJlbmNlc1NldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChyZWYsIGVu YWJsZSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNo ZUVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBMb2NhbFN0b3JhZ2VFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0TG9jYWxT dG9yYWdlRW5hYmxlZChyZWYsIGVuYWJsZSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRMb2Nh bFN0b3JhZ2VFbmFibGVkKHByZWZlcmVuY2VzUmVmKCksIGVuYWJsZSk7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgWFNTQXVkaXRpbmdFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0 WFNTQXVkaXRvckVuYWJsZWQocmVmLCBlbmFibGUpOworICAgICAgICBXS1ByZWZlcmVuY2VzU2V0 WFNTQXVkaXRvckVuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBQcml2YXRlQnJvd3NpbmdFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVu Y2VzU2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChyZWYsIGVuYWJsZSk7CisgICAgICAgIFdLUHJl ZmVyZW5jZXNTZXRQcml2YXRlQnJvd3NpbmdFbmFibGVkKHByZWZlcmVuY2VzUmVmKCksIGVuYWJs ZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRG5zUHJlZmV0Y2hFbmFibGVkOgotICAgICAg ICBXS1ByZWZlcmVuY2VzU2V0RE5TUHJlZmV0Y2hpbmdFbmFibGVkKHJlZiwgZW5hYmxlKTsKKyAg ICAgICAgV0tQcmVmZXJlbmNlc1NldEROU1ByZWZldGNoaW5nRW5hYmxlZChwcmVmZXJlbmNlc1Jl ZigpLCBlbmFibGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ0VuYWJsZWQocmVmLCBlbmFibGUpOworICAgICAgICBXS1ByZWZlcmVuY2VzU2V0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKICAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBA IC0xMDAsMjIgKzEwMSwyMiBAQCB2b2lkIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnNldEZvbnRG YW1pbHkoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6Rm9udEZhbWlseSB3aAogewogICAgIHN3aXRj aCAod2hpY2gpIHsKICAgICBjYXNlIFN0YW5kYXJkRm9udDoKLSAgICAgICAgV0tQcmVmZXJlbmNl c1NldFN0YW5kYXJkRm9udEZhbWlseShyZWYsIFdLU3RyaW5nQ3JlYXRlV2l0aFFTdHJpbmcoZmFt aWx5KSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRTdGFuZGFyZEZvbnRGYW1pbHkocHJlZmVy ZW5jZXNSZWYoKSwgV0tTdHJpbmdDcmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBGaXhlZEZvbnQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRGaXhl ZEZvbnRGYW1pbHkocmVmLCBXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKGZhbWlseSkpOworICAg ICAgICBXS1ByZWZlcmVuY2VzU2V0Rml4ZWRGb250RmFtaWx5KHByZWZlcmVuY2VzUmVmKCksIFdL U3RyaW5nQ3JlYXRlV2l0aFFTdHJpbmcoZmFtaWx5KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgU2VyaWZGb250OgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0U2VyaWZGb250RmFtaWx5KHJl ZiwgV0tTdHJpbmdDcmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKKyAgICAgICAgV0tQcmVmZXJl bmNlc1NldFNlcmlmRm9udEZhbWlseShwcmVmZXJlbmNlc1JlZigpLCBXS1N0cmluZ0NyZWF0ZVdp dGhRU3RyaW5nKGZhbWlseSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFNhbnNTZXJpZkZv bnQ6Ci0gICAgICAgIFdLUHJlZmVyZW5jZXNTZXRTYW5zU2VyaWZGb250RmFtaWx5KHJlZiwgV0tT dHJpbmdDcmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKKyAgICAgICAgV0tQcmVmZXJlbmNlc1Nl dFNhbnNTZXJpZkZvbnRGYW1pbHkocHJlZmVyZW5jZXNSZWYoKSwgV0tTdHJpbmdDcmVhdGVXaXRo UVN0cmluZyhmYW1pbHkpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzaXZlRm9udDoK LSAgICAgICAgV0tQcmVmZXJlbmNlc1NldEN1cnNpdmVGb250RmFtaWx5KHJlZiwgV0tTdHJpbmdD cmVhdGVXaXRoUVN0cmluZyhmYW1pbHkpKTsKKyAgICAgICAgV0tQcmVmZXJlbmNlc1NldEN1cnNp dmVGb250RmFtaWx5KHByZWZlcmVuY2VzUmVmKCksIFdLU3RyaW5nQ3JlYXRlV2l0aFFTdHJpbmco ZmFtaWx5KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRmFudGFzeUZvbnQ6Ci0gICAgICAg IFdLUHJlZmVyZW5jZXNTZXRGYW50YXN5Rm9udEZhbWlseShyZWYsIFdLU3RyaW5nQ3JlYXRlV2l0 aFFTdHJpbmcoZmFtaWx5KSk7CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRGYW50YXN5Rm9udEZh bWlseShwcmVmZXJlbmNlc1JlZigpLCBXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKGZhbWlseSkp OwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKQEAgLTEyNiwy NyArMTI3LDI3IEBAIFFTdHJpbmcgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6Zm9udEZhbWlseShR V2ViUHJlZmVyZW5jZXNQcml2YXRlOjpGb250RmFtaWx5IHdoCiB7CiAgICAgc3dpdGNoICh3aGlj aCkgewogICAgIGNhc2UgU3RhbmRhcmRGb250OiB7Ci0gICAgICAgIFdLUmV0YWluUHRyPFdLU3Ry aW5nUmVmPiBzdHJpbmdSZWYoQWRvcHRXSywgV0tQcmVmZXJlbmNlc0NvcHlTdGFuZGFyZEZvbnRG YW1pbHkocmVmKSk7CisgICAgICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBzdHJpbmdSZWYo QWRvcHRXSywgV0tQcmVmZXJlbmNlc0NvcHlTdGFuZGFyZEZvbnRGYW1pbHkocHJlZmVyZW5jZXNS ZWYoKSkpOwogICAgICAgICByZXR1cm4gV0tTdHJpbmdDb3B5UVN0cmluZyhzdHJpbmdSZWYuZ2V0 KCkpOwogICAgIH0KICAgICBjYXNlIEZpeGVkRm9udDogewotICAgICAgICBXS1JldGFpblB0cjxX S1N0cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJlZmVyZW5jZXNDb3B5Rml4ZWRGb250 RmFtaWx5KHJlZikpOworICAgICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gc3RyaW5nUmVm KEFkb3B0V0ssIFdLUHJlZmVyZW5jZXNDb3B5Rml4ZWRGb250RmFtaWx5KHByZWZlcmVuY2VzUmVm KCkpKTsKICAgICAgICAgcmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoc3RyaW5nUmVmLmdldCgp KTsKICAgICB9CiAgICAgY2FzZSBTZXJpZkZvbnQ6IHsKLSAgICAgICAgV0tSZXRhaW5QdHI8V0tT dHJpbmdSZWY+IHN0cmluZ1JlZihBZG9wdFdLLCBXS1ByZWZlcmVuY2VzQ29weVNlcmlmRm9udEZh bWlseShyZWYpKTsKKyAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHN0cmluZ1JlZihB ZG9wdFdLLCBXS1ByZWZlcmVuY2VzQ29weVNlcmlmRm9udEZhbWlseShwcmVmZXJlbmNlc1JlZigp KSk7CiAgICAgICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5nKHN0cmluZ1JlZi5nZXQoKSk7 CiAgICAgfQogICAgIGNhc2UgU2Fuc1NlcmlmRm9udDogewotICAgICAgICBXS1JldGFpblB0cjxX S1N0cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJlZmVyZW5jZXNDb3B5U2Fuc1Nlcmlm Rm9udEZhbWlseShyZWYpKTsKKyAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHN0cmlu Z1JlZihBZG9wdFdLLCBXS1ByZWZlcmVuY2VzQ29weVNhbnNTZXJpZkZvbnRGYW1pbHkocHJlZmVy ZW5jZXNSZWYoKSkpOwogICAgICAgICByZXR1cm4gV0tTdHJpbmdDb3B5UVN0cmluZyhzdHJpbmdS ZWYuZ2V0KCkpOwogICAgIH0KICAgICBjYXNlIEN1cnNpdmVGb250OiB7Ci0gICAgICAgIFdLUmV0 YWluUHRyPFdLU3RyaW5nUmVmPiBzdHJpbmdSZWYoQWRvcHRXSywgV0tQcmVmZXJlbmNlc0NvcHlD dXJzaXZlRm9udEZhbWlseShyZWYpKTsKKyAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+ IHN0cmluZ1JlZihBZG9wdFdLLCBXS1ByZWZlcmVuY2VzQ29weUN1cnNpdmVGb250RmFtaWx5KHBy ZWZlcmVuY2VzUmVmKCkpKTsKICAgICAgICAgcmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoc3Ry aW5nUmVmLmdldCgpKTsKICAgICB9CiAgICAgY2FzZSBGYW50YXN5Rm9udDogewotICAgICAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gc3RyaW5nUmVmKEFkb3B0V0ssIFdLUHJlZmVyZW5jZXND b3B5RmFudGFzeUZvbnRGYW1pbHkocmVmKSk7CisgICAgICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiBzdHJpbmdSZWYoQWRvcHRXSywgV0tQcmVmZXJlbmNlc0NvcHlGYW50YXN5Rm9udEZhbWls eShwcmVmZXJlbmNlc1JlZigpKSk7CiAgICAgICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5n KHN0cmluZ1JlZi5nZXQoKSk7CiAgICAgfQogICAgIGRlZmF1bHQ6CkBAIC0xNTgsMTMgKzE1OSwx MyBAQCB2b2lkIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnNldEZvbnRTaXplKFFXZWJQcmVmZXJl bmNlc1ByaXZhdGU6OkZvbnRTaXplVHlwZSB0eQogewogICAgIHN3aXRjaCAodHlwZSkgewogICAg IGNhc2UgTWluaW11bUZvbnRTaXplOgotICAgICAgICAgV0tQcmVmZXJlbmNlc1NldE1pbmltdW1G b250U2l6ZShyZWYsIHNpemUpOworICAgICAgICAgV0tQcmVmZXJlbmNlc1NldE1pbmltdW1Gb250 U2l6ZShwcmVmZXJlbmNlc1JlZigpLCBzaXplKTsKICAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug RGVmYXVsdEZvbnRTaXplOgotICAgICAgICAgV0tQcmVmZXJlbmNlc1NldERlZmF1bHRGb250U2l6 ZShyZWYsIHNpemUpOworICAgICAgICAgV0tQcmVmZXJlbmNlc1NldERlZmF1bHRGb250U2l6ZShw cmVmZXJlbmNlc1JlZigpLCBzaXplKTsKICAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRGVmYXVs dEZpeGVkRm9udFNpemU6Ci0gICAgICAgICBXS1ByZWZlcmVuY2VzU2V0RGVmYXVsdEZpeGVkRm9u dFNpemUocmVmLCBzaXplKTsKKyAgICAgICAgIFdLUHJlZmVyZW5jZXNTZXREZWZhdWx0Rml4ZWRG b250U2l6ZShwcmVmZXJlbmNlc1JlZigpLCBzaXplKTsKICAgICAgICAgIGJyZWFrOwogICAgIGRl ZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtMTc1LDExICsxNzYsMTEg QEAgdW5zaWduZWQgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6Zm9udFNpemUoUVdlYlByZWZlcmVu Y2VzUHJpdmF0ZTo6Rm9udFNpemVUeXBlIHQKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBj YXNlIE1pbmltdW1Gb250U2l6ZToKLSAgICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0TWlu aW11bUZvbnRTaXplKHJlZik7CisgICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldE1pbmlt dW1Gb250U2l6ZShwcmVmZXJlbmNlc1JlZigpKTsKICAgICBjYXNlIERlZmF1bHRGb250U2l6ZToK LSAgICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0RGVmYXVsdEZvbnRTaXplKHJlZik7Cisg ICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldERlZmF1bHRGb250U2l6ZShwcmVmZXJlbmNl c1JlZigpKTsKICAgICBjYXNlIERlZmF1bHRGaXhlZEZvbnRTaXplOgotICAgICAgICAgcmV0dXJu IFdLUHJlZmVyZW5jZXNHZXREZWZhdWx0Rml4ZWRGb250U2l6ZShyZWYpOworICAgICAgICAgcmV0 dXJuIFdLUHJlZmVyZW5jZXNHZXREZWZhdWx0Rml4ZWRGb250U2l6ZShwcmVmZXJlbmNlc1JlZigp KTsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtMzgzLDYgKzM4NCwxMiBAQCB2b2lkIFFXZWJQcmVmZXJlbmNlczo6 c2V0RGVmYXVsdEZpeGVkRm9udFNpemUodW5zaWduZWQgc2l6ZSkKICAgICBlbWl0IGRlZmF1bHRG aXhlZEZvbnRTaXplQ2hhbmdlZCgpOwogfQogCitXS1ByZWZlcmVuY2VzUmVmIFFXZWJQcmVmZXJl bmNlc1ByaXZhdGU6OnByZWZlcmVuY2VzUmVmKCkgY29uc3QKK3sKKyAgICBXS1BhZ2VHcm91cFJl ZiBwYWdlR3JvdXBSZWYgPSBXS1BhZ2VHZXRQYWdlR3JvdXAocXRXZWJQYWdlUHJveHktPnBhZ2VS ZWYoKSk7CisgICAgcmV0dXJuIFdLUGFnZUdyb3VwR2V0UHJlZmVyZW5jZXMocGFnZUdyb3VwUmVm KTsKK30KKwogUVdlYlByZWZlcmVuY2VzUHJpdmF0ZSogUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6 Z2V0KFFXZWJQcmVmZXJlbmNlcyogcHJlZmVyZW5jZXMpCiB7CiAgICAgcmV0dXJuIHByZWZlcmVu Y2VzLT5kOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vi cHJlZmVyZW5jZXMuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZl cmVuY2VzLmgKaW5kZXggMDBkMmMxZWU1ZmI0YmRkNGVjMTY0ZjlkYjMzMWFhMmRjM2U2NzBmMi4u ZTE3ZGJiZWYyYmQwNGEzOTNkMWJmNDY1ZTcwZmNjMjhiYzRmYjM1OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlcy5oCkBAIC0yOSw2ICsy OSw4IEBAIGNsYXNzIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU7CiBjbGFzcyBRV0VCS0lUX0VYUE9S VCBRV2ViUHJlZmVyZW5jZXMgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9PQkpFQ1QKIHB1Ymxp YzoKKyAgICB+UVdlYlByZWZlcmVuY2VzKCk7CisKICAgICBRX1BST1BFUlRZKGJvb2wgYXV0b0xv YWRJbWFnZXMgUkVBRCBhdXRvTG9hZEltYWdlcyBXUklURSBzZXRBdXRvTG9hZEltYWdlcyBOT1RJ RlkgYXV0b0xvYWRJbWFnZXNDaGFuZ2VkIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoYm9vbCBqYXZh c2NyaXB0RW5hYmxlZCBSRUFEIGphdmFzY3JpcHRFbmFibGVkIFdSSVRFIHNldEphdmFzY3JpcHRF bmFibGVkIE5PVElGWSBqYXZhc2NyaXB0RW5hYmxlZENoYW5nZWQgRklOQUwpCiAgICAgUV9QUk9Q RVJUWShib29sIHBsdWdpbnNFbmFibGVkIFJFQUQgcGx1Z2luc0VuYWJsZWQgV1JJVEUgc2V0UGx1 Z2luc0VuYWJsZWQgTk9USUZZIHBsdWdpbnNFbmFibGVkQ2hhbmdlZCBGSU5BTCkKQEAgLTEyNSw3 ICsxMjcsNiBAQCBwcml2YXRlOgogICAgIFFfRElTQUJMRV9DT1BZKFFXZWJQcmVmZXJlbmNlcykK IAogICAgIFFXZWJQcmVmZXJlbmNlcygpOwotICAgIH5RV2ViUHJlZmVyZW5jZXMoKTsKIAogICAg IFFXZWJQcmVmZXJlbmNlc1ByaXZhdGUgKmQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaAppbmRleCBkNTllZmRiOWVmMjk4OTRm MGVhZDgwNDZiOGIzMzA3YWNhOWE0MTI1Li5iZGEyZjRhYWIyNDNiOGMzNTk5NDk3NzA0MDE4ZDgx Y2Y3NzA2NzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJwcmVmZXJlbmNlc19wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VicHJlZmVyZW5jZXNfcC5oCkBAIC0xOSw2ICsxOSw4IEBACiAKICNpbmNsdWRlICJXS1ByZWZl cmVuY2VzLmgiCiAKK2NsYXNzIFF0V2ViUGFnZVByb3h5OworCiBjbGFzcyBRV2ViUHJlZmVyZW5j ZXNQcml2YXRlIHsKIHB1YmxpYzoKIApAQCAtNTAsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgICAg IERlZmF1bHRGaXhlZEZvbnRTaXplCiAgICAgfTsKIAotICAgIHN0YXRpYyBRV2ViUHJlZmVyZW5j ZXMqIGNyZWF0ZVByZWZlcmVuY2VzKFdLUGFnZUdyb3VwUmVmKTsKKyAgICBzdGF0aWMgUVdlYlBy ZWZlcmVuY2VzKiBjcmVhdGVQcmVmZXJlbmNlcyhRdFdlYlBhZ2VQcm94eSopOwogCiAgICAgdm9p ZCBzZXRBdHRyaWJ1dGUoV2ViQXR0cmlidXRlIGF0dHIsIGJvb2wgZW5hYmxlKTsKICAgICBib29s IHRlc3RBdHRyaWJ1dGUoV2ViQXR0cmlidXRlIGF0dHIpIGNvbnN0OwpAQCAtNjEsNyArNjMsOSBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRGb250U2l6ZShGb250U2l6ZVR5cGUgdHlwZSwgdW5zaWdu ZWQgc2l6ZSk7CiAgICAgdW5zaWduZWQgZm9udFNpemUoRm9udFNpemVUeXBlIHR5cGUpIGNvbnN0 OwogCi0gICAgV0tQcmVmZXJlbmNlc1JlZiByZWY7CisgICAgV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlc1JlZigpIGNvbnN0OworCisgICAgUXRXZWJQYWdlUHJveHkqIHF0V2ViUGFnZVByb3h5 OwogCiAgICAgc3RhdGljIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGUqIGdldChRV2ViUHJlZmVyZW5j ZXMqKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5 LmNwcAppbmRleCA2ZmZkODU4MjYxMTdkZjZmMmQxODZlOGQyNjllMzgwNzI3MDQyZjY2Li4yMDRl MDA1ZjBkMjJhOTdjM2RmMTIxOTljNTU1OWQ2ZGU1NzAyNDdiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTIyLDYgKzIyLDcgQEAKICNp bmNsdWRlICJRdFdlYlBhZ2VQcm94eS5oIgogCiAjaW5jbHVkZSAiUXRXZWJFcnJvci5oIgorI2lu Y2x1ZGUgInF3ZWJwcmVmZXJlbmNlcy5oIgogI2luY2x1ZGUgInF3ZWJwcmVmZXJlbmNlc19wLmgi CiAKICNpbmNsdWRlICJDbGllbnRJbXBsLmgiCkBAIC0xMDQsNyArMTA1LDcgQEAgUXRXZWJQYWdl UHJveHk6OlF0V2ViUGFnZVByb3h5KFF0Vmlld0ludGVyZmFjZSogdmlld0ludGVyZmFjZSwgUXRQ b2xpY3lJbnRlcmZhY2UKICAgICA6IG1fdmlld0ludGVyZmFjZSh2aWV3SW50ZXJmYWNlKQogICAg ICwgbV9wb2xpY3lJbnRlcmZhY2UocG9saWN5SW50ZXJmYWNlKQogICAgICwgbV9jb250ZXh0KGNv bnRleHRSZWYgPyB0b0ltcGwoY29udGV4dFJlZikgOiBkZWZhdWx0V0tDb250ZXh0KCkpCi0gICAg LCBtX3ByZWZlcmVuY2VzKDApCisgICAgLCBtX3ByZWZlcmVuY2VzKCkKICAgICAsIG1fdW5kb1N0 YWNrKGFkb3B0UHRyKG5ldyBRVW5kb1N0YWNrKHRoaXMpKSkKICAgICAsIG1fbG9hZFByb2dyZXNz KDApCiB7CkBAIC00NTksMTIgKzQ2MCw5IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OnByb2Nlc3NE aWRDcmFzaCgpCiAKIFFXZWJQcmVmZXJlbmNlcyogUXRXZWJQYWdlUHJveHk6OnByZWZlcmVuY2Vz KCkgY29uc3QKIHsKLSAgICBpZiAoIW1fcHJlZmVyZW5jZXMpIHsKLSAgICAgICAgV0tQYWdlR3Jv dXBSZWYgcGFnZUdyb3VwUmVmID0gV0tQYWdlR2V0UGFnZUdyb3VwKHBhZ2VSZWYoKSk7Ci0gICAg ICAgIG1fcHJlZmVyZW5jZXMgPSBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpjcmVhdGVQcmVmZXJl bmNlcyhwYWdlR3JvdXBSZWYpOwotICAgIH0KLQotICAgIHJldHVybiBtX3ByZWZlcmVuY2VzOwor ICAgIGlmICghbV9wcmVmZXJlbmNlcykKKyAgICAgICAgbV9wcmVmZXJlbmNlcyA9IGFkb3B0UHRy KFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVByZWZlcmVuY2VzKGNvbnN0X2Nhc3Q8UXRX ZWJQYWdlUHJveHkqPih0aGlzKSkpOworICAgIHJldHVybiBtX3ByZWZlcmVuY2VzLmdldCgpOwog fQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpzZXRDdXN0b21Vc2VyQWdlbnQoY29uc3QgUVN0cmlu ZyYgdXNlckFnZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJv eHkuaAppbmRleCAxNGE3ZmZlOTk4OTc1MWIyYzE3ZTFjMjViYTk0YzY5MzM1MjFlNzVmLi4xYWY4 MDBkNTA5NTRjMzMxNGZiODBlZTRkODRmYzlkZTM1ZmExYWMyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaApAQCAtMjAxLDcgKzIwMSw3IEBAIHByaXZh dGU6CiAgICAgUmVmUHRyPFdlYkNvbnRleHQ+IG1fY29udGV4dDsKICAgICBRV0tIaXN0b3J5KiBt X2hpc3Rvcnk7CiAKLSAgICBtdXRhYmxlIFFXZWJQcmVmZXJlbmNlcyogbV9wcmVmZXJlbmNlczsK KyAgICBtdXRhYmxlIE93blB0cjxRV2ViUHJlZmVyZW5jZXM+IG1fcHJlZmVyZW5jZXM7CiAKICAg ICBPd25QdHI8UVVuZG9TdGFjaz4gbV91bmRvU3RhY2s7CiAgICAgaW50IG1fbG9hZFByb2dyZXNz Owo=