40832 2010-06-18 07:59:53 -0700 [GTK] The url passed to the WebView during layout tests is invalid 2010-06-24 15:07:53 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 40833 1 mrobinson webkit-unassigned oldest_to_newest 239915 0 mrobinson 2010-06-18 07:59:53 -0700 Instead of passing file:///full/url/to/test.html DumpRenderTree passes file://relative/path/to/file.html. 239918 1 mrobinson 2010-06-18 08:01:08 -0700 Further information: While the page loads fine, accessing the URI either via webkit_web_view_get_uri or webkit_web_frame_get_uri returns the original malformed URL. 239961 2 59118 mrobinson 2010-06-18 09:07:33 -0700 Created attachment 59118 Patch for this issue + a small cleanup 242645 3 59118 xan.lopez 2010-06-24 13:40:32 -0700 Comment on attachment 59118 Patch for this issue + a small cleanup >- bool isSVGW3CTest = (gLayoutTestController->testPathOrURL().find("svg/W3C-SVG-1.1") != string::npos); >+ bool isSVGW3CTest = (testURL.find("svg/W3C-SVG-1.1") != string::npos); No need for that parenthesis. 242682 4 mrobinson 2010-06-24 15:07:53 -0700 Committed r61790: <http://trac.webkit.org/changeset/61790> 59118 2010-06-18 09:07:33 -0700 2010-06-24 13:40:32 -0700 Patch for this issue + a small cleanup bug-40832-20100618090731.patch text/plain 6099 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYjk5MzZkNDJhMWQwYmE0MzU0YWQyM2M0YjQ1NjU0OWVkOGYwNmI1Li44NjI5ZGI2 MDJlZDhiNWZkYWM5M2IxNzcyYmI4OGUxYzc4MDcwYWEwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMDYtMTggIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFRoZSB1 cmwgcGFzc2VkIHRvIHRoZSBXZWJWaWV3IGR1cmluZyBsYXlvdXQgdGVzdHMgaXMgaW52YWxpZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4MzIKKwor ICAgICAgICBTZXQgdGhlIHRlc3QgVVJMIHRvIHRoZSBmdWxsIHJlYWwgZmlsZSBVUkwgYW5kIGRv IGEgc21hbGwgY2xlYW51cC4KKyAgICAgICAgUHJldmlvdXNseSBhIFVSTCBsaWtlIGZpbGU6Ly9y ZWxhdGl2ZS9wYXRoL3RvL3Rlc3QuaHRtbCB3YXMgcGFzc2VkCisgICAgICAgIHRvIHRoZSBXZWJW aWV3LiBUaGlzIG1hbGZvcm1lZCBmaWxlIFVSTCB3b3VsZCBiZSByZXR1cm5lZCBieQorICAgICAg ICB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VybCBhbmQgd2Via2l0X3dlYl9mcmFtZV9nZXRfdXJsLgor CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAg ICAgKHNob3VsZExvZ0ZyYW1lTG9hZERlbGVnYXRlcyk6IENoYW5nZSB0byB0YWtlIGEgY29uc3Qg c3RyaW5nJiBhcyB0aGUgYXJndW1lbnQuCisgICAgICAgIChzaG91bGRPcGVuV2ViSW5zcGVjdG9y KTogQ2hhbmdlIHRvIHRha2UgYSBjb25zdCBzdHJpbmcmIGFzIHRoZSBhcmd1bWVudC4KKyAgICAg ICAgKHNob3VsZEVuYWJsZURldmVsb3BlckV4dHJhcyk6IENoYW5nZSB0byB0YWtlIGEgY29uc3Qg c3RyaW5nJiBhcyB0aGUgYXJndW1lbnQuCisgICAgICAgIChydW5UZXN0KTogUGFzcyB0aGUgZnVs bCBmaWxlOi8vIFVSTCB0byB0aGUgdmlldy4gUmVtb3ZlIHRoZSBzdXBlcmZsdW91cyB1cmwgdmFy aWFibGUuCisKIDIwMTAtMDYtMTcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDRmNzRiYWNhOTEyYjMzZDVk Yjc3MzhkM2MwOWQwNGE0NWUyZTYwYjUuLmQ3OWFkZGY3NTYxNGU2MDJkZjJkZDAwMTJlZjk3NjA0 N2M5MWI4ZTYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1w UmVuZGVyVHJlZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBS ZW5kZXJUcmVlLmNwcApAQCAtMiw2ICsyLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNyBFcmlj IFNlaWRlbCA8ZXJpY0B3ZWJraXQub3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA4IEFscCBUb2tl ciA8YWxwQG51YW50aS5jb20+CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgSmFuIEFsb256byA8am1h bG9uem9AZ21haWwuY29tPgorICogQ29weXJpZ2h0IChDKSAyMDEwIElnYWxpYSBTLkwuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTk2LDMwICs5NywxOSBAQCBzdGF0aWMgV2Vi S2l0V2ViSGlzdG9yeUl0ZW0qIHByZXZUZXN0QkZJdGVtID0gTlVMTDsKIAogY29uc3QgdW5zaWdu ZWQgaGlzdG9yeUl0ZW1JbmRlbnQgPSA4OwogCi1zdGF0aWMgZ2NoYXIqIGF1dG9jb3JyZWN0VVJM KGNvbnN0IGdjaGFyKiB1cmwpCitzdGF0aWMgYm9vbCBzaG91bGRMb2dGcmFtZUxvYWREZWxlZ2F0 ZXMoY29uc3Qgc3RyaW5nJiBwYXRoT3JVUkwpCiB7Ci0gICAgaWYgKHN0cm5jbXAoImh0dHA6Ly8i LCB1cmwsIDcpICE9IDAgJiYgc3RybmNtcCgiaHR0cHM6Ly8iLCB1cmwsIDgpICE9IDApIHsKLSAg ICAgICAgR1N0cmluZyogc3RyaW5nID0gZ19zdHJpbmdfbmV3KCJmaWxlOi8vIik7Ci0gICAgICAg IGdfc3RyaW5nX2FwcGVuZChzdHJpbmcsIHVybCk7Ci0gICAgICAgIHJldHVybiBnX3N0cmluZ19m cmVlKHN0cmluZywgRkFMU0UpOwotICAgIH0KLQotICAgIHJldHVybiBnX3N0cmR1cCh1cmwpOwot fQotCi1zdGF0aWMgYm9vbCBzaG91bGRMb2dGcmFtZUxvYWREZWxlZ2F0ZXMoY29uc3QgY2hhciog cGF0aE9yVVJMKQotewotICAgIHJldHVybiBzdHJzdHIocGF0aE9yVVJMLCAibG9hZGluZy8iKTsK KyAgICByZXR1cm4gcGF0aE9yVVJMLmZpbmQoImxvYWRpbmcvIikgIT0gc3RyaW5nOjpucG9zOwog fQogCi1zdGF0aWMgYm9vbCBzaG91bGRPcGVuV2ViSW5zcGVjdG9yKGNvbnN0IGNoYXIqIHBhdGhP clVSTCkKK3N0YXRpYyBib29sIHNob3VsZE9wZW5XZWJJbnNwZWN0b3IoY29uc3Qgc3RyaW5nJiBw YXRoT3JVUkwpCiB7Ci0gICAgcmV0dXJuIHN0cnN0cihwYXRoT3JVUkwsICJpbnNwZWN0b3IvIik7 CisgICAgcmV0dXJuIHBhdGhPclVSTC5maW5kKCJpbnNwZWN0b3IvIikgIT0gc3RyaW5nOjpucG9z OwogfQogCi1zdGF0aWMgYm9vbCBzaG91bGRFbmFibGVEZXZlbG9wZXJFeHRyYXMoY29uc3QgY2hh ciogcGF0aE9yVVJMKQorc3RhdGljIGJvb2wgc2hvdWxkRW5hYmxlRGV2ZWxvcGVyRXh0cmFzKGNv bnN0IHN0cmluZyYgcGF0aE9yVVJMKQogewotICAgIHJldHVybiBzaG91bGRPcGVuV2ViSW5zcGVj dG9yKHBhdGhPclVSTCkgfHwgc3Ryc3RyKHBhdGhPclVSTCwgImluc3BlY3Rvci1lbmFibGVkLyIp OworICAgIHJldHVybiBzaG91bGRPcGVuV2ViSW5zcGVjdG9yKHBhdGhPclVSTCkgfHwgcGF0aE9y VVJMLmZpbmQoImluc3BlY3Rvci1lbmFibGVkLyIpICE9IHN0cmluZzo6bnBvczsKIH0KIAogdm9p ZCBkdW1wRnJhbWVTY3JvbGxQb3NpdGlvbihXZWJLaXRXZWJGcmFtZSogZnJhbWUpCkBAIC00NzQs MTcgKzQ2NCwyMyBAQCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgdGVzdFBhdGhP clVSTCkKICAgICBBU1NFUlQoIXRlc3RQYXRoT3JVUkwuZW1wdHkoKSk7CiAKICAgICAvLyBMb29r IGZvciAiJyIgYXMgYSBzZXBhcmF0b3IgYmV0d2VlbiB0aGUgcGF0aCBvciBVUkwsIGFuZCB0aGUg cGl4ZWwgZHVtcCBoYXNoIHRoYXQgZm9sbG93cy4KLSAgICBzdHJpbmcgcGF0aE9yVVJMKHRlc3RQ YXRoT3JVUkwpOworICAgIHN0cmluZyB0ZXN0VVJMKHRlc3RQYXRoT3JVUkwpOwogICAgIHN0cmlu ZyBleHBlY3RlZFBpeGVsSGFzaDsKLQotICAgIHNpemVfdCBzZXBhcmF0b3JQb3MgPSBwYXRoT3JV UkwuZmluZCgiJyIpOworICAgIHNpemVfdCBzZXBhcmF0b3JQb3MgPSB0ZXN0VVJMLmZpbmQoIici KTsKICAgICBpZiAoc2VwYXJhdG9yUG9zICE9IHN0cmluZzo6bnBvcykgewotICAgICAgICBwYXRo T3JVUkwgPSBzdHJpbmcodGVzdFBhdGhPclVSTCwgMCwgc2VwYXJhdG9yUG9zKTsKKyAgICAgICAg dGVzdFVSTCA9IHN0cmluZyh0ZXN0UGF0aE9yVVJMLCAwLCBzZXBhcmF0b3JQb3MpOwogICAgICAg ICBleHBlY3RlZFBpeGVsSGFzaCA9IHN0cmluZyh0ZXN0UGF0aE9yVVJMLCBzZXBhcmF0b3JQb3Mg KyAxKTsKICAgICB9CiAKLSAgICBnY2hhciogdXJsID0gYXV0b2NvcnJlY3RVUkwocGF0aE9yVVJM LmNfc3RyKCkpOwotICAgIGNvbnN0IHN0cmluZyB0ZXN0VVJMKHVybCk7CisgICAgLy8gQ29udmVy dCB0aGUgcGF0aCBpbnRvIGEgZnVsbCBmaWxlIFVSTCBpZiBpdCBkb2VzIG5vdCBsb29rCisgICAg Ly8gbGlrZSBhbiBIVFRQL1MgVVJMIChkb2Vzbid0IHN0YXJ0IHdpdGggaHR0cDovLyBvciBodHRw czovLykuCisgICAgaWYgKHRlc3RVUkwuZmluZCgiaHR0cDovLyIpICYmIHRlc3RVUkwuZmluZCgi aHR0cHM6Ly8iKSkgeworICAgICAgICBHRmlsZSogdGVzdEZpbGUgPSBnX2ZpbGVfbmV3X2Zvcl9w YXRoKHRlc3RVUkwuY19zdHIoKSk7CisgICAgICAgIGdjaGFyKiB0ZXN0VVJMQ1N0cmluZyA9IGdf ZmlsZV9nZXRfdXJpKHRlc3RGaWxlKTsKKyAgICAgICAgdGVzdFVSTCA9IHRlc3RVUkxDU3RyaW5n OworICAgICAgICBnX2ZyZWUodGVzdFVSTENTdHJpbmcpOworICAgICAgICBnX29iamVjdF91bnJl Zih0ZXN0RmlsZSk7CisgICAgfQogCiAgICAgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVl cygpOwogCkBAIC00OTQsMTkgKzQ5MCwxOSBAQCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0 cmluZyYgdGVzdFBhdGhPclVSTCkKIAogICAgIGdMYXlvdXRUZXN0Q29udHJvbGxlci0+c2V0SWNv bkRhdGFiYXNlRW5hYmxlZChmYWxzZSk7CiAKLSAgICBpZiAoc2hvdWxkTG9nRnJhbWVMb2FkRGVs ZWdhdGVzKHBhdGhPclVSTC5jX3N0cigpKSkKKyAgICBpZiAoc2hvdWxkTG9nRnJhbWVMb2FkRGVs ZWdhdGVzKHRlc3RVUkwpKQogICAgICAgICBnTGF5b3V0VGVzdENvbnRyb2xsZXItPnNldER1bXBG cmFtZUxvYWRDYWxsYmFja3ModHJ1ZSk7CiAKLSAgICBpZiAoc2hvdWxkRW5hYmxlRGV2ZWxvcGVy RXh0cmFzKHBhdGhPclVSTC5jX3N0cigpKSkgeworICAgIGlmIChzaG91bGRFbmFibGVEZXZlbG9w ZXJFeHRyYXModGVzdFVSTCkpIHsKICAgICAgICAgZ0xheW91dFRlc3RDb250cm9sbGVyLT5zZXRE ZXZlbG9wZXJFeHRyYXNFbmFibGVkKHRydWUpOwotICAgICAgICBpZiAoc2hvdWxkT3BlbldlYklu c3BlY3RvcihwYXRoT3JVUkwuY19zdHIoKSkpCisgICAgICAgIGlmIChzaG91bGRPcGVuV2ViSW5z cGVjdG9yKHRlc3RVUkwpKQogICAgICAgICAgICAgZ0xheW91dFRlc3RDb250cm9sbGVyLT5zaG93 V2ViSW5zcGVjdG9yKCk7CiAgICAgfQogCiAgICAgV29ya1F1ZXVlOjpzaGFyZWQoKS0+Y2xlYXIo KTsKICAgICBXb3JrUXVldWU6OnNoYXJlZCgpLT5zZXRGcm96ZW4oZmFsc2UpOwogCi0gICAgYm9v bCBpc1NWR1czQ1Rlc3QgPSAoZ0xheW91dFRlc3RDb250cm9sbGVyLT50ZXN0UGF0aE9yVVJMKCku ZmluZCgic3ZnL1czQy1TVkctMS4xIikgIT0gc3RyaW5nOjpucG9zKTsKKyAgICBib29sIGlzU1ZH VzNDVGVzdCA9ICh0ZXN0VVJMLmZpbmQoInN2Zy9XM0MtU1ZHLTEuMSIpICE9IHN0cmluZzo6bnBv cyk7CiAgICAgR3RrQWxsb2NhdGlvbiBzaXplOwogICAgIHNpemUueCA9IHNpemUueSA9IDA7CiAg ICAgc2l6ZS53aWR0aCA9IGlzU1ZHVzNDVGVzdCA/IDQ4MCA6IExheW91dFRlc3RDb250cm9sbGVy OjptYXhWaWV3V2lkdGg7CkBAIC01MjcsMTUgKzUyMywxMiBAQCBzdGF0aWMgdm9pZCBydW5UZXN0 KGNvbnN0IHN0cmluZyYgdGVzdFBhdGhPclVSTCkKIAogICAgIC8vIEZvY3VzIHRoZSB3ZWIgdmll dyBiZWZvcmUgbG9hZGluZyB0aGUgdGVzdCB0byBhdm9pZCBmb2N1c2luZyBwcm9ibGVtcwogICAg IGd0a193aWRnZXRfZ3JhYl9mb2N1cyhHVEtfV0lER0VUKHdlYlZpZXcpKTsKLSAgICB3ZWJraXRf d2ViX3ZpZXdfb3Blbih3ZWJWaWV3LCB1cmwpOwotCi0gICAgZ19mcmVlKHVybCk7Ci0gICAgdXJs ID0gTlVMTDsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfb3Blbih3ZWJWaWV3LCB0ZXN0VVJMLmNfc3Ry KCkpOwogCiAgICAgZ3RrX21haW4oKTsKIAogICAgIC8vIElmIGRldmVsb3BlciBleHRyYXMgZW5h YmxlZCBXZWIgSW5zcGVjdG9yIG1heSBoYXZlIGJlZW4gb3BlbiBieSB0aGUgdGVzdC4KLSAgICBp ZiAoc2hvdWxkRW5hYmxlRGV2ZWxvcGVyRXh0cmFzKHBhdGhPclVSTC5jX3N0cigpKSkgeworICAg IGlmIChzaG91bGRFbmFibGVEZXZlbG9wZXJFeHRyYXModGVzdFVSTCkpIHsKICAgICAgICAgZ0xh eW91dFRlc3RDb250cm9sbGVyLT5jbG9zZVdlYkluc3BlY3RvcigpOwogICAgICAgICBnTGF5b3V0 VGVzdENvbnRyb2xsZXItPnNldERldmVsb3BlckV4dHJhc0VuYWJsZWQoZmFsc2UpOwogICAgIH0K