102287 2012-11-14 14:40:03 -0800 Refactor ViewportArguments to only use CSS units 2012-11-15 00:25:23 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth tmpsantos oldest_to_newest 767325 0 kenneth 2012-11-14 14:40:03 -0800 SSIA This might take a few patches, but is needed for our css-device-adapt work. 767328 1 174264 kenneth 2012-11-14 14:40:57 -0800 Created attachment 174264 Patch 767329 2 174264 kenneth 2012-11-14 14:41:42 -0800 Comment on attachment 174264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174264&action=review > Source/WebCore/dom/ViewportArguments.cpp:72 > + float resultWidth = width; > + float resultHeight = height; > + float resultZoom = initialScale; > + float resultMinZoom = minimumScale; > + float resultMaxZoom = maximumScale; These follow the names used in the css-device-adapt. Other patches should do the renaming. 767440 3 174264 noam 2012-11-14 16:31:39 -0800 Comment on attachment 174264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174264&action=review > Source/WebCore/dom/ViewportArguments.cpp:46 > +static inline float clampLengthValue(float value) how about clampLengthValueToSpecDefinedRange? Or otherwise mention in a comment that the "magic numbers" come from the spec, and put a link to the spec. 767787 4 kenneth 2012-11-15 00:25:23 -0800 Landed in 134749 174264 2012-11-14 14:40:57 -0800 2012-11-14 16:31:39 -0800 Patch bug-102287-20121114233849.patch text/plain 12931 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc5ZjgyYTQ4MjAzZWIx MmRiZGU5MjA5Zjg1YjRjNDg5NDY4MmFlMS4uYzY4YjA3ZTM0YWU1ZDJhYjBiMzg1YmM3NzMwOWFk ZDZhYzVmOWE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTExLTE0ICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBS ZWZhY3RvciBWaWV3cG9ydEFyZ3VtZW50cyB0byBvbmx5IHVzZSBDU1MgdW5pdHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjI4NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIHRoZSBWaWV3 cG9ydEFyZ3VtZW50IGNvZGUgdG8gdXNlIGEgbWVtYmVyIG1ldGhvZCBmb3IKKyAgICAgICAgcmVz b2x2aW5nIHRoZSB2aWV3cG9ydC4gVGhpcyBuZXcgbWV0aG9kIG9ubHkgdXNlcyBhcmd1bWVudHMg aW4KKyAgICAgICAgQ1NTIHVuaXRzLgorCisgICAgICAgIFRoaXMgaXMgcHJlcGFyYXRpb24gZm9y IGFkZGluZyB0aGUgQ1NTIERldmljZSBBZGFwdGF0aW9uIHN1cHBvcnQuCisKKyAgICAgICAgVGVz dGVkIGJ5IGV4aXN0aW5nIHRlc3RzIGZhc3Qvdmlld3BvcnQuCisKKyAgICAgICAgKiBkb20vVmll d3BvcnRBcmd1bWVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xhbXBMZW5ndGhWYWx1ZSk6 CisgICAgICAgIChXZWJDb3JlOjpjbGFtcFNjYWxlVmFsdWUpOiBOZXcgdXRpbGl0eSBmdW5jdGlv bnMuCisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50czo6cmVzb2x2ZSk6CisgICAg ICAgIChXZWJDb3JlOjpjb252ZXJ0VG9Vc2VyU3BhY2UpOiBBZGRlZCB1bnRpbCBldmVyeW9uZSBw cm92aWRlcyBhcmd1bWVudHMKKyAgICAgICAgb25seSBpbiBDU1MgdW5pdHMgYW5kIG5vdCBkZXZp Y2Ugb25lcy4KKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMpOgor ICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZU1pbmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250 YWluZWQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpyZXN0cmljdE1p bmltdW1TY2FsZUZhY3RvclRvVmlld3BvcnRTaXplKToKKyAgICAgICAgKiBkb20vVmlld3BvcnRB cmd1bWVudHMuaDoKKyAgICAgICAgKFZpZXdwb3J0QXJndW1lbnRzKToKKwogMjAxMi0xMS0xNCAg S2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZC4gUmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3RzIHJlc3VsdHMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcAppbmRleCBhZTE4Nzg5MTk1ZjMzYWY3YzVkMjEyODRk N2FiMDM5MWU3ZjJlYmJjLi42NWE2YTU5ZTIzNDc4NTJlMWNhMTMxMWU4YjBjZTY2YmU3MzVlNTRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAgLTQzLDc4ICs0 Myw4NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IGZsb2F0IFZpZXdwb3J0QXJndW1l bnRzOjpkZXByZWNhdGVkVGFyZ2V0RFBJID0gMTYwOwogCi1WaWV3cG9ydEF0dHJpYnV0ZXMgY29t cHV0ZVZpZXdwb3J0QXR0cmlidXRlcyhWaWV3cG9ydEFyZ3VtZW50cyBhcmdzLCBpbnQgZGVza3Rv cFdpZHRoLCBpbnQgZGV2aWNlV2lkdGgsIGludCBkZXZpY2VIZWlnaHQsIGZsb2F0IGRldmljZVBp eGVsUmF0aW8sIEludFNpemUgdmlzaWJsZVZpZXdwb3J0KQorc3RhdGljIGlubGluZSBmbG9hdCBj bGFtcExlbmd0aFZhbHVlKGZsb2F0IHZhbHVlKQogewotICAgIFZpZXdwb3J0QXR0cmlidXRlcyBy ZXN1bHQ7CisgICAgQVNTRVJUKHZhbHVlICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmlj ZVdpZHRoKTsKKyAgICBBU1NFUlQodmFsdWUgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2 aWNlSGVpZ2h0KTsKIAotICAgIGZsb2F0IGF2YWlsYWJsZVdpZHRoID0gdmlzaWJsZVZpZXdwb3J0 LndpZHRoKCk7Ci0gICAgZmxvYXQgYXZhaWxhYmxlSGVpZ2h0ID0gdmlzaWJsZVZpZXdwb3J0Lmhl aWdodCgpOworICAgIGlmICh2YWx1ZSAhPSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvKQor ICAgICAgICByZXR1cm4gbWluKGZsb2F0KDEwMDAwKSwgbWF4KHZhbHVlLCBmbG9hdCgxKSkpOwor ICAgIHJldHVybiB2YWx1ZTsKK30KIAotICAgIEFTU0VSVChhdmFpbGFibGVXaWR0aCA+IDAgJiYg YXZhaWxhYmxlSGVpZ2h0ID4gMCk7CitzdGF0aWMgaW5saW5lIGZsb2F0IGNsYW1wU2NhbGVWYWx1 ZShmbG9hdCB2YWx1ZSkKK3sKKyAgICBBU1NFUlQodmFsdWUgIT0gVmlld3BvcnRBcmd1bWVudHM6 OlZhbHVlRGV2aWNlV2lkdGgpOworICAgIEFTU0VSVCh2YWx1ZSAhPSBWaWV3cG9ydEFyZ3VtZW50 czo6VmFsdWVEZXZpY2VIZWlnaHQpOwogCi0gICAgLy8gUmVzb2x2ZSBub24tJ2F1dG8nIHdpZHRo IGFuZCBoZWlnaHQgdG8gcGl4ZWwgdmFsdWVzLgotICAgIGlmIChkZXZpY2VQaXhlbFJhdGlvICE9 IDEuMCkgewotICAgICAgICBhdmFpbGFibGVXaWR0aCAvPSBkZXZpY2VQaXhlbFJhdGlvOwotICAg ICAgICBhdmFpbGFibGVIZWlnaHQgLz0gZGV2aWNlUGl4ZWxSYXRpbzsKLSAgICAgICAgZGV2aWNl V2lkdGggLz0gZGV2aWNlUGl4ZWxSYXRpbzsKLSAgICAgICAgZGV2aWNlSGVpZ2h0IC89IGRldmlj ZVBpeGVsUmF0aW87Ci0gICAgfQorICAgIGlmICh2YWx1ZSAhPSBWaWV3cG9ydEFyZ3VtZW50czo6 VmFsdWVBdXRvKQorICAgICAgICByZXR1cm4gbWluKGZsb2F0KDEwKSwgbWF4KHZhbHVlLCBmbG9h dCgwLjEpKSk7CisgICAgcmV0dXJuIHZhbHVlOworfQorCitWaWV3cG9ydEF0dHJpYnV0ZXMgVmll d3BvcnRBcmd1bWVudHM6OnJlc29sdmUoY29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmlld3BvcnRT aXplLCBjb25zdCBGbG9hdFNpemUmIGRldmljZVNpemUsIGludCBkZWZhdWx0V2lkdGgpIGNvbnN0 Cit7CisgICAgZmxvYXQgcmVzdWx0V2lkdGggPSB3aWR0aDsKKyAgICBmbG9hdCByZXN1bHRIZWln aHQgPSBoZWlnaHQ7CisgICAgZmxvYXQgcmVzdWx0Wm9vbSA9IGluaXRpYWxTY2FsZTsKKyAgICBm bG9hdCByZXN1bHRNaW5ab29tID0gbWluaW11bVNjYWxlOworICAgIGZsb2F0IHJlc3VsdE1heFpv b20gPSBtYXhpbXVtU2NhbGU7CisgICAgZmxvYXQgcmVzdWx0VXNlclpvb20gPSB1c2VyU2NhbGFi bGU7CiAKLSAgICBzd2l0Y2ggKGludChhcmdzLndpZHRoKSkgeworICAgIGJvb2wgcmVzdWx0QXV0 b0ZpdCA9IHJlc3VsdFpvb20gPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bzsKKworICAg IHN3aXRjaCAoaW50KHJlc3VsdFdpZHRoKSkgewogICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6 OlZhbHVlRGV2aWNlV2lkdGg6Ci0gICAgICAgIGFyZ3Mud2lkdGggPSBkZXZpY2VXaWR0aDsKKyAg ICAgICAgcmVzdWx0V2lkdGggPSBkZXZpY2VTaXplLndpZHRoKCk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0OgotICAgICAgICBh cmdzLndpZHRoID0gZGV2aWNlSGVpZ2h0OworICAgICAgICByZXN1bHRXaWR0aCA9IGRldmljZVNp emUuaGVpZ2h0KCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIHN3aXRjaCAoaW50KGFy Z3MuaGVpZ2h0KSkgeworICAgIHN3aXRjaCAoaW50KHJlc3VsdEhlaWdodCkpIHsKICAgICBjYXNl IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdpZHRoOgotICAgICAgICBhcmdzLmhlaWdo dCA9IGRldmljZVdpZHRoOworICAgICAgICByZXN1bHRIZWlnaHQgPSBkZXZpY2VTaXplLndpZHRo KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2 aWNlSGVpZ2h0OgotICAgICAgICBhcmdzLmhlaWdodCA9IGRldmljZUhlaWdodDsKKyAgICAgICAg cmVzdWx0SGVpZ2h0ID0gZGV2aWNlU2l6ZS5oZWlnaHQoKTsKICAgICAgICAgYnJlYWs7CiAgICAg fQogCi0gICAgLy8gQ2xhbXAgdmFsdWVzIHRvIHJhbmdlIGRlZmluZWQgYnkgc3BlYyBhbmQgcmVz b2x2ZSBtaW5pbXVtLXNjYWxlIGFuZCBtYXhpbXVtLXNjYWxlIHZhbHVlcwotICAgIGlmIChhcmdz LndpZHRoICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCi0gICAgICAgIGFyZ3Mud2lk dGggPSBtaW4oZmxvYXQoMTAwMDApLCBtYXgoYXJncy53aWR0aCwgZmxvYXQoMSkpKTsKLSAgICBp ZiAoYXJncy5oZWlnaHQgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykKLSAgICAgICAg YXJncy5oZWlnaHQgPSBtaW4oZmxvYXQoMTAwMDApLCBtYXgoYXJncy5oZWlnaHQsIGZsb2F0KDEp KSk7Ci0KLSAgICByZXN1bHQuaW5pdGlhbGx5Rml0VG9WaWV3cG9ydCA9IGFyZ3MuaW5pdGlhbFNj YWxlID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG87CisgICAgLy8gQ2xhbXAgdmFsdWVz IHRvIHZhbGlkIHJhbmdlLgorICAgIHJlc3VsdFdpZHRoID0gY2xhbXBMZW5ndGhWYWx1ZShyZXN1 bHRXaWR0aCk7CisgICAgcmVzdWx0SGVpZ2h0ID0gY2xhbXBMZW5ndGhWYWx1ZShyZXN1bHRIZWln aHQpOworICAgIHJlc3VsdFpvb20gPSBjbGFtcFNjYWxlVmFsdWUocmVzdWx0Wm9vbSk7CisgICAg cmVzdWx0TWluWm9vbSA9IGNsYW1wU2NhbGVWYWx1ZShyZXN1bHRNaW5ab29tKTsKKyAgICByZXN1 bHRNYXhab29tID0gY2xhbXBTY2FsZVZhbHVlKHJlc3VsdE1heFpvb20pOwogCi0gICAgaWYgKGFy Z3MuaW5pdGlhbFNjYWxlICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCi0gICAgICAg IGFyZ3MuaW5pdGlhbFNjYWxlID0gbWluKGZsb2F0KDEwKSwgbWF4KGFyZ3MuaW5pdGlhbFNjYWxl LCBmbG9hdCgwLjEpKSk7Ci0gICAgaWYgKGFyZ3MubWluaW11bVNjYWxlICE9IFZpZXdwb3J0QXJn dW1lbnRzOjpWYWx1ZUF1dG8pCi0gICAgICAgIGFyZ3MubWluaW11bVNjYWxlID0gbWluKGZsb2F0 KDEwKSwgbWF4KGFyZ3MubWluaW11bVNjYWxlLCBmbG9hdCgwLjEpKSk7Ci0gICAgaWYgKGFyZ3Mu bWF4aW11bVNjYWxlICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCi0gICAgICAgIGFy Z3MubWF4aW11bVNjYWxlID0gbWluKGZsb2F0KDEwKSwgbWF4KGFyZ3MubWF4aW11bVNjYWxlLCBm bG9hdCgwLjEpKSk7CisgICAgVmlld3BvcnRBdHRyaWJ1dGVzIHJlc3VsdDsKKyAgICByZXN1bHQu aW5pdGlhbGx5Rml0VG9WaWV3cG9ydCA9IHJlc3VsdEF1dG9GaXQ7CiAKICAgICAvLyBSZXNvbHZl IG1pbmltdW0tc2NhbGUgYW5kIG1heGltdW0tc2NhbGUgdmFsdWVzIGFjY29yZGluZyB0byBzcGVj LgotICAgIGlmIChhcmdzLm1pbmltdW1TY2FsZSA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVB dXRvKQorICAgIGlmIChyZXN1bHRNaW5ab29tID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1 dG8pCiAgICAgICAgIHJlc3VsdC5taW5pbXVtU2NhbGUgPSBmbG9hdCgwLjI1KTsKICAgICBlbHNl Ci0gICAgICAgIHJlc3VsdC5taW5pbXVtU2NhbGUgPSBhcmdzLm1pbmltdW1TY2FsZTsKKyAgICAg ICAgcmVzdWx0Lm1pbmltdW1TY2FsZSA9IHJlc3VsdE1pblpvb207CiAKLSAgICBpZiAoYXJncy5t YXhpbXVtU2NhbGUgPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykgeworICAgIGlmIChy ZXN1bHRNYXhab29tID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pIHsKICAgICAgICAg cmVzdWx0Lm1heGltdW1TY2FsZSA9IGZsb2F0KDUuMCk7CiAgICAgICAgIHJlc3VsdC5taW5pbXVt U2NhbGUgPSBtaW4oZmxvYXQoNS4wKSwgcmVzdWx0Lm1pbmltdW1TY2FsZSk7CiAgICAgfSBlbHNl Ci0gICAgICAgIHJlc3VsdC5tYXhpbXVtU2NhbGUgPSBhcmdzLm1heGltdW1TY2FsZTsKKyAgICAg ICAgcmVzdWx0Lm1heGltdW1TY2FsZSA9IHJlc3VsdE1heFpvb207CiAgICAgcmVzdWx0Lm1heGlt dW1TY2FsZSA9IG1heChyZXN1bHQubWluaW11bVNjYWxlLCByZXN1bHQubWF4aW11bVNjYWxlKTsK IAogICAgIC8vIFJlc29sdmUgaW5pdGlhbC1zY2FsZSB2YWx1ZS4KLSAgICByZXN1bHQuaW5pdGlh bFNjYWxlID0gYXJncy5pbml0aWFsU2NhbGU7Ci0gICAgaWYgKHJlc3VsdC5pbml0aWFsU2NhbGUg PT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykgewotICAgICAgICByZXN1bHQuaW5pdGlh bFNjYWxlID0gYXZhaWxhYmxlV2lkdGggLyBkZXNrdG9wV2lkdGg7Ci0gICAgICAgIGlmIChhcmdz LndpZHRoICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCi0gICAgICAgICAgICByZXN1 bHQuaW5pdGlhbFNjYWxlID0gYXZhaWxhYmxlV2lkdGggLyBhcmdzLndpZHRoOwotICAgICAgICBp ZiAoYXJncy5oZWlnaHQgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykgeworICAgIHJl c3VsdC5pbml0aWFsU2NhbGUgPSByZXN1bHRab29tOworICAgIGlmIChyZXN1bHRab29tID09IFZp ZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pIHsKKyAgICAgICAgcmVzdWx0LmluaXRpYWxTY2Fs ZSA9IGluaXRpYWxWaWV3cG9ydFNpemUud2lkdGgoKSAvIGRlZmF1bHRXaWR0aDsKKyAgICAgICAg aWYgKHJlc3VsdFdpZHRoICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCisgICAgICAg ICAgICByZXN1bHQuaW5pdGlhbFNjYWxlID0gaW5pdGlhbFZpZXdwb3J0U2l6ZS53aWR0aCgpIC8g cmVzdWx0V2lkdGg7CisgICAgICAgIGlmIChyZXN1bHRIZWlnaHQgIT0gVmlld3BvcnRBcmd1bWVu dHM6OlZhbHVlQXV0bykgewogICAgICAgICAgICAgLy8gaWYgJ2F1dG8nLCB0aGUgaW5pdGlhbC1z Y2FsZSB3aWxsIGJlIG5lZ2F0aXZlIGhlcmUgYW5kIHRodXMgaWdub3JlZC4KLSAgICAgICAgICAg IHJlc3VsdC5pbml0aWFsU2NhbGUgPSBtYXg8ZmxvYXQ+KHJlc3VsdC5pbml0aWFsU2NhbGUsIGF2 YWlsYWJsZUhlaWdodCAvIGFyZ3MuaGVpZ2h0KTsKKyAgICAgICAgICAgIHJlc3VsdC5pbml0aWFs U2NhbGUgPSBtYXg8ZmxvYXQ+KHJlc3VsdC5pbml0aWFsU2NhbGUsIGluaXRpYWxWaWV3cG9ydFNp emUuaGVpZ2h0KCkgLyByZXN1bHRIZWlnaHQpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0xMjIs NjAgKzEzMSw2MyBAQCBWaWV3cG9ydEF0dHJpYnV0ZXMgY29tcHV0ZVZpZXdwb3J0QXR0cmlidXRl cyhWaWV3cG9ydEFyZ3VtZW50cyBhcmdzLCBpbnQgZGVza3RvcAogICAgIHJlc3VsdC5pbml0aWFs U2NhbGUgPSBtaW4ocmVzdWx0Lm1heGltdW1TY2FsZSwgbWF4KHJlc3VsdC5taW5pbXVtU2NhbGUs IHJlc3VsdC5pbml0aWFsU2NhbGUpKTsKIAogICAgIC8vIFJlc29sdmUgd2lkdGggdmFsdWUuCi0g ICAgZmxvYXQgd2lkdGg7Ci0gICAgaWYgKGFyZ3Mud2lkdGggIT0gVmlld3BvcnRBcmd1bWVudHM6 OlZhbHVlQXV0bykKLSAgICAgICAgd2lkdGggPSBhcmdzLndpZHRoOwotICAgIGVsc2UgewotICAg ICAgICBpZiAoYXJncy5pbml0aWFsU2NhbGUgPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0 bykKLSAgICAgICAgICAgIHdpZHRoID0gZGVza3RvcFdpZHRoOwotICAgICAgICBlbHNlIGlmIChh cmdzLmhlaWdodCAhPSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvKQotICAgICAgICAgICAg d2lkdGggPSBhcmdzLmhlaWdodCAqIChhdmFpbGFibGVXaWR0aCAvIGF2YWlsYWJsZUhlaWdodCk7 CisgICAgaWYgKHJlc3VsdFdpZHRoID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pIHsK KyAgICAgICAgaWYgKHJlc3VsdFpvb20gPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykK KyAgICAgICAgICAgIHJlc3VsdFdpZHRoID0gZGVmYXVsdFdpZHRoOworICAgICAgICBlbHNlIGlm IChyZXN1bHRIZWlnaHQgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykKKyAgICAgICAg ICAgIHJlc3VsdFdpZHRoID0gcmVzdWx0SGVpZ2h0ICogKGluaXRpYWxWaWV3cG9ydFNpemUud2lk dGgoKSAvIGluaXRpYWxWaWV3cG9ydFNpemUuaGVpZ2h0KCkpOwogICAgICAgICBlbHNlCi0gICAg ICAgICAgICB3aWR0aCA9IGF2YWlsYWJsZVdpZHRoIC8gcmVzdWx0LmluaXRpYWxTY2FsZTsKKyAg ICAgICAgICAgIHJlc3VsdFdpZHRoID0gaW5pdGlhbFZpZXdwb3J0U2l6ZS53aWR0aCgpIC8gcmVz dWx0LmluaXRpYWxTY2FsZTsKICAgICB9CiAKICAgICAvLyBSZXNvbHZlIGhlaWdodCB2YWx1ZS4K LSAgICBmbG9hdCBoZWlnaHQ7Ci0gICAgaWYgKGFyZ3MuaGVpZ2h0ICE9IFZpZXdwb3J0QXJndW1l bnRzOjpWYWx1ZUF1dG8pCi0gICAgICAgIGhlaWdodCA9IGFyZ3MuaGVpZ2h0OwotICAgIGVsc2UK LSAgICAgICAgaGVpZ2h0ID0gd2lkdGggKiBhdmFpbGFibGVIZWlnaHQgLyBhdmFpbGFibGVXaWR0 aDsKKyAgICBpZiAocmVzdWx0SGVpZ2h0ID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8p CisgICAgICAgIHJlc3VsdEhlaWdodCA9IHJlc3VsdFdpZHRoICogKGluaXRpYWxWaWV3cG9ydFNp emUuaGVpZ2h0KCkgLyBpbml0aWFsVmlld3BvcnRTaXplLndpZHRoKCkpOwogCiAgICAgLy8gRXh0 ZW5kIHdpZHRoIGFuZCBoZWlnaHQgdG8gZmlsbCB0aGUgdmlzdWFsIHZpZXdwb3J0IGZvciB0aGUg cmVzb2x2ZWQgaW5pdGlhbC1zY2FsZS4KLSAgICB3aWR0aCA9IG1heDxmbG9hdD4od2lkdGgsIGF2 YWlsYWJsZVdpZHRoIC8gcmVzdWx0LmluaXRpYWxTY2FsZSk7Ci0gICAgaGVpZ2h0ID0gbWF4PGZs b2F0PihoZWlnaHQsIGF2YWlsYWJsZUhlaWdodCAvIHJlc3VsdC5pbml0aWFsU2NhbGUpOwotICAg IHJlc3VsdC5sYXlvdXRTaXplLnNldFdpZHRoKHdpZHRoKTsKLSAgICByZXN1bHQubGF5b3V0U2l6 ZS5zZXRIZWlnaHQoaGVpZ2h0KTsKKyAgICByZXN1bHRXaWR0aCA9IG1heDxmbG9hdD4ocmVzdWx0 V2lkdGgsIGluaXRpYWxWaWV3cG9ydFNpemUud2lkdGgoKSAvIHJlc3VsdC5pbml0aWFsU2NhbGUp OworICAgIHJlc3VsdEhlaWdodCA9IG1heDxmbG9hdD4ocmVzdWx0SGVpZ2h0LCBpbml0aWFsVmll d3BvcnRTaXplLmhlaWdodCgpIC8gcmVzdWx0LmluaXRpYWxTY2FsZSk7CisgICAgcmVzdWx0Lmxh eW91dFNpemUuc2V0V2lkdGgocmVzdWx0V2lkdGgpOworICAgIHJlc3VsdC5sYXlvdXRTaXplLnNl dEhlaWdodChyZXN1bHRIZWlnaHQpOworCisgICAgLy8gRklYTUU6IFJlbW92ZSBpbml0aWFsbHlG aXRUb1ZpZXdwb3J0IGFuZCB1c2UgdGhlIGJlbG93LgorICAgIC8vIE9ubHkgc2V0IGluaXRpYWxT Y2FsZSB0byBhIHZhbHVlIGlmIGl0IHdhcyBleHBsaWNpdGx5IHNldC4KKyAgICAvLyBpZiAocmVz dWx0Wm9vbSA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvKQorICAgIC8vICAgIHJlc3Vs dC5pbml0aWFsU2NhbGUgPSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvOwogCi0gICAgcmVz dWx0LnVzZXJTY2FsYWJsZSA9IGFyZ3MudXNlclNjYWxhYmxlOworICAgIHJlc3VsdC51c2VyU2Nh bGFibGUgPSByZXN1bHRVc2VyWm9vbTsKIAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLWZsb2F0 IGNvbXB1dGVNaW5pbXVtU2NhbGVGYWN0b3JGb3JDb250ZW50Q29udGFpbmVkKGNvbnN0IFZpZXdw b3J0QXR0cmlidXRlcyYgcmVzdWx0LCBjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUsIGNvbnN0 IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbykKK0Zsb2F0U2l6 ZSBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgRmxvYXRTaXplJiBkZXZpY2VTaXplLCBmbG9hdCBk ZXZpY2VQaXhlbFJhdGlvKQogewotICAgIGZsb2F0IGF2YWlsYWJsZVdpZHRoID0gdmlld3BvcnRT aXplLndpZHRoKCk7Ci0gICAgZmxvYXQgYXZhaWxhYmxlSGVpZ2h0ID0gdmlld3BvcnRTaXplLmhl aWdodCgpOworICAgIEZsb2F0U2l6ZSByZXN1bHQgPSBkZXZpY2VTaXplOworICAgIGlmIChkZXZp Y2VQaXhlbFJhdGlvICE9IDEpCisgICAgICAgIHJlc3VsdC5zY2FsZSgxIC8gZGV2aWNlUGl4ZWxS YXRpbyk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KIAotICAgIGlmIChkZXZpY2VQaXhlbFJhdGlv ICE9IDEuMCkgewotICAgICAgICBhdmFpbGFibGVXaWR0aCAvPSBkZXZpY2VQaXhlbFJhdGlvOwot ICAgICAgICBhdmFpbGFibGVIZWlnaHQgLz0gZGV2aWNlUGl4ZWxSYXRpbzsKLSAgICB9CitWaWV3 cG9ydEF0dHJpYnV0ZXMgY29tcHV0ZVZpZXdwb3J0QXR0cmlidXRlcyhWaWV3cG9ydEFyZ3VtZW50 cyBhcmdzLCBpbnQgZGVza3RvcFdpZHRoLCBpbnQgZGV2aWNlV2lkdGgsIGludCBkZXZpY2VIZWln aHQsIGZsb2F0IGRldmljZVBpeGVsUmF0aW8sIEludFNpemUgdmlzaWJsZVZpZXdwb3J0KQorewor ICAgIEZsb2F0U2l6ZSBpbml0aWFsVmlld3BvcnRTaXplID0gY29udmVydFRvVXNlclNwYWNlKHZp c2libGVWaWV3cG9ydCwgZGV2aWNlUGl4ZWxSYXRpbyk7CisgICAgRmxvYXRTaXplIGRldmljZVNp emUgPSBjb252ZXJ0VG9Vc2VyU3BhY2UoRmxvYXRTaXplKGRldmljZVdpZHRoLCBkZXZpY2VIZWln aHQpLCBkZXZpY2VQaXhlbFJhdGlvKTsKIAotICAgIHJldHVybiBtYXg8ZmxvYXQ+KHJlc3VsdC5t aW5pbXVtU2NhbGUsIG1heChhdmFpbGFibGVXaWR0aCAvIGNvbnRlbnRzU2l6ZS53aWR0aCgpLCBh dmFpbGFibGVIZWlnaHQgLyBjb250ZW50c1NpemUuaGVpZ2h0KCkpKTsKKyAgICByZXR1cm4gYXJn cy5yZXNvbHZlKGluaXRpYWxWaWV3cG9ydFNpemUsIGRldmljZVNpemUsIGRlc2t0b3BXaWR0aCk7 CiB9CiAKLXZvaWQgcmVzdHJpY3RNaW5pbXVtU2NhbGVGYWN0b3JUb1ZpZXdwb3J0U2l6ZShWaWV3 cG9ydEF0dHJpYnV0ZXMmIHJlc3VsdCwgSW50U2l6ZSB2aXNpYmxlVmlld3BvcnQsIGZsb2F0IGRl dmljZVBpeGVsUmF0aW8pCitmbG9hdCBjb21wdXRlTWluaW11bVNjYWxlRmFjdG9yRm9yQ29udGVu dENvbnRhaW5lZChjb25zdCBWaWV3cG9ydEF0dHJpYnV0ZXMmIHJlc3VsdCwgY29uc3QgSW50U2l6 ZSYgdmlzaWJsZVZpZXdwb3J0LCBjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUsIGZsb2F0IGRl dmljZVBpeGVsUmF0aW8pCiB7Ci0gICAgZmxvYXQgYXZhaWxhYmxlV2lkdGggPSB2aXNpYmxlVmll d3BvcnQud2lkdGgoKTsKLSAgICBmbG9hdCBhdmFpbGFibGVIZWlnaHQgPSB2aXNpYmxlVmlld3Bv cnQuaGVpZ2h0KCk7CisgICAgRmxvYXRTaXplIHZpZXdwb3J0U2l6ZSA9IGNvbnZlcnRUb1VzZXJT cGFjZSh2aXNpYmxlVmlld3BvcnQsIGRldmljZVBpeGVsUmF0aW8pOwogCi0gICAgaWYgKGRldmlj ZVBpeGVsUmF0aW8gIT0gMS4wKSB7Ci0gICAgICAgIGF2YWlsYWJsZVdpZHRoIC89IGRldmljZVBp eGVsUmF0aW87Ci0gICAgICAgIGF2YWlsYWJsZUhlaWdodCAvPSBkZXZpY2VQaXhlbFJhdGlvOwot ICAgIH0KKyAgICByZXR1cm4gbWF4PGZsb2F0PihyZXN1bHQubWluaW11bVNjYWxlLCBtYXgodmll d3BvcnRTaXplLndpZHRoKCkgLyBjb250ZW50c1NpemUud2lkdGgoKSwgdmlld3BvcnRTaXplLmhl aWdodCgpIC8gY29udGVudHNTaXplLmhlaWdodCgpKSk7Cit9CisKK3ZvaWQgcmVzdHJpY3RNaW5p bXVtU2NhbGVGYWN0b3JUb1ZpZXdwb3J0U2l6ZShWaWV3cG9ydEF0dHJpYnV0ZXMmIHJlc3VsdCwg SW50U2l6ZSB2aXNpYmxlVmlld3BvcnQsIGZsb2F0IGRldmljZVBpeGVsUmF0aW8pCit7CisgICAg RmxvYXRTaXplIHZpZXdwb3J0U2l6ZSA9IGNvbnZlcnRUb1VzZXJTcGFjZSh2aXNpYmxlVmlld3Bv cnQsIGRldmljZVBpeGVsUmF0aW8pOwogCi0gICAgcmVzdWx0Lm1pbmltdW1TY2FsZSA9IG1heDxm bG9hdD4ocmVzdWx0Lm1pbmltdW1TY2FsZSwgbWF4KGF2YWlsYWJsZVdpZHRoIC8gcmVzdWx0Lmxh eW91dFNpemUud2lkdGgoKSwgYXZhaWxhYmxlSGVpZ2h0IC8gcmVzdWx0LmxheW91dFNpemUuaGVp Z2h0KCkpKTsKKyAgICByZXN1bHQubWluaW11bVNjYWxlID0gbWF4PGZsb2F0PihyZXN1bHQubWlu aW11bVNjYWxlLCBtYXgodmlld3BvcnRTaXplLndpZHRoKCkgLyByZXN1bHQubGF5b3V0U2l6ZS53 aWR0aCgpLCB2aWV3cG9ydFNpemUuaGVpZ2h0KCkgLyByZXN1bHQubGF5b3V0U2l6ZS5oZWlnaHQo KSkpOwogfQogCiB2b2lkIHJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNl clNjYWxhYmxlKFZpZXdwb3J0QXR0cmlidXRlcyYgcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmll d3BvcnRBcmd1bWVudHMuaAppbmRleCAzMjEzOWVlYTgyNTY2ZWQ2YmE2MDM3M2E2MjI3ZWIzODY2 Y2U2ZGU2Li4yZDdlYTFmMmE4NDJiZWI1ZWIzMzBiZTczZWRhZTU4YzgzZjQ2MWM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuaApAQCAtODMsNiArODMsOSBAQCBzdHJ1Y3Qg Vmlld3BvcnRBcmd1bWVudHMgewogICAgIHsKICAgICB9CiAKKyAgICAvLyBBbGwgYXJndW1lbnRz IGFyZSBpbiBDU1MgdW5pdHMuCisgICAgVmlld3BvcnRBdHRyaWJ1dGVzIHJlc29sdmUoY29uc3Qg RmxvYXRTaXplJiBpbml0aWFsVmlld3BvcnRTaXplLCBjb25zdCBGbG9hdFNpemUmIGRldmljZVNp emUsIGludCBkZWZhdWx0V2lkdGgpIGNvbnN0OworCiAgICAgZmxvYXQgaW5pdGlhbFNjYWxlOwog ICAgIGZsb2F0IG1pbmltdW1TY2FsZTsKICAgICBmbG9hdCBtYXhpbXVtU2NhbGU7Cg==