102517 2012-11-16 08:07:36 -0800 [WTR] WebKitTestRunner should be able to run tests using fixed layout 2012-11-20 09:15:09 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95959 102811 1 tmpsantos tmpsantos cdumez gyuyoung.kim hausmann jturcotte kenneth rakuco webkit.review.bot yael oldest_to_newest 769283 0 tmpsantos 2012-11-16 08:07:36 -0800 CSS Device Adaption tests expects the browser to use fixed layout. AFAIK all the ports don't enable this mode on WTR and we cannot enable this mode by default because it will break most of the baselines. 771611 1 175161 tmpsantos 2012-11-19 23:58:06 -0800 Created attachment 175161 Patch 771833 2 tmpsantos 2012-11-20 06:59:43 -0800 Adding more reviewers. At the bug 102811, I'm adding the same functionality for the Qt port, but it depends on the WK2 generic bits added by this patch. 771874 3 175161 kenneth 2012-11-20 08:01:24 -0800 Comment on attachment 175161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175161&action=review > Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp:136 > +{ > + WKRetainPtr<WKStringRef> useFixedLayoutKey(AdoptWK, WKStringCreateWithUTF8CString("UseFixedLayout")); > + > + return m_usingFixedLayout == (options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useFixedLayoutKey.get()))) : false); couldn't there not be other options that we don't support? How should we handle them? Shouldn't we check if there are other entries in the dictionary? and if so, return false? 771879 4 175161 tmpsantos 2012-11-20 08:10:42 -0800 Comment on attachment 175161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175161&action=review >> Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp:136 >> + return m_usingFixedLayout == (options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useFixedLayoutKey.get()))) : false); > > couldn't there not be other options that we don't support? How should we handle them? > > Shouldn't we check if there are other entries in the dictionary? and if so, return false? Right now this is the only option supported. Prior to this patch, this code was an inline returning true for all platforms other than Mac. 771907 5 175161 tmpsantos 2012-11-20 08:53:50 -0800 Comment on attachment 175161 Patch Clearing flag until I get a reply from Kenneth on the review. 771915 6 175161 webkit.review.bot 2012-11-20 09:15:04 -0800 Comment on attachment 175161 Patch Clearing flags on attachment: 175161 Committed r135287: <http://trac.webkit.org/changeset/135287> 771916 7 webkit.review.bot 2012-11-20 09:15:09 -0800 All reviewed patches have been landed. Closing bug. 175161 2012-11-19 23:58:06 -0800 2012-11-20 09:15:04 -0800 Patch bug-102517-20121120095554.patch text/plain 11655 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmQ1NTkyYmZkOTFlMWJm YjQ1MDU3OTU4MTRkYmZmMmJjYWJhMDc5Mi4uOGRiMGU2MWI1MjU3M2NkY2MyZjdhYmY5ZGVkZWE3 ZTk2NTA1NDljMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTExLTE5ICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgorCisgICAgICAg IFtXVFJdIFdlYktpdFRlc3RSdW5uZXIgc2hvdWxkIGJlIGFibGUgdG8gcnVuIHRlc3RzIHVzaW5n IGZpeGVkIGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTAyNTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXBkYXRlIEVGTCBwcml2YXRlIEFQSSBzbyB3ZSBjYW4gY3JlYXRlIGEgdmlldyB3aXRo IGZpeGVkIGxheW91dC4gV2UKKyAgICAgICAgY2FuIGtlZXAgdGhpcyBhcyBwcml2YXRlIGFzIEkg ZG9uJ3Qgc2VlIGEgcmVhbCBsaWZlIHVzZSBjYXNlIGZvciBpdAorICAgICAgICBvdXRzaWRlIFdU UiBhbmQgdGhlIFdlYkluc3BlY3Rvci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9lZmwv V0tWaWV3LmNwcDoKKyAgICAgICAgKFdLVmlld0NyZWF0ZSk6CisgICAgICAgIChXS1ZpZXdDcmVh dGVXaXRoRml4ZWRMYXlvdXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAo ZXdrX3ZpZXdfYmFzZV9hZGQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 X3ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRl SW5zcGVjdG9yUGFnZSk6CisKIDIwMTItMTEtMTkgIEt5dW5nVGFlIEtpbSAgPGt0Zi5raW1Ac2Ft c3VuZy5jb20+CiAKICAgICAgICAgW1dLMl0gVW51c2VkIHBhcmFtZXRlcnMgb24gQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL2VmbC9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2Vm bC9XS1ZpZXcuY3BwCmluZGV4IGEwM2QxODlkZjA5YjM2ZWFhMjhmZTk5OTgwNDY3ZWUyMzhkOGMw NjIuLjgwYTFhYzM4MWM3ZWM0MzQ4ZDkyMGZhYjQ2NGM1YzkyNTY4ZDdhYmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAKQEAgLTI4LDcgKzI4LDEy IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVmlld1JlZiBXS1ZpZXdDcmVhdGUoRXZh cyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdy b3VwUmVmKQogewotICAgIHJldHVybiB0b0FQSShld2tfdmlld19iYXNlX2FkZChjYW52YXMsIGNv bnRleHRSZWYsIHBhZ2VHcm91cFJlZikpOworICAgIHJldHVybiB0b0FQSShld2tfdmlld19iYXNl X2FkZChjYW52YXMsIGNvbnRleHRSZWYsIHBhZ2VHcm91cFJlZiwgRXdrVmlld0ltcGw6OkxlZ2Fj eUJlaGF2aW9yKSk7Cit9CisKK1dLVmlld1JlZiBXS1ZpZXdDcmVhdGVXaXRoRml4ZWRMYXlvdXQo RXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFn ZUdyb3VwUmVmKQoreworICAgIHJldHVybiB0b0FQSShld2tfdmlld19iYXNlX2FkZChjYW52YXMs IGNvbnRleHRSZWYsIHBhZ2VHcm91cFJlZiwgRXdrVmlld0ltcGw6OkRlZmF1bHRCZWhhdmlvcikp OwogfQogCiBXS1BhZ2VSZWYgV0tWaWV3R2V0UGFnZShXS1ZpZXdSZWYgdmlld1JlZikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5oCmluZGV4IDFhNzk2MWRhYTI5 MDI0ODdmMGNiOTNiMWYyOWQ0Yjk4MTJhMTM1MDIuLmRiMGRhMmMyN2NhYWVkNzhiYjk2NDgwZTBi NDgxMzEyYzI2ODQ1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9lZmwvV0tWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2VmbC9X S1ZpZXcuaApAQCAtMzAsNiArMzAsOCBAQCBleHRlcm4gIkMiIHsKIAogV0tfRVhQT1JUIFdLVmll d1JlZiBXS1ZpZXdDcmVhdGUoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dCwgV0tQ YWdlR3JvdXBSZWYgcGFnZUdyb3VwKTsKIAorV0tfRVhQT1JUIFdLVmlld1JlZiBXS1ZpZXdDcmVh dGVXaXRoRml4ZWRMYXlvdXQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dCwgV0tQ YWdlR3JvdXBSZWYgcGFnZUdyb3VwKTsKKwogV0tfRVhQT1JUIFdLUGFnZVJlZiBXS1ZpZXdHZXRQ YWdlKFdLVmlld1JlZiB2aWV3KTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggZjdlZjRmODM1ZmJmYTM3 ZmI3ZTQ5MzFkZWVmM2YyOTEyOTliZDlmZC4uNzJhNTkyM2MwOTk5OTViMWQ0NGJmNGE0MDUzNzIy ODY2M2M3YjkwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNTIxLDkgKzUyMSw5IEBAIHN0YXRpYyBpbmxpbmUgRXZhc19PYmplY3QqIGNy ZWF0ZUV3a1ZpZXcoRXZhcyogY2FudmFzLCBFdmFzX1NtYXJ0KiBzbWFydCwgUGFzc1JlCiAgKiBA aW50ZXJuYWwKICAqIENvbnN0cnVjdHMgYSBld2tfdmlldyBFdmFzX09iamVjdCB3aXRoIFdLVHlw ZSBwYXJhbWV0ZXJzLgogICovCi1FdmFzX09iamVjdCogZXdrX3ZpZXdfYmFzZV9hZGQoRXZhcyog Y2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3Vw UmVmKQorRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2YXMqIGNhbnZhcywgV0tDb250 ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZiwgRXdrVmlld0lt cGw6OlZpZXdCZWhhdmlvciBiZWhhdmlvcikKIHsKLSAgICByZXR1cm4gY3JlYXRlRXdrVmlldyhj YW52YXMsIGNyZWF0ZUV3a1ZpZXdTbWFydENsYXNzKCksIEV3a0NvbnRleHQ6OmNyZWF0ZSh0b0lt cGwoY29udGV4dFJlZikpLCBwYWdlR3JvdXBSZWYsIEV3a1ZpZXdJbXBsOjpMZWdhY3lCZWhhdmlv cik7CisgICAgcmV0dXJuIGNyZWF0ZUV3a1ZpZXcoY2FudmFzLCBjcmVhdGVFd2tWaWV3U21hcnRD bGFzcygpLCBFd2tDb250ZXh0OjpjcmVhdGUodG9JbXBsKGNvbnRleHRSZWYpKSwgcGFnZUdyb3Vw UmVmLCBiZWhhdmlvcik7CiB9CiAKIEV2YXNfT2JqZWN0KiBld2tfdmlld19zbWFydF9hZGQoRXZh cyogY2FudmFzLCBFdmFzX1NtYXJ0KiBzbWFydCwgRXdrX0NvbnRleHQqIGNvbnRleHQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRl LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgK aW5kZXggMjgwMzg4NTdmYThhZDc4MTZkNGQyY2MzODZhMGE3YTI3YTIzMDQyNS4uOWE1MWVmMjQ0 MWQ3NmI1Njc5MDNlZjdhNjFmZGNlNGY0YTFlM2YxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtMjEsOSArMjEsMTAg QEAKICNpZm5kZWYgZXdrX3ZpZXdfcHJpdmF0ZV9oCiAjZGVmaW5lIGV3a192aWV3X3ByaXZhdGVf aAogCisjaW5jbHVkZSAiRXdrVmlld0ltcGwuaCIKICNpbmNsdWRlIDxFdmFzLmg+CiAjaW5jbHVk ZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KIAotRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2 YXMqIGNhbnZhcywgV0tDb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZik7CitFdmFzX09iamVjdCog ZXdrX3ZpZXdfYmFzZV9hZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYsIFdLUGFnZUdyb3Vw UmVmLCBFd2tWaWV3SW1wbDo6Vmlld0JlaGF2aW9yKTsKIAogI2VuZGlmIC8vIGV3a192aWV3X3By aXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNw ZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3Bl Y3RvclByb3h5RWZsLmNwcAppbmRleCA0ZDg0NzRmNzU1OWZmZWM3MjY3MWQ4ZWVkYjI5ZmFlYmI2 NGZlZGU1Li5iOWI1ZDkyYjVjNmRlYTljNzZlYjQ1ZWQ4OGMzM2U0YmY5ZjY4NDExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZs LmNwcApAQCAtOTgsNyArOTgsNyBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3BlY3RvclByb3h5Ojpw bGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIGlmICghbV9pbnNwZWN0b3JXaW5kb3cp CiAgICAgICAgIHJldHVybiAwOwogCi0gICAgbV9pbnNwZWN0b3JWaWV3ID0gZXdrX3ZpZXdfYmFz ZV9hZGQoZWNvcmVfZXZhc19nZXQobV9pbnNwZWN0b3JXaW5kb3cpLCB0b0FQSShwYWdlKCktPnBy b2Nlc3MoKS0+Y29udGV4dCgpKSwgdG9BUEkoaW5zcGVjdG9yUGFnZUdyb3VwKCkpKTsKKyAgICBt X2luc3BlY3RvclZpZXcgPSBld2tfdmlld19iYXNlX2FkZChlY29yZV9ldmFzX2dldChtX2luc3Bl Y3RvcldpbmRvdyksIHRvQVBJKHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCkpLCB0b0FQSShp bnNwZWN0b3JQYWdlR3JvdXAoKSksIEV3a1ZpZXdJbXBsOjpMZWdhY3lCZWhhdmlvcik7CiAgICAg RXdrVmlld0ltcGwqIGluc3BlY3RvclZpZXdJbXBsID0gRXdrVmlld0ltcGw6OmZyb21FdmFzT2Jq ZWN0KG1faW5zcGVjdG9yVmlldyk7CiAgICAgaW5zcGVjdG9yVmlld0ltcGwtPnNldFRoZW1lUGF0 aChURVNUX1RIRU1FX0RJUiAiL2RlZmF1bHQuZWRqIik7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlNTU5Y2EwNjM1NmVkYWRjMDQyMjc0MmU3 ZTAzNGQzNDU5OTBmNzZhLi44NmYxYjAyYjBlZDJjMjRkNDQ0NjY1YTE1MWFhMmZlNWY4NjA0MjU3 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzAgQEAKKzIwMTItMTEtMTkgIFRoaWFnbyBNYXJjb3MgUC4gU2FudG9zICA8dGhpYWdv LnNhbnRvc0BpbnRlbC5jb20+CisKKyAgICAgICAgW1dUUl0gV2ViS2l0VGVzdFJ1bm5lciBzaG91 bGQgYmUgYWJsZSB0byBydW4gdGVzdHMgdXNpbmcgZml4ZWQgbGF5b3V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI1MTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXVFIgd2lsbCBub3cgcmVxdWVzdCB0 aGUgY3JlYXRpb24gb2YgYSB2aWV3IHRoYXQgaGFzIGEgcGFnZSB1c2luZworICAgICAgICBmaXhl ZCBsYXlvdXQgZm9yIENTUyBEZXZpY2UgQWRhcHRhdGlvbiB0ZXN0cywgYnV0IHRoaXMgZmVhdHVy ZSBtaWdodAorICAgICAgICBiZSB1c2VkIGluIHRoZSBmdXR1cmUgYnkgYW55IG90aGVyIHRlc3Qg dGhhdCByZXF1aXJlcyBhIG1vYmlsZS1saWtlIHR5cGUKKyAgICAgICAgb2Ygdmlld3BvcnQgKGku ZS4gVmlld3BvcnQgTUVUQSB0ZXN0cyBzaG91bGQgYmUgcG9ydGVkKS4KKworICAgICAgICBUaGUg dmlld3BvcnQgdHlwZSBvZiB0aGUgb3RoZXIgdGVzdHMgcmVtYWlucyB1bmNoYW5nZWQgYW5kIGlz IHJlc3RvcmVkCisgICAgICAgIHdoZW4gdGhlIHJ1bm5lciBsZWF2ZXMgdGhlIGRldmljZS1hZGFw dC8gZm9sZGVyLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcu aDoKKyAgICAgICAgKFBsYXRmb3JtV2ViVmlldyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChXVFIpOgorICAgICAgICAoV1RSOjpzaG91 bGRVc2VGaXhlZExheW91dCk6CisgICAgICAgIChXVFI6OnVwZGF0ZUxheW91dFR5cGUpOgorICAg ICAgICAoV1RSOjpUZXN0SW52b2NhdGlvbjo6aW52b2tlKToKKyAgICAgICAgKiBXZWJLaXRUZXN0 UnVubmVyL2VmbC9QbGF0Zm9ybVdlYlZpZXdFZmwuY3BwOgorICAgICAgICAoV1RSOjpQbGF0Zm9y bVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyk6CisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmll dzo6dmlld1N1cHBvcnRzT3B0aW9ucyk6CisgICAgICAgIChXVFIpOgorCiAyMDEyLTExLTE5ICBW aWF0Y2hlc2xhdiBPc3RhcGVua28gIDx2Lm9zdGFwZW5rb0BzYW1zdW5nLmNvbT4KIAogICAgICAg ICBbRUZMXSBBZGQgZmFsbGJhY2sgZm9yIFdlYmtpdFRlc3RSdW5uZXIgaWYgb3BlbmdsIGlzIG5v dCBhdmFpbGFibGUuCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1BsYXRmb3Jt V2ViVmlldy5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9QbGF0Zm9ybVdlYlZpZXcuaAppbmRl eCA2MGQyZmMxZDUzMTNlZDJhM2QxNjAwMDQ5OWJlMTA4ODZlY2E0YjI5Li5lNjBlM2Y4MTE3M2Jk ODUyZGRiYWVjZDQwZDExNGFmZjA4ZGI5OGE5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1BsYXRmb3JtV2ViVmlldy5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvUGxh dGZvcm1XZWJWaWV3LmgKQEAgLTg5LDcgKzg5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0V2lu ZG93SXNLZXkoYm9vbCBpc0tleSkgeyBtX3dpbmRvd0lzS2V5ID0gaXNLZXk7IH0KICAgICBib29s IHdpbmRvd0lzS2V5KCkgY29uc3QgeyByZXR1cm4gbV93aW5kb3dJc0tleTsgfQogCi0jaWYgUExB VEZPUk0oTUFDKQorI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oRUZMKQogICAgIGJvb2wg dmlld1N1cHBvcnRzT3B0aW9ucyhXS0RpY3Rpb25hcnlSZWYpIGNvbnN0OwogI2Vsc2UKICAgICBi b29sIHZpZXdTdXBwb3J0c09wdGlvbnMoV0tEaWN0aW9uYXJ5UmVmKSBjb25zdCB7IHJldHVybiB0 cnVlOyB9CkBAIC0xMDEsNiArMTAxLDkgQEAgcHJpdmF0ZToKICAgICBQbGF0Zm9ybVdLVmlldyBt X3ZpZXc7CiAgICAgUGxhdGZvcm1XaW5kb3cgbV93aW5kb3c7CiAgICAgYm9vbCBtX3dpbmRvd0lz S2V5OworI2lmIFBMQVRGT1JNKEVGTCkKKyAgICBib29sIG1fdXNpbmdGaXhlZExheW91dDsKKyNl bmRpZgogI2lmIFBMQVRGT1JNKFFUKQogICAgIFFFdmVudExvb3AqIG1fbW9kYWxFdmVudExvb3A7 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRp b24uY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHAKaW5kZXgg ZWYxNzQzN2U0NWJhNWNjNzJhODE1OWNjZGEyMTFiNjFmMWNkOTQ1YS4uYmFkMjRmYTYxODc5MmQ2 YWIyZmM5NzgxY2E5NGM2ODZmODU5NmNiZSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 SW52b2NhdGlvbi5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEw LCAyMDExLCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxMiBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTY1LDkgKzE2NiwzMSBAQCBzdGF0aWMgdm9p ZCB1cGRhdGVUaWxlZERyYXdpbmdGb3JDdXJyZW50VGVzdChjb25zdCBjaGFyKiBwYXRoT3JVUkwp CiAjZW5kaWYKIH0KIAorI2lmIEVOQUJMRShDU1NfREVWSUNFX0FEQVBUQVRJT04pCitzdGF0aWMg Ym9vbCBzaG91bGRVc2VGaXhlZExheW91dChjb25zdCBjaGFyKiBwYXRoT3JVUkwpCit7CisgICAg cmV0dXJuIHN0cnN0cihwYXRoT3JVUkwsICJkZXZpY2UtYWRhcHQvIikgfHwgc3Ryc3RyKHBhdGhP clVSTCwgImRldmljZS1hZGFwdFxcIik7Cit9CisjZW5kaWYKKworc3RhdGljIHZvaWQgdXBkYXRl TGF5b3V0VHlwZShjb25zdCBjaGFyKiBwYXRoT3JVUkwpCit7CisjaWYgRU5BQkxFKENTU19ERVZJ Q0VfQURBUFRBVElPTikKKyAgICBXS1JldGFpblB0cjxXS011dGFibGVEaWN0aW9uYXJ5UmVmPiB2 aWV3T3B0aW9ucyA9IGFkb3B0V0soV0tNdXRhYmxlRGljdGlvbmFyeUNyZWF0ZSgpKTsKKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gdXNlRml4ZWRMYXlvdXRLZXkgPSBhZG9wdFdLKFdLU3Ry aW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJVc2VGaXhlZExheW91dCIpKTsKKyAgICBXS1JldGFp blB0cjxXS0Jvb2xlYW5SZWY+IHVzZUZpeGVkTGF5b3V0VmFsdWUgPSBhZG9wdFdLKFdLQm9vbGVh bkNyZWF0ZShzaG91bGRVc2VGaXhlZExheW91dChwYXRoT3JVUkwpKSk7CisgICAgV0tEaWN0aW9u YXJ5QWRkSXRlbSh2aWV3T3B0aW9ucy5nZXQoKSwgdXNlRml4ZWRMYXlvdXRLZXkuZ2V0KCksIHVz ZUZpeGVkTGF5b3V0VmFsdWUuZ2V0KCkpOworCisgICAgVGVzdENvbnRyb2xsZXI6OnNoYXJlZCgp LmVuc3VyZVZpZXdTdXBwb3J0c09wdGlvbnModmlld09wdGlvbnMuZ2V0KCkpOworI2Vsc2UKKyAg ICBVTlVTRURfUEFSQU0ocGF0aE9yVVJMKTsKKyNlbmRpZgorfQorCiB2b2lkIFRlc3RJbnZvY2F0 aW9uOjppbnZva2UoKQogewogICAgIHNpemVXZWJWaWV3Rm9yQ3VycmVudFRlc3QobV9wYXRoT3JV UkwuY19zdHIoKSk7CisgICAgdXBkYXRlTGF5b3V0VHlwZShtX3BhdGhPclVSTC5jX3N0cigpKTsK ICAgICB1cGRhdGVUaWxlZERyYXdpbmdGb3JDdXJyZW50VGVzdChtX3BhdGhPclVSTC5jX3N0cigp KTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBtZXNzYWdlTmFtZSA9IGFkb3B0V0so V0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIkJlZ2luVGVzdCIpKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL2VmbC9QbGF0Zm9ybVdlYlZpZXdFZmwuY3BwCmluZGV4IDM2NGZi ZmEwNWIxM2YwMGExMjJiY2FkODBmNzhkMjExNGRkYTYwYWMuLmE1NTI0MmRjMTEyZDdmODg2MmJl ZDRiYzg1MWJhMmE1MWY3NTlhMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv ZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9l ZmwvUGxhdGZvcm1XZWJWaWV3RWZsLmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmln aHQgKEMpIDIwMTIgU2Ftc3VuZyBFbGVjdHJvbmljcworICogQ29weXJpZ2h0IChDKSAyMDEyIElu dGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGlicmFy eSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1v ZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGlj CkBAIC00OCwxMSArNDksMTkgQEAgc3RhdGljIEVjb3JlX0V2YXMqIGluaXRFY29yZUV2YXMoKQog ICAgIHJldHVybiBlY29yZUV2YXM7CiB9CiAKLVBsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJW aWV3KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXAsIFdLRGlj dGlvbmFyeVJlZiAvKm9wdGlvbnMqLykKK1BsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3 KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXAsIFdLRGljdGlv bmFyeVJlZiBvcHRpb25zKQogeworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB1c2VGaXhl ZExheW91dEtleShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiVXNlRml4 ZWRMYXlvdXQiKSk7CisgICAgbV91c2luZ0ZpeGVkTGF5b3V0ID0gb3B0aW9ucyA/IFdLQm9vbGVh bkdldFZhbHVlKHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4oV0tEaWN0aW9uYXJ5R2V0SXRlbUZv cktleShvcHRpb25zLCB1c2VGaXhlZExheW91dEtleS5nZXQoKSkpKSA6IGZhbHNlOworCiAgICAg bV93aW5kb3cgPSBpbml0RWNvcmVFdmFzKCk7CiAgICAgRXZhcyogZXZhcyA9IGVjb3JlX2V2YXNf Z2V0KG1fd2luZG93KTsKLSAgICBtX3ZpZXcgPSB0b0ltcGwoV0tWaWV3Q3JlYXRlKGV2YXMsIGNv bnRleHQsIHBhZ2VHcm91cCkpOworCisgICAgaWYgKG1fdXNpbmdGaXhlZExheW91dCkgeworICAg ICAgICBtX3ZpZXcgPSB0b0ltcGwoV0tWaWV3Q3JlYXRlV2l0aEZpeGVkTGF5b3V0KGV2YXMsIGNv bnRleHQsIHBhZ2VHcm91cCkpOworICAgICAgICBldmFzX29iamVjdF9yZXNpemUobV92aWV3LCA4 MDAsIDYwMCk7CisgICAgfSBlbHNlCisgICAgICAgIG1fdmlldyA9IHRvSW1wbChXS1ZpZXdDcmVh dGUoZXZhcywgY29udGV4dCwgcGFnZUdyb3VwKSk7CiAKICAgICBld2tfdmlld190aGVtZV9zZXQo bV92aWV3LCBUSEVNRV9ESVIiL2RlZmF1bHQuZWRqIik7CiAgICAgbV93aW5kb3dJc0tleSA9IGZh bHNlOwpAQCAtMTIwLDUgKzEyOSwxMiBAQCBXS1JldGFpblB0cjxXS0ltYWdlUmVmPiBQbGF0Zm9y bVdlYlZpZXc6OndpbmRvd1NuYXBzaG90SW1hZ2UoKQogICAgIHJldHVybiAwOwogfQogCitib29s IFBsYXRmb3JtV2ViVmlldzo6dmlld1N1cHBvcnRzT3B0aW9ucyhXS0RpY3Rpb25hcnlSZWYgb3B0 aW9ucykgY29uc3QKK3sKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gdXNlRml4ZWRMYXlv dXRLZXkoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIlVzZUZpeGVkTGF5 b3V0IikpOworCisgICAgcmV0dXJuIG1fdXNpbmdGaXhlZExheW91dCA9PSAob3B0aW9ucyA/IFdL Qm9vbGVhbkdldFZhbHVlKHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4oV0tEaWN0aW9uYXJ5R2V0 SXRlbUZvcktleShvcHRpb25zLCB1c2VGaXhlZExheW91dEtleS5nZXQoKSkpKSA6IGZhbHNlKTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV1RSCiAK