27896 2009-07-31 15:37:45 -0700 Favicons are still loaded when automatic image loading is disabled. 2009-07-31 16:22:32 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson webkit-unassigned oldest_to_newest 136274 0 beidson 2009-07-31 15:37:45 -0700 Favicons are still loaded when automatic image loading is disabled. 136275 1 beidson 2009-07-31 15:37:59 -0700 In radar as <rdar://problem/6973106> 136286 2 33905 beidson 2009-07-31 15:59:17 -0700 Created attachment 33905 Fix, DRT enhancements, and layout test. 136290 3 33905 sullivan 2009-07-31 16:13:44 -0700 Comment on attachment 33905 Fix, DRT enhancements, and layout test. Maybe add a line that explains why site icons are tied together with images on the page in this way, such as "People who want to avoid loading images generally want to avoid loading all images." 136294 4 beidson 2009-07-31 16:22:32 -0700 Sending LayoutTests/ChangeLog Adding LayoutTests/http/tests/misc/favicon-loads-with-images-disabled-expected.txt Adding LayoutTests/http/tests/misc/favicon-loads-with-images-disabled.html Sending WebCore/ChangeLog Sending WebCore/loader/FrameLoader.cpp Sending WebKitTools/ChangeLog Sending WebKitTools/DumpRenderTree/LayoutTestController.cpp Sending WebKitTools/DumpRenderTree/LayoutTestController.h Sending WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp Sending WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm Sending WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm Sending WebKitTools/DumpRenderTree/qt/jsobjects.cpp Sending WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp Sending WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp Transmitting file data .............. Committed revision 46646. 33905 2009-07-31 15:59:17 -0700 2009-07-31 16:13:44 -0700 Fix, DRT enhancements, and layout test. patch.txt text/plain 12902 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDctMzEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82OTczMTA2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI3ODk2CisgICAgICAgIEZhdmljb25zIGFyZSBzdGlsbCBsb2FkZWQgd2hlbiBh dXRvbWF0aWMgaW1hZ2UgbG9hZGluZyBpcyBkaXNhYmxlZC4KKworICAgICAgICBUZXN0OiBodHRw L3Rlc3RzL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRoLWltYWdlcy1kaXNhYmxlZC5odG1sCisKKyAg ICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OnN0YXJ0SWNvbkxvYWRlcik6IEFmdGVyIGNvbW1pdHRpbmcgdGhlIFVSTCBtYXBwaW5n LCBkb24ndCBhY3R1YWxseSAKKyAgICAgICAgICBwZXJmb3JtIHRoZSBsb2FkIGlmIGltYWdlcyBz aG91bGRuJ3QgYmUgbG9hZGluZy4KKwogMjAwOS0wNy0zMCAgSmVyZW15IE9ybG93ICA8am9ybG93 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KSW5kZXg6 IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDQ2NjQ0KQorKysgV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTE0LDYgKzExMTQsMTEgQEAgdm9p ZCBGcmFtZUxvYWRlcjo6c3RhcnRJY29uTG9hZGVyKCkKICAgICAgICAgfQogICAgIH0KIAorICAg IC8vIE5vdyB0aGF0IHdlJ3ZlIGFjY291bnRlZCBmb3IgVVJMIG1hcHBpbmcsIGF2b2lkIHN0YXJ0 aW5nIHRoZSBuZXR3b3JrIGxvYWQgaWYgaW1hZ2VzIGFyZW4ndCBzZXQgdG8gZGlzcGxheSBhdXRv bWF0aWNhbGx5LgorICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7 CisgICAgaWYgKHNldHRpbmdzICYmICFzZXR0aW5ncy0+bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5 KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIFRoaXMgaXMgZWl0aGVyIGEgcmVsb2FkIG9y IHRoZSBpY29uIGRhdGFiYXNlIHNhaWQgInllcywgbG9hZCB0aGUgaWNvbiIsIHNvIGtpY2sgb2Zm IHRoZSBsb2FkIQogICAgIGlmICghbV9pY29uTG9hZGVyKQogICAgICAgICBtX2ljb25Mb2FkZXIu c2V0KEljb25Mb2FkZXI6OmNyZWF0ZShtX2ZyYW1lKS5yZWxlYXNlKCkpOwpJbmRleDogV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gNDY2NDQpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwzMCBAQAorMjAwOS0wNy0zMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzY5NzMxMDY+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjc4OTYKKyAgICAgICAgRmF2aWNvbnMgYXJlIHN0aWxsIGxvYWRlZCB3aGVuIGF1 dG9tYXRpYyBpbWFnZSBsb2FkaW5nIGlzIGRpc2FibGVkLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoZGlzYWJsZUltYWdlTG9h ZGluZ0NhbGxiYWNrKToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzdGF0aWNGdW5j dGlvbnMpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmg6 CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAg ICAgIChyZXNldFdlYlZpZXdUb0NvbnNpc3RlbnRTdGF0ZUJlZm9yZVRlc3RpbmcpOgorICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbToKKyAgICAg ICAgKExheW91dFRlc3RDb250cm9sbGVyOjpkaXNhYmxlSW1hZ2VMb2FkaW5nKToKKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChyZXNl dFdlYlZpZXdUb0NvbnNpc3RlbnRTdGF0ZUJlZm9yZVRlc3RpbmcpOgorICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL3dpbi9MYXlvdXRUZXN0Q29udHJvbGxlcldpbi5jcHA6CisgICAgICAgIChMYXlv dXRUZXN0Q29udHJvbGxlcjo6ZGlzYWJsZUltYWdlTG9hZGluZyk6CisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJHdGsuY3BwOgorICAgICAgICAoTGF5 b3V0VGVzdENvbnRyb2xsZXI6OmRpc2FibGVJbWFnZUxvYWRpbmcpOiBTdHViYmVkIGZvciBub3cu CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcDoKKyAgICAgICAgKExh eW91dFRlc3RDb250cm9sbGVyOjpkaXNhYmxlSW1hZ2VMb2FkaW5nKTogRGl0dG8uCisKIDIwMDkt MDctMzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhdmlkIEtpbHplci4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91 dFRlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ2NjQ0KQorKysgV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yODgsNiArMjg4LDE1IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGRlY29kZUhvc3ROYW1l Q2FsbGJhY2sKICAgICByZXR1cm4gSlNWYWx1ZU1ha2VTdHJpbmcoY29udGV4dCwgZGVjb2RlZEhv c3ROYW1lLmdldCgpKTsKIH0KIAorc3RhdGljIEpTVmFsdWVSZWYgZGlzYWJsZUltYWdlTG9hZGlu Z0NhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlNP YmplY3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFsdWVS ZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKK3sKKyAgICAvLyBIYXMgbWFj IGltcGxlbWVudGF0aW9uLCBuZWVkcyB3aW5kb3dzIGltcGxlbWVudGF0aW9uCisgICAgTGF5b3V0 VGVzdENvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBzdGF0aWNfY2FzdDxMYXlvdXRUZXN0Q29udHJv bGxlcio+KEpTT2JqZWN0R2V0UHJpdmF0ZSh0aGlzT2JqZWN0KSk7CisgICAgY29udHJvbGxlci0+ ZGlzYWJsZUltYWdlTG9hZGluZygpOworICAgIAorICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVm aW5lZChjb250ZXh0KTsKK30KKwogc3RhdGljIEpTVmFsdWVSZWYgZGlzcGF0Y2hQZW5kaW5nTG9h ZFJlcXVlc3RzQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0 aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3Qg SlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogewogICAgIC8v IEhhcyBtYWMgaW1wbGVtZW50YXRpb24sIG5lZWRzIHdpbmRvd3MgaW1wbGVtZW50YXRpb24KQEAg LTkwMCw2ICs5MDksNyBAQCBKU1N0YXRpY0Z1bmN0aW9uKiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 CiAgICAgICAgIHsgImNsZWFyQmFja0ZvcndhcmRMaXN0IiwgY2xlYXJCYWNrRm9yd2FyZExpc3RD YWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmli dXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJjbGVhclBlcnNpc3RlbnRVc2VyU3R5bGVTaGVl dCIsIGNsZWFyUGVyc2lzdGVudFVzZXJTdHlsZVNoZWV0Q2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0 cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAg ICAgeyAiZGVjb2RlSG9zdE5hbWUiLCBkZWNvZGVIb3N0TmFtZUNhbGxiYWNrLCBrSlNQcm9wZXJ0 eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisg ICAgICAgIHsgImRpc2FibGVJbWFnZUxvYWRpbmciLCBkaXNhYmxlSW1hZ2VMb2FkaW5nQ2FsbGJh Y2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURv bnREZWxldGUgfSwKICAgICAgICAgeyAiZGlzcGF0Y2hQZW5kaW5nTG9hZFJlcXVlc3RzIiwgZGlz cGF0Y2hQZW5kaW5nTG9hZFJlcXVlc3RzQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVh ZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiZGlz cGxheSIsIGRpc3BsYXlDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtK U1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJkdW1wQXNUZXh0Iiwg ZHVtcEFzVGV4dENhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJv cGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmgJKHJldmlzaW9uIDQ2NjQ0KQorKysg V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhclBlcnNpc3Rl bnRVc2VyU3R5bGVTaGVldCgpOwogICAgIEpTU3RyaW5nUmVmIGNvcHlEZWNvZGVkSG9zdE5hbWUo SlNTdHJpbmdSZWYgbmFtZSk7CiAgICAgSlNTdHJpbmdSZWYgY29weUVuY29kZWRIb3N0TmFtZShK U1N0cmluZ1JlZiBuYW1lKTsKKyAgICB2b2lkIGRpc2FibGVJbWFnZUxvYWRpbmcoKTsKICAgICB2 b2lkIGRpc3BhdGNoUGVuZGluZ0xvYWRSZXF1ZXN0cygpOwogICAgIHZvaWQgZGlzcGxheSgpOwog ICAgIHZvaWQgZXhlY0NvbW1hbmQoSlNTdHJpbmdSZWYgbmFtZSwgSlNTdHJpbmdSZWYgdmFsdWUp OwpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9s bGVyR3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsv TGF5b3V0VGVzdENvbnRyb2xsZXJHdGsuY3BwCShyZXZpc2lvbiA0NjY0NCkKKysrIFdlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0Q29udHJvbGxlckd0ay5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI1OSw2ICsyNTksMTIgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0QXV0aG9yQW5kVQogICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQKIH0KIAordm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6ZGlzYWJsZUltYWdlTG9hZGluZygpCit7CisgICAgLy8gRklYTUU6IElt cGxlbWVudCBmb3IgdGVzdGluZyBmaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNzg5NgorICAgIC8vIEFsc28gbmVlZCB0byBtYWtlIHN1cmUgaW1hZ2UgbG9h ZGluZyBpcyByZS1lbmFibGVkIGZvciBlYWNoIG5ldyB0ZXN0LgorfQorCiB2b2lkIExheW91dFRl c3RDb250cm9sbGVyOjpzZXRJY29uRGF0YWJhc2VFbmFibGVkKGJvb2wgZmxhZykKIHsKICAgICAv LyBGSVhNRTogaW1wbGVtZW50CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMv RHVtcFJlbmRlclRyZWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCShyZXZpc2lvbiA0NjY0NCkKKysrIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQkod29ya2luZyBjb3B5KQpAQCAt MTA1NCw2ICsxMDU0LDcgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJWaWV3VG9Db25zaXN0ZW50U3Rh dAogICAgIFtwcmVmZXJlbmNlcyBzZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQ6 WUVTXTsKICAgICBbcHJlZmVyZW5jZXMgc2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZDpOT107CiAg ICAgW3ByZWZlcmVuY2VzIHNldFhTU0F1ZGl0b3JFbmFibGVkOk5PXTsKKyAgICBbcHJlZmVyZW5j ZXMgc2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5OllFU107CiAKICAgICBpZiAocGVyc2lzdGVu dFVzZXJTdHlsZVNoZWV0TG9jYXRpb24pIHsKICAgICAgICAgW3ByZWZlcmVuY2VzIHNldFVzZXJT dHlsZVNoZWV0TG9jYXRpb246W05TVVJMIFVSTFdpdGhTdHJpbmc6KE5TU3RyaW5nICopKHBlcnNp c3RlbnRVc2VyU3R5bGVTaGVldExvY2F0aW9uLmdldCgpKV1dOwpJbmRleDogV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1h Yy5tbQkocmV2aXNpb24gNDY2NDQpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMv TGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4Myw2ICsyODMs MTEgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlUwogICAgIFtbV2Vi UHJlZmVyZW5jZXMgc3RhbmRhcmRQcmVmZXJlbmNlc10gc2V0VXNlclN0eWxlU2hlZXRMb2NhdGlv bjp1cmxdOwogfQogCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpkaXNhYmxlSW1hZ2VMb2Fk aW5nKCkKK3sKKyAgICBbW1dlYlByZWZlcmVuY2VzIHN0YW5kYXJkUHJlZmVyZW5jZXNdIHNldExv YWRzSW1hZ2VzQXV0b21hdGljYWxseTpOT107Cit9CisKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xs ZXI6OmRpc3BhdGNoUGVuZGluZ0xvYWRSZXF1ZXN0cygpCiB7CiAgICAgW1ttYWluRnJhbWUgd2Vi Vmlld10gX2Rpc3BhdGNoUGVuZGluZ0xvYWRSZXF1ZXN0c107CkluZGV4OiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAJKHJldmlzaW9uIDQ2NjQ0KQorKysgV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzA0LDYgKzMwNCwxMiBAQCB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bnVtYmVy T2ZBCiAgICAgcmV0dXJuIHF0X2RydF9udW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoZnJhbWUpOwog fQogCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpkaXNhYmxlSW1hZ2VMb2FkaW5nKCkKK3sK KyAgICAvLyBGSVhNRTogSW1wbGVtZW50IGZvciB0ZXN0aW5nIGZpeCBmb3IgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3ODk2CisgICAgLy8gQWxzbyBuZWVkIHRvIG1h a2Ugc3VyZSBpbWFnZSBsb2FkaW5nIGlzIHJlLWVuYWJsZWQgZm9yIGVhY2ggbmV3IHRlc3QuCit9 CisKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRpc3BhdGNoUGVuZGluZ0xvYWRSZXF1ZXN0 cygpCiB7CiAgICAgLy8gRklYTUU6IEltcGxlbWVudCBmb3IgdGVzdGluZyBmaXggZm9yIDY3Mjc0 OTUKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5k ZXJUcmVlLmNwcAkocmV2aXNpb24gNDY2NDQpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NzcsNiArNjc3LDcg QEAgc3RhdGljIHZvaWQgcmVzZXRXZWJWaWV3VG9Db25zaXN0ZW50U3RhdAogICAgIGlmIChTVUND RUVERUQod2ViVmlldy0+cHJlZmVyZW5jZXMoJnByZWZlcmVuY2VzKSkpIHsKICAgICAgICAgcHJl ZmVyZW5jZXMtPnNldFByaXZhdGVCcm93c2luZ0VuYWJsZWQoRkFMU0UpOwogICAgICAgICBwcmVm ZXJlbmNlcy0+c2V0SmF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxseShUUlVFKTsK KyAgICAgICAgcHJlZmVyZW5jZXMtPnNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShUUlVFKTsK IAogICAgICAgICBpZiAocGVyc2lzdGVudFVzZXJTdHlsZVNoZWV0TG9jYXRpb24pIHsKICAgICAg ICAgICAgIFZlY3Rvcjx3Y2hhcl90PiB1cmxDaGFyYWN0ZXJzKENGU3RyaW5nR2V0TGVuZ3RoKHBl cnNpc3RlbnRVc2VyU3R5bGVTaGVldExvY2F0aW9uLmdldCgpKSk7CkluZGV4OiBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xsZXJXaW4uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9MYXlvdXRUZXN0Q29udHJvbGxl cldpbi5jcHAJKHJldmlzaW9uIDQ2NjQ0KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv d2luL0xheW91dFRlc3RDb250cm9sbGVyV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxLDYg KzEyMSwxOSBAQCBKU1N0cmluZ1JlZiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y29weUVuCiAgICAg cmV0dXJuIDA7CiB9CiAKK3ZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRpc2FibGVJbWFnZUxv YWRpbmcoKQoreworICAgIENPTVB0cjxJV2ViVmlldz4gd2ViVmlldzsKKyAgICBpZiAoRkFJTEVE KGZyYW1lLT53ZWJWaWV3KCZ3ZWJWaWV3KSkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBD T01QdHI8SVdlYlByZWZlcmVuY2VzPiBwcmVmZXJlbmNlczsKKyAgICBpZiAoRkFJTEVEKHdlYlZp ZXctPnByZWZlcmVuY2VzKCZwcmVmZXJlbmNlcykpKQorICAgICAgICByZXR1cm47CisgICAgCisg ICAgcHJlZmVyZW5jZXMtPnNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShGQUxTRSk7Cit9CisK IHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRpc3BhdGNoUGVuZGluZ0xvYWRSZXF1ZXN0cygp CiB7CiAgICAgLy8gRklYTUU6IEltcGxlbWVudCBmb3IgdGVzdGluZyBmaXggZm9yIDY3Mjc0OTUK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2NjQ0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMzEgIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTczMTA2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI3ODk2CisgICAgICAgIEZhdmljb25zIGFyZSBzdGlsbCBs b2FkZWQgd2hlbiBhdXRvbWF0aWMgaW1hZ2UgbG9hZGluZyBpcyBkaXNhYmxlZC4KKworICAgICAg ICAqIGh0dHAvdGVzdHMvbWlzYy9mYXZpY29uLWxvYWRzLXdpdGgtaW1hZ2VzLWRpc2FibGVkLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9h ZHMtd2l0aC1pbWFnZXMtZGlzYWJsZWQuaHRtbDogQWRkZWQuCisKIDIwMDktMDctMzEgIEplcmVt eSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRh bSBCYXJ0aC4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy9mYXZpY29uLWxvYWRz LXdpdGgtaW1hZ2VzLWRpc2FibGVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRoLWltYWdlcy1kaXNhYmxlZC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2Mv ZmF2aWNvbi1sb2Fkcy13aXRoLWltYWdlcy1kaXNhYmxlZC1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsNyBAQAorPHVua25vd24+IC0gZGlkRmluaXNoTG9hZGluZworaHR0cDov LzEyNy4wLjAuMTo4MDAwL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRoLWltYWdlcy1kaXNhYmxlZC5o dG1sIC0gd2lsbFNlbmRSZXF1ZXN0IDxOU1VSTFJlcXVlc3QgVVJMIGh0dHA6Ly8xMjcuMC4wLjE6 ODAwMC9taXNjL2Zhdmljb24tbG9hZHMtd2l0aC1pbWFnZXMtZGlzYWJsZWQuaHRtbCwgbWFpbiBk b2N1bWVudCBVUkwgaHR0cDovLzEyNy4wLjAuMTo4MDAwL21pc2MvZmF2aWNvbi1sb2Fkcy13aXRo LWltYWdlcy1kaXNhYmxlZC5odG1sLCBodHRwIG1ldGhvZCBHRVQ+IHJlZGlyZWN0UmVzcG9uc2Ug KG51bGwpCitodHRwOi8vMTI3LjAuMC4xOjgwMDAvbWlzYy9mYXZpY29uLWxvYWRzLXdpdGgtaW1h Z2VzLWRpc2FibGVkLmh0bWwgLSB3aWxsQ2FjaGVSZXNwb25zZTogY2FsbGVkCitodHRwOi8vMTI3 LjAuMC4xOjgwMDAvbWlzYy9mYXZpY29uLWxvYWRzLXdpdGgtaW1hZ2VzLWRpc2FibGVkLmh0bWwg LSBkaWRSZWNlaXZlUmVzcG9uc2UgPE5TVVJMUmVzcG9uc2UgaHR0cDovLzEyNy4wLjAuMTo4MDAw L21pc2MvZmF2aWNvbi1sb2Fkcy13aXRoLWltYWdlcy1kaXNhYmxlZC5odG1sLCBodHRwIHN0YXR1 cyBjb2RlIDIwMD4KK1JhZGFyIDY5NzMxMDYgYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNzg5NiAtIEZhdmljb25zIHN0aWxsIGxvYWQgd2hlbiBhdXRvbWF0aWMg aW1hZ2UgbG9hZGluZyBpcyBkaXNhYmxlZC4KK1RoaXMgdGVzdCB1c2VzIERSVCdzIHJlc291cmNl IGxvYWQgZGVsZWdhdGUgY2FsbGJhY2sgbW9kZSB0byBzZWUgaWYgdGhlIGZhdmljb24gaXMgbG9h ZGVkIGV2ZW4gd2hlbiBpbWFnZSBsb2FkaW5nIGlzIG9mZi4KKwpJbmRleDogTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0aC1pbWFnZXMtZGlzYWJsZWQuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvZmF2aWNvbi1sb2Fkcy13 aXRoLWltYWdlcy1kaXNhYmxlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9taXNjL2Zhdmljb24tbG9hZHMtd2l0aC1pbWFnZXMtZGlzYWJsZWQuaHRtbAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSwyMSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitmdW5j dGlvbiBydW5UZXN0KCkKK3sKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7 CisJCWxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKwkJbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpOworICAgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5zZXRJY29uRGF0YWJhc2VFbmFibGVkKHRydWUpOworCQlsYXlvdXRUZXN0Q29udHJv bGxlci5kaXNhYmxlSW1hZ2VMb2FkaW5nKCk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVy LnF1ZXVlUmVsb2FkKCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8bGluayByZWw9Imljb24iIGhy ZWY9InJlc291cmNlcy9mYXZpY29uLmljbyIgdHlwZT0iaW1hZ2UveC1pY29uIj4KKzwvaGVhZD4K Kzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KK1JhZGFyIDY5NzMxMDYgYW5kIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzg5NiAtIEZhdmljb25zIHN0aWxsIGxvYWQg d2hlbiBhdXRvbWF0aWMgaW1hZ2UgbG9hZGluZyBpcyBkaXNhYmxlZC48YnI+CitUaGlzIHRlc3Qg dXNlcyBEUlQncyByZXNvdXJjZSBsb2FkIGRlbGVnYXRlIGNhbGxiYWNrIG1vZGUgdG8gc2VlIGlm IHRoZSBmYXZpY29uIGlzIGxvYWRlZCBldmVuIHdoZW4gaW1hZ2UgbG9hZGluZyBpcyBvZmYuPGJy PgorPC9ib2R5PgorPC9odG1sPgo=