33025 2009-12-29 10:52:16 -0800 Web Inspector: Provide contentDocument URL for frame owner elements 2010-01-05 15:53:16 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov webkit-unassigned bweinstein commit-queue eric joepeck keishi pfeldman pmuellr rik timothy webkit.review.bot oldest_to_newest 175631 0 apavlov 2009-12-29 10:52:16 -0800 Currently, there is no way to determine the URL of the document a node belongs in (be it the top-level document or a nested frame document). The ownerDocument for all nodes is the top-level document and that is the only source of information. This issue blocks https://bugs.webkit.org/show_bug.cgi?id=33024. 175638 1 45616 apavlov 2009-12-29 11:00:13 -0800 Created attachment 45616 patch 175643 2 webkit.review.bot 2009-12-29 11:04:15 -0800 style-queue ran check-webkit-style on attachment 45616 without any errors. 175668 3 45616 timothy 2009-12-29 11:47:21 -0800 Comment on attachment 45616 patch Should be _url and url, per our style guide. 175674 4 45616 pfeldman 2009-12-29 11:53:55 -0800 Comment on attachment 45616 patch > + value.set("URL", frameOwner->contentDocument()->url().string()); As mentioned, should be "url". > + if (payload.URL) > + this._URL = payload.URL; I think you are going to access it from outside the agent class, so should be public ("url", not "_url"). 175705 5 45621 apavlov 2009-12-29 14:27:20 -0800 Created attachment 45621 patch (property name fixed) 175709 6 webkit.review.bot 2009-12-29 14:33:49 -0800 style-queue ran check-webkit-style on attachment 45621 without any errors. 175711 7 45621 pfeldman 2009-12-29 14:37:40 -0800 Comment on attachment 45621 patch (property name fixed) > + if (payload.documentURL) > + this.documentURL = payload.documentURL; Note that this has a side effect that converts "" to undefined. 175712 8 apavlov 2009-12-29 14:42:06 -0800 (In reply to comment #7) > (From update of attachment 45621 [details]) > > + if (payload.documentURL) > > + this.documentURL = payload.documentURL; > > Note that this has a side effect that converts "" to undefined. That's fine, since URLs are typically not empty strings, and in our case "" makes as much sense as <undefined>... 175719 9 45621 commit-queue 2009-12-29 14:58:57 -0800 Comment on attachment 45621 patch (property name fixed) Rejecting patch 45621 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--quiet']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueueSVN/LayoutTests Testing 11853 test cases. inspector/timeline-script-tag-1.html -> crashed Exiting early after 1 failures. 9509 tests run. 398.62s total testing time 9508 test cases (99%) succeeded 1 test case (<1%) crashed 6 test cases (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/150884 175919 10 45664 apavlov 2009-12-30 07:25:03 -0800 Created attachment 45664 patch (null document handled properly) 175920 11 webkit.review.bot 2009-12-30 07:27:34 -0800 style-queue ran check-webkit-style on attachment 45664 without any errors. 177361 12 eric 2010-01-05 13:31:24 -0800 Would be best if pfeldman would like to review again. 177445 13 45664 commit-queue 2010-01-05 15:53:10 -0800 Comment on attachment 45664 patch (null document handled properly) Clearing flags on attachment: 45664 Committed r52836: <http://trac.webkit.org/changeset/52836> 177446 14 commit-queue 2010-01-05 15:53:16 -0800 All reviewed patches have been landed. Closing bug. 45616 2009-12-29 11:00:13 -0800 2009-12-29 14:27:20 -0800 patch provideurlproperty.patch text/plain 3486 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDI1OGJiMS4uOGIyZjkwMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0yOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgdGhlICJfVVJMIiBwcm9wZXJ0eSBmb3IgZG9j dW1lbnRzIGFuZCBmcmFtZSBvd25lciBlbGVtZW50cworCisgICAgICAgIFRoaXMgaXMgbmVjZXNz YXJ5IHRvIGRldGVybWluZSBvd25lciBkb2N1bWVudCBVUkxzIGZvciBub2RlcyAoYWxsIG5vZGVz IGhhdmUKKyAgICAgICAgdGhlIHRvcC1sZXZlbCBkb2N1bWVudCBzZXQgYXMgb3duZXJEb2N1bWVu dCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzAy NQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZvck5vZGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NTm9kZSk6CisKIDIwMDktMTItMjggIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRyeSBUaXRvdi4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCA2YTZjYTVmLi40N2M0YWVkIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC01MTIsMTggKzUxMiwyNSBAQCBT Y3JpcHRPYmplY3QgSW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yTm9kZShOb2RlKiBu b2RlLCBpbnQgZGVwdGgsIE5vZGVUbwogICAgIHZhbHVlLnNldCgibG9jYWxOYW1lIiwgbG9jYWxO YW1lKTsKICAgICB2YWx1ZS5zZXQoIm5vZGVWYWx1ZSIsIG5vZGVWYWx1ZSk7CiAKLSAgICBpZiAo bm9kZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpFTEVNRU5UX05PREUpIHsKLSAgICAgICAgRWxlbWVu dCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKTsKLSAgICAgICAgdmFsdWUu c2V0KCJhdHRyaWJ1dGVzIiwgYnVpbGRBcnJheUZvckVsZW1lbnRBdHRyaWJ1dGVzKGVsZW1lbnQp KTsKLSAgICB9CiAgICAgaWYgKG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RUxFTUVOVF9OT0RF IHx8IG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfTk9ERSkgewogICAgICAgICBp bnQgbm9kZUNvdW50ID0gaW5uZXJDaGlsZE5vZGVDb3VudChub2RlKTsKICAgICAgICAgdmFsdWUu c2V0KCJjaGlsZE5vZGVDb3VudCIsIG5vZGVDb3VudCk7CiAgICAgICAgIFNjcmlwdEFycmF5IGNo aWxkcmVuID0gYnVpbGRBcnJheUZvckNvbnRhaW5lckNoaWxkcmVuKG5vZGUsIGRlcHRoLCBub2Rl c01hcCk7CiAgICAgICAgIGlmIChjaGlsZHJlbi5sZW5ndGgoKSA+IDApCiAgICAgICAgICAgICB2 YWx1ZS5zZXQoImNoaWxkcmVuIiwgY2hpbGRyZW4pOwotICAgIH0KLSAgICBpZiAobm9kZS0+bm9k ZVR5cGUoKSA9PSBOb2RlOjpET0NVTUVOVF9UWVBFX05PREUpIHsKKworICAgICAgICBpZiAobm9k ZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpFTEVNRU5UX05PREUpIHsKKyAgICAgICAgICAgIEVsZW1l bnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSk7CisgICAgICAgICAgICB2 YWx1ZS5zZXQoImF0dHJpYnV0ZXMiLCBidWlsZEFycmF5Rm9yRWxlbWVudEF0dHJpYnV0ZXMoZWxl bWVudCkpOworICAgICAgICAgICAgaWYgKG5vZGUtPmlzRnJhbWVPd25lckVsZW1lbnQoKSkgewor ICAgICAgICAgICAgICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogZnJhbWVPd25lciA9IHN0YXRp Y19jYXN0PEhUTUxGcmFtZU93bmVyRWxlbWVudCo+KG5vZGUpOworICAgICAgICAgICAgICAgIHZh bHVlLnNldCgiVVJMIiwgZnJhbWVPd25lci0+Y29udGVudERvY3VtZW50KCktPnVybCgpLnN0cmlu ZygpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIERvY3Vt ZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obm9kZSk7CisgICAgICAgICAg ICB2YWx1ZS5zZXQoIlVSTCIsIGRvY3VtZW50LT51cmwoKS5zdHJpbmcoKSk7CisgICAgICAgIH0K KyAgICB9IGVsc2UgaWYgKG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfVFlQRV9O T0RFKSB7CiAgICAgICAgIERvY3VtZW50VHlwZSogZG9jVHlwZSA9IHN0YXRpY19jYXN0PERvY3Vt ZW50VHlwZSo+KG5vZGUpOwogICAgICAgICB2YWx1ZS5zZXQoInB1YmxpY0lkIiwgZG9jVHlwZS0+ cHVibGljSWQoKSk7CiAgICAgICAgIHZhbHVlLnNldCgic3lzdGVtSWQiLCBkb2NUeXBlLT5zeXN0 ZW1JZCgpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCA5OTAw Y2JiLi44NjE5NTE2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9N QWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBA IC02NiwxMSArNjYsMTQgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUgPSBmdW5jdGlvbihkb2MsIHBh eWxvYWQpIHsKICAgICAgICAgICAgIHRoaXMub3duZXJEb2N1bWVudC5kb2N1bWVudEVsZW1lbnQg PSB0aGlzOwogICAgICAgICBpZiAoIXRoaXMub3duZXJEb2N1bWVudC5ib2R5ICYmIHRoaXMubm9k ZU5hbWUgPT09ICJCT0RZIikKICAgICAgICAgICAgIHRoaXMub3duZXJEb2N1bWVudC5ib2R5ID0g dGhpczsKKyAgICAgICAgaWYgKHBheWxvYWQuVVJMKQorICAgICAgICAgICAgdGhpcy5fVVJMID0g cGF5bG9hZC5VUkw7CiAgICAgfSBlbHNlIGlmICh0aGlzLm5vZGVUeXBlID09PSBOb2RlLkRPQ1VN RU5UX1RZUEVfTk9ERSkgewogICAgICAgICB0aGlzLnB1YmxpY0lkID0gcGF5bG9hZC5wdWJsaWNJ ZDsKICAgICAgICAgdGhpcy5zeXN0ZW1JZCA9IHBheWxvYWQuc3lzdGVtSWQ7CiAgICAgICAgIHRo aXMuaW50ZXJuYWxTdWJzZXQgPSBwYXlsb2FkLmludGVybmFsU3Vic2V0OwotICAgIH0KKyAgICB9 IGVsc2UgaWYgKHRoaXMubm9kZVR5cGUgPT09IE5vZGUuRE9DVU1FTlRfTk9ERSkKKyAgICAgICAg dGhpcy5fVVJMID0gcGF5bG9hZC5VUkw7CiB9CiAKIFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3Rv dHlwZSA9IHsK 45621 2009-12-29 14:27:20 -0800 2009-12-30 07:25:03 -0800 patch (property name fixed) provideurlproperty.patch text/plain 3547 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDI1OGJiMS4uNjQ5Yzg0NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0yOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgdGhlICJkb2N1bWVudFVSTCIgcHJvcGVydHkg Zm9yIGRvY3VtZW50cyBhbmQgZnJhbWUgb3duZXIgZWxlbWVudHMKKworICAgICAgICBUaGlzIGlz IG5lY2Vzc2FyeSB0byBkZXRlcm1pbmUgb3duZXIgZG9jdW1lbnQgVVJMcyBmb3Igbm9kZXMgKGFs bCBub2RlcyBoYXZlCisgICAgICAgIHRoZSB0b3AtbGV2ZWwgZG9jdW1lbnQgc2V0IGFzIG93bmVy RG9jdW1lbnQpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzMwMjUKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTU5vZGUpOgorCiAyMDA5LTEyLTI4ICBBbmRyZWkgUG9wZXNjdSAgPGFuZHJl aXBAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNmE2Y2E1Zi4uYjg3YmM1NSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtNTEyLDE4ICs1MTIs MjUgQEAgU2NyaXB0T2JqZWN0IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZvck5vZGUo Tm9kZSogbm9kZSwgaW50IGRlcHRoLCBOb2RlVG8KICAgICB2YWx1ZS5zZXQoImxvY2FsTmFtZSIs IGxvY2FsTmFtZSk7CiAgICAgdmFsdWUuc2V0KCJub2RlVmFsdWUiLCBub2RlVmFsdWUpOwogCi0g ICAgaWYgKG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RUxFTUVOVF9OT0RFKSB7Ci0gICAgICAg IEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4obm9kZSk7Ci0gICAgICAg IHZhbHVlLnNldCgiYXR0cmlidXRlcyIsIGJ1aWxkQXJyYXlGb3JFbGVtZW50QXR0cmlidXRlcyhl bGVtZW50KSk7Ci0gICAgfQogICAgIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1F TlRfTk9ERSB8fCBub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkRPQ1VNRU5UX05PREUpIHsKICAg ICAgICAgaW50IG5vZGVDb3VudCA9IGlubmVyQ2hpbGROb2RlQ291bnQobm9kZSk7CiAgICAgICAg IHZhbHVlLnNldCgiY2hpbGROb2RlQ291bnQiLCBub2RlQ291bnQpOwogICAgICAgICBTY3JpcHRB cnJheSBjaGlsZHJlbiA9IGJ1aWxkQXJyYXlGb3JDb250YWluZXJDaGlsZHJlbihub2RlLCBkZXB0 aCwgbm9kZXNNYXApOwogICAgICAgICBpZiAoY2hpbGRyZW4ubGVuZ3RoKCkgPiAwKQogICAgICAg ICAgICAgdmFsdWUuc2V0KCJjaGlsZHJlbiIsIGNoaWxkcmVuKTsKLSAgICB9Ci0gICAgaWYgKG5v ZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfVFlQRV9OT0RFKSB7CisKKyAgICAgICAg aWYgKG5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RUxFTUVOVF9OT0RFKSB7CisgICAgICAgICAg ICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOworICAgICAg ICAgICAgdmFsdWUuc2V0KCJhdHRyaWJ1dGVzIiwgYnVpbGRBcnJheUZvckVsZW1lbnRBdHRyaWJ1 dGVzKGVsZW1lbnQpKTsKKyAgICAgICAgICAgIGlmIChub2RlLT5pc0ZyYW1lT3duZXJFbGVtZW50 KCkpIHsKKyAgICAgICAgICAgICAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIGZyYW1lT3duZXIg PSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVPd25lckVsZW1lbnQqPihub2RlKTsKKyAgICAgICAgICAg ICAgICB2YWx1ZS5zZXQoImRvY3VtZW50VVJMIiwgZnJhbWVPd25lci0+Y29udGVudERvY3VtZW50 KCktPnVybCgpLnN0cmluZygpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obm9k ZSk7CisgICAgICAgICAgICB2YWx1ZS5zZXQoImRvY3VtZW50VVJMIiwgZG9jdW1lbnQtPnVybCgp LnN0cmluZygpKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSBpZiAobm9kZS0+bm9kZVR5cGUoKSA9 PSBOb2RlOjpET0NVTUVOVF9UWVBFX05PREUpIHsKICAgICAgICAgRG9jdW1lbnRUeXBlKiBkb2NU eXBlID0gc3RhdGljX2Nhc3Q8RG9jdW1lbnRUeXBlKj4obm9kZSk7CiAgICAgICAgIHZhbHVlLnNl dCgicHVibGljSWQiLCBkb2NUeXBlLT5wdWJsaWNJZCgpKTsKICAgICAgICAgdmFsdWUuc2V0KCJz eXN0ZW1JZCIsIGRvY1R5cGUtPnN5c3RlbUlkKCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RPTUFnZW50LmpzCmluZGV4IDk5MDBjYmIuLjQ4MGE0M2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTY2LDExICs2NiwxNCBAQCBXZWJJbnNwZWN0b3IuRE9N Tm9kZSA9IGZ1bmN0aW9uKGRvYywgcGF5bG9hZCkgewogICAgICAgICAgICAgdGhpcy5vd25lckRv Y3VtZW50LmRvY3VtZW50RWxlbWVudCA9IHRoaXM7CiAgICAgICAgIGlmICghdGhpcy5vd25lckRv Y3VtZW50LmJvZHkgJiYgdGhpcy5ub2RlTmFtZSA9PT0gIkJPRFkiKQogICAgICAgICAgICAgdGhp cy5vd25lckRvY3VtZW50LmJvZHkgPSB0aGlzOworICAgICAgICBpZiAocGF5bG9hZC5kb2N1bWVu dFVSTCkKKyAgICAgICAgICAgIHRoaXMuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50VVJM OwogICAgIH0gZWxzZSBpZiAodGhpcy5ub2RlVHlwZSA9PT0gTm9kZS5ET0NVTUVOVF9UWVBFX05P REUpIHsKICAgICAgICAgdGhpcy5wdWJsaWNJZCA9IHBheWxvYWQucHVibGljSWQ7CiAgICAgICAg IHRoaXMuc3lzdGVtSWQgPSBwYXlsb2FkLnN5c3RlbUlkOwogICAgICAgICB0aGlzLmludGVybmFs U3Vic2V0ID0gcGF5bG9hZC5pbnRlcm5hbFN1YnNldDsKLSAgICB9CisgICAgfSBlbHNlIGlmICh0 aGlzLm5vZGVUeXBlID09PSBOb2RlLkRPQ1VNRU5UX05PREUpCisgICAgICAgIHRoaXMuZG9jdW1l bnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50VVJMOwogfQogCiBXZWJJbnNwZWN0b3IuRE9NTm9kZS5w cm90b3R5cGUgPSB7Cg== 45664 2009-12-30 07:25:03 -0800 2010-01-05 15:53:10 -0800 patch (null document handled properly) provideurlproperty.patch text/plain 4549 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDUxNjllYS4uZDkyNmJmMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0zMCAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgdGhlICJkb2N1bWVudFVSTCIgcHJvcGVydHkg Zm9yIGRvY3VtZW50cyBhbmQgZnJhbWUgb3duZXIgZWxlbWVudHMKKworICAgICAgICBUaGlzIGlz IG5lY2Vzc2FyeSB0byBkZXRlcm1pbmUgb3duZXIgZG9jdW1lbnQgVVJMcyBmb3Igbm9kZXMgKGFs bCBub2RlcyBoYXZlCisgICAgICAgIHRoZSB0b3AtbGV2ZWwgZG9jdW1lbnQgc2V0IGFzIG93bmVy RG9jdW1lbnQpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzMwMjUKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTU5vZGUpOgorCiAyMDA5LTEyLTMwICBKYWt1YiBXaWVjem9yZWsgIDxmYXcy MTdAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDZhNmNhNWYuLjk2MzI4MDYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTQ3OSw2ICs0Nzks MTMgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6Z2V0RXZlbnRMaXN0ZW5lcnNGb3JOb2RlKGxv bmcgY2FsbElkLCBsb25nIG5vZGVJZCkKICAgICBtX2Zyb250ZW5kLT5kaWRHZXRFdmVudExpc3Rl bmVyc0Zvck5vZGUoY2FsbElkLCBub2RlSWQsIGxpc3RlbmVyc0FycmF5KTsKIH0KIAorU3RyaW5n IEluc3BlY3RvckRPTUFnZW50Ojpkb2N1bWVudFVSTFN0cmluZyhEb2N1bWVudCogZG9jdW1lbnQp IGNvbnN0Cit7CisgICAgaWYgKCFkb2N1bWVudCB8fCBkb2N1bWVudC0+dXJsKCkuaXNOdWxsKCkp CisgICAgICAgIHJldHVybiAiIjsKKyAgICByZXR1cm4gZG9jdW1lbnQtPnVybCgpLnN0cmluZygp OworfQorCiBTY3JpcHRPYmplY3QgSW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yTm9k ZShOb2RlKiBub2RlLCBpbnQgZGVwdGgsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCkKIHsKICAgICBT Y3JpcHRPYmplY3QgdmFsdWUgPSBtX2Zyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKQEAgLTUx MiwxOCArNTE5LDI1IEBAIFNjcmlwdE9iamVjdCBJbnNwZWN0b3JET01BZ2VudDo6YnVpbGRPYmpl Y3RGb3JOb2RlKE5vZGUqIG5vZGUsIGludCBkZXB0aCwgTm9kZVRvCiAgICAgdmFsdWUuc2V0KCJs b2NhbE5hbWUiLCBsb2NhbE5hbWUpOwogICAgIHZhbHVlLnNldCgibm9kZVZhbHVlIiwgbm9kZVZh bHVlKTsKIAotICAgIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERSkg ewotICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUp OwotICAgICAgICB2YWx1ZS5zZXQoImF0dHJpYnV0ZXMiLCBidWlsZEFycmF5Rm9yRWxlbWVudEF0 dHJpYnV0ZXMoZWxlbWVudCkpOwotICAgIH0KICAgICBpZiAobm9kZS0+bm9kZVR5cGUoKSA9PSBO b2RlOjpFTEVNRU5UX05PREUgfHwgbm9kZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpET0NVTUVOVF9O T0RFKSB7CiAgICAgICAgIGludCBub2RlQ291bnQgPSBpbm5lckNoaWxkTm9kZUNvdW50KG5vZGUp OwogICAgICAgICB2YWx1ZS5zZXQoImNoaWxkTm9kZUNvdW50Iiwgbm9kZUNvdW50KTsKICAgICAg ICAgU2NyaXB0QXJyYXkgY2hpbGRyZW4gPSBidWlsZEFycmF5Rm9yQ29udGFpbmVyQ2hpbGRyZW4o bm9kZSwgZGVwdGgsIG5vZGVzTWFwKTsKICAgICAgICAgaWYgKGNoaWxkcmVuLmxlbmd0aCgpID4g MCkKICAgICAgICAgICAgIHZhbHVlLnNldCgiY2hpbGRyZW4iLCBjaGlsZHJlbik7Ci0gICAgfQot ICAgIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkRPQ1VNRU5UX1RZUEVfTk9ERSkgewor CisgICAgICAgIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERSkgewor ICAgICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2Rl KTsKKyAgICAgICAgICAgIHZhbHVlLnNldCgiYXR0cmlidXRlcyIsIGJ1aWxkQXJyYXlGb3JFbGVt ZW50QXR0cmlidXRlcyhlbGVtZW50KSk7CisgICAgICAgICAgICBpZiAobm9kZS0+aXNGcmFtZU93 bmVyRWxlbWVudCgpKSB7CisgICAgICAgICAgICAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBm cmFtZU93bmVyID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lT3duZXJFbGVtZW50Kj4obm9kZSk7Cisg ICAgICAgICAgICAgICAgdmFsdWUuc2V0KCJkb2N1bWVudFVSTCIsIGRvY3VtZW50VVJMU3RyaW5n KGZyYW1lT3duZXItPmNvbnRlbnREb2N1bWVudCgpKSk7CisgICAgICAgICAgICB9CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxE b2N1bWVudCo+KG5vZGUpOworICAgICAgICAgICAgdmFsdWUuc2V0KCJkb2N1bWVudFVSTCIsIGRv Y3VtZW50VVJMU3RyaW5nKGRvY3VtZW50KSk7CisgICAgICAgIH0KKyAgICB9IGVsc2UgaWYgKG5v ZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfVFlQRV9OT0RFKSB7CiAgICAgICAgIERv Y3VtZW50VHlwZSogZG9jVHlwZSA9IHN0YXRpY19jYXN0PERvY3VtZW50VHlwZSo+KG5vZGUpOwog ICAgICAgICB2YWx1ZS5zZXQoInB1YmxpY0lkIiwgZG9jVHlwZS0+cHVibGljSWQoKSk7CiAgICAg ICAgIHZhbHVlLnNldCgic3lzdGVtSWQiLCBkb2NUeXBlLT5zeXN0ZW1JZCgpKTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmggYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCmluZGV4IDI2ZGY1YWEuLmFlMzAyYTggMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApAQCAtMTMxLDYgKzEzMSw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBpc1doaXRlc3BhY2UoTm9kZSogbm9kZSk7CiAKICAg ICAgICAgRG9jdW1lbnQqIG1haW5GcmFtZURvY3VtZW50KCkgY29uc3Q7CisgICAgICAgIFN0cmlu ZyBkb2N1bWVudFVSTFN0cmluZyhEb2N1bWVudCogZG9jdW1lbnQpIGNvbnN0OwogICAgICAgICB2 b2lkIGRpc2NhcmRCaW5kaW5ncygpOwogCiAgICAgICAgIEluc3BlY3RvckZyb250ZW5kKiBtX2Zy b250ZW5kOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50 LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IDk5MDBj YmIuLjQ4MGE0M2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01B Z2VudC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAg LTY2LDExICs2NiwxNCBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGZ1bmN0aW9uKGRvYywgcGF5 bG9hZCkgewogICAgICAgICAgICAgdGhpcy5vd25lckRvY3VtZW50LmRvY3VtZW50RWxlbWVudCA9 IHRoaXM7CiAgICAgICAgIGlmICghdGhpcy5vd25lckRvY3VtZW50LmJvZHkgJiYgdGhpcy5ub2Rl TmFtZSA9PT0gIkJPRFkiKQogICAgICAgICAgICAgdGhpcy5vd25lckRvY3VtZW50LmJvZHkgPSB0 aGlzOworICAgICAgICBpZiAocGF5bG9hZC5kb2N1bWVudFVSTCkKKyAgICAgICAgICAgIHRoaXMu ZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50VVJMOwogICAgIH0gZWxzZSBpZiAodGhpcy5u b2RlVHlwZSA9PT0gTm9kZS5ET0NVTUVOVF9UWVBFX05PREUpIHsKICAgICAgICAgdGhpcy5wdWJs aWNJZCA9IHBheWxvYWQucHVibGljSWQ7CiAgICAgICAgIHRoaXMuc3lzdGVtSWQgPSBwYXlsb2Fk LnN5c3RlbUlkOwogICAgICAgICB0aGlzLmludGVybmFsU3Vic2V0ID0gcGF5bG9hZC5pbnRlcm5h bFN1YnNldDsKLSAgICB9CisgICAgfSBlbHNlIGlmICh0aGlzLm5vZGVUeXBlID09PSBOb2RlLkRP Q1VNRU5UX05PREUpCisgICAgICAgIHRoaXMuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50 VVJMOwogfQogCiBXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUgPSB7Cg==