62099 2011-06-04 14:03:59 -0700 createEvent("PopStateEvent") raises NOT_SUPPORTED_ERR: DOM Exception 9 2011-06-06 14:16:02 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 paulkinlan webkit-unassigned fishd jorlow webkit.review.bot oldest_to_newest 415536 0 paulkinlan 2011-06-04 14:03:59 -0700 It is not possible to create a PopStateEvent using: document.createEvent("PopStateEvent"); It raises a: Error: NOT_SUPPORTED_ERR: DOM Exception 9 Therefore it is not possible to test applications that respond to History API changes (nav back for example) without invoking a navigation. I have a fix for this that I should be able to land pretty soon. 415538 1 96033 paulkinlan 2011-06-04 14:05:36 -0700 Created attachment 96033 A test case for createEvent and dispatch. 415549 2 96036 paulkinlan 2011-06-04 15:29:52 -0700 Created attachment 96036 My proposed patch and test Added support for letting developers createEvent("PopStateEvent"). Added tests. 415550 3 webkit.review.bot 2011-06-04 15:32:07 -0700 Attachment 96036 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'LayoutTests/fast/events/fire..." exit_code: 1 ChangeLog:8: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 415551 4 96037 paulkinlan 2011-06-04 15:39:19 -0700 Created attachment 96037 My proposed patch and test +ChangeLog Fix Fixing the ChangeLog so that it should pass the style check. Adds support for createEvent("PopStateEvent") and associated dispatch. Adds tests. 415552 5 96037 jorlow 2011-06-04 15:56:54 -0700 Comment on attachment 96037 My proposed patch and test +ChangeLog Fix View in context: https://bugs.webkit.org/attachment.cgi?id=96037&action=review Looks pretty good. > Source/WebCore/dom/PopStateEvent.cpp:34 > +PopStateEvent::PopStateEvent() You need to call Event's consturctor and initialize m_stateObject > Source/WebCore/dom/PopStateEvent.h:40 > + static PassRefPtr<PopStateEvent> create() Would slightly prefer these factory methods being moved inside the .cpp > Source/WebCore/dom/PopStateEvent.h:54 > +protected: Does anythign sub-class this? If not, put it inside "private:" 415623 6 96053 paulkinlan 2011-06-05 11:02:25 -0700 Created attachment 96053 Fixes based on feedback from previous review. 415624 7 96053 paulkinlan 2011-06-05 11:02:45 -0700 Comment on attachment 96053 Fixes based on feedback from previous review. (In reply to comment #5) > (From update of attachment 96037 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=96037&action=review > > Looks pretty good. > > > Source/WebCore/dom/PopStateEvent.cpp:34 > > +PopStateEvent::PopStateEvent() > > You need to call Event's consturctor and initialize m_stateObject Done > > > Source/WebCore/dom/PopStateEvent.h:40 > > + static PassRefPtr<PopStateEvent> create() I was following the guidance from another Event, however I then checked some others and it is inconsistent. I have moved the implementation to PopStateEvent.cpp for both create's. > > Would slightly prefer these factory methods being moved inside the .cpp > > > Source/WebCore/dom/PopStateEvent.h:54 > > +protected: > > Does anythign sub-class this? If not, put it inside "private:" Done. Given that nothing sub-classes this and it is new for this bug fix it makes sense. 415663 8 96053 sam 2011-06-05 17:19:44 -0700 Comment on attachment 96053 Fixes based on feedback from previous review. View in context: https://bugs.webkit.org/attachment.cgi?id=96053&action=review Otherwise it looks fine. Lets go another round. > ChangeLog:13 > + > + * ../LayoutTests/fast/events/fire-popstate-event-expected.txt: Added. > + * ../LayoutTests/fast/events/fire-popstate-event.html: Added. > + * ../Source/WebCore/dom/Document.cpp: > + * ../Source/WebCore/dom/PopStateEvent.cpp: > + * ../Source/WebCore/dom/PopStateEvent.h: This ChangeLog should not be here. Please use the ones in /Source/WebCore and /LayouTests > Source/WebCore/dom/PopStateEvent.cpp:36 > + , m_stateObject() This line is not necessary, the construction is implicit. > Source/WebCore/dom/PopStateEvent.h:41 > + static PassRefPtr<PopStateEvent> create(PassRefPtr<SerializedScriptValue> stateObject); I don't think the parameter name adds much here. 415849 9 96094 paulkinlan 2011-06-06 08:23:44 -0700 Created attachment 96094 Fixes based on feedback from previous review. Moved the ChangeLogs to the two individual sections + removed the paramter name from the 2nd create method. 415970 10 96094 jorlow 2011-06-06 13:30:25 -0700 Comment on attachment 96094 Fixes based on feedback from previous review. View in context: https://bugs.webkit.org/attachment.cgi?id=96094&action=review > Source/WebCore/dom/PopStateEvent.h:-53 > - This space didn't need to be removed. 415972 11 jorlow 2011-06-06 13:30:34 -0700 r=me 415997 12 96094 webkit.review.bot 2011-06-06 14:15:57 -0700 Comment on attachment 96094 Fixes based on feedback from previous review. Clearing flags on attachment: 96094 Committed r88187: <http://trac.webkit.org/changeset/88187> 415998 13 webkit.review.bot 2011-06-06 14:16:02 -0700 All reviewed patches have been landed. Closing bug. 96033 2011-06-04 14:05:36 -0700 2011-06-04 14:05:36 -0700 A test case for createEvent and dispatch. historytest.html text/html 338 paulkinlan PCFkb2N0eXBlPgo8aHRtbD4KICA8c2NyaXB0PgoKICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVy KCJwb3BzdGF0ZSIsIGZ1bmN0aW9uKGUpIHsKICAgICAgaWYoISFlLnN0YXRlID09IGZhbHNlKSBy ZXR1cm47CiAgICAgIGNvbnNvbGUubG9nKGUuc3RhdGUudGVzdCk7CiAgICB9KTsKCiAgICB2YXIg ZXZ0ID0gZG9jdW1lbnQuY3JlYXRlRXZlbnQoIlBvcFN0YXRlRXZlbnQiKTsKICAgIGV2dC5pbml0 UG9wU3RhdGVFdmVudCgicG9wc3RhdGUiLCBmYWxzZSwgZmFsc2UseyB0ZXN0OiAiaGVsbG8ifSk7 CiAgICB3aW5kb3cuZGlzcGF0Y2hFdmVudChldnQpOwogIDwvc2NyaXB0PgoKPC9odG1sPgo= 96036 2011-06-04 15:29:52 -0700 2011-06-04 15:39:19 -0700 My proposed patch and test PopStateEventPatch.txt text/plain 4437 paulkinlan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTIz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYt MDQgIFBhdWwgS2lubGFuICA8cGF1bGtpbmxhbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCBkZXZlbG9wZXJzIGNyZWF0ZUV2 ZW50KCJQb3BTdGF0ZUV2ZW50IiksIHByZXZpb3VzbHkgaXQgd2Fzbid0CisgICAgICAgIGV4cG9z ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjA5 OQorCQkJCQorCisgICAgICAgICogLi4vTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3Bz dGF0ZS1ldmVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIC4uL0xheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQuaHRtbDogQWRkZWQuCisgICAgICAgICog Li4vU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKiAuLi9Tb3VyY2Uv V2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5jcHA6CisgICAgICAgICogLi4vU291cmNlL1dlYkNv cmUvZG9tL1BvcFN0YXRlRXZlbnQuaDoKKwogMjAxMS0wNi0wNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0 aEB3ZWJraXQub3JnPgogCiAgICAgICAgIENvbmZpZ3VyZSBuZXcgY29tbWl0LXF1ZXVlIGluc3Rh bmNlLiAgKFBsZWFzZSBpZ25vcmUuKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZp c2lvbiA4Nzc5MikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM1NjgsNiArMzU2OCw4IEBAIFBhc3NSZWZQdHI8RXZlbnQ+IERvY3VtZW50Ojpj cmVhdGVFdmVudCgKICAgICAgICAgZXZlbnQgPSBPdmVyZmxvd0V2ZW50OjpjcmVhdGUoKTsKICAg ICBlbHNlIGlmIChldmVudFR5cGUgPT0gIlBhZ2VUcmFuc2l0aW9uRXZlbnQiKQogICAgICAgICBl dmVudCA9IFBhZ2VUcmFuc2l0aW9uRXZlbnQ6OmNyZWF0ZSgpOworICAgIGVsc2UgaWYgKGV2ZW50 VHlwZSA9PSAiUG9wU3RhdGVFdmVudCIpCisgICAgICAgIGV2ZW50ID0gUG9wU3RhdGVFdmVudDo6 Y3JlYXRlKCk7IAogICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9PSAiUHJvZ3Jlc3NFdmVudCIpCiAg ICAgICAgIGV2ZW50ID0gUHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKCk7CiAjaWYgRU5BQkxFKERPTV9T VE9SQUdFKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2ZW50LmNwcAkocmV2aXNpb24g ODc3OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMxLDYgKzMxLDEwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorUG9wU3Rh dGVFdmVudDo6UG9wU3RhdGVFdmVudCgpCit7Cit9CisKIFBvcFN0YXRlRXZlbnQ6OlBvcFN0YXRl RXZlbnQoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRlT2JqZWN0KQogICAg IDogRXZlbnQoZXZlbnROYW1lcygpLnBvcHN0YXRlRXZlbnQsIGZhbHNlLCB0cnVlKQogICAgICwg bV9zdGF0ZU9iamVjdChzdGF0ZU9iamVjdCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BT dGF0ZUV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZl bnQuaAkocmV2aXNpb24gODc3OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNywxMCBAQCBjbGFzcyBTZXJpYWxpemVkU2Ny aXB0VmFsdWU7CiBjbGFzcyBQb3BTdGF0ZUV2ZW50IDogcHVibGljIEV2ZW50IHsKIHB1YmxpYzoK ICAgICB2aXJ0dWFsIH5Qb3BTdGF0ZUV2ZW50KCk7Ci0KKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxQ b3BTdGF0ZUV2ZW50PiBjcmVhdGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBQb3BTdGF0ZUV2ZW50KTsKKyAgICB9CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UG9wU3RhdGVF dmVudD4gY3JlYXRlKFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzdGF0ZU9iamVj dCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wU3RhdGVFdmVudChzdGF0 ZU9iamVjdCkpOwpAQCAtNDgsNiArNTEsOSBAQCBwdWJsaWM6CiAKICAgICBTZXJpYWxpemVkU2Ny aXB0VmFsdWUqIHN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZU9iamVjdC5nZXQoKTsgfSAg ICAKIAorcHJvdGVjdGVkOgorICAgIFBvcFN0YXRlRXZlbnQoKTsKKwogcHJpdmF0ZToKICAgICBl eHBsaWNpdCBQb3BTdGF0ZUV2ZW50KFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPik7 CiAKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9w c3RhdGUtZXZlbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMTAgQEAKK0NoZWNrcyB0aGF0IHRoZSBwb3BzdGF0ZSBldmVudCBmaXJlcyB3aGVu IGRpc3BhdGNoZWQgdmlhIGNyZWF0ZUV2ZW50CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitQQVNTIFBvcHN0YXRlIHN0YXRlOiAoU3VjY2VzcykKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9maXJlLXBvcHN0YXRlLWV2ZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC5odG1sCShyZXZpc2lvbiAw KQpAQCAtMCwwICsxLDMzIEBACisKKzxodG1sPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVm PSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8Ym9keSBzdHlsZT0ibWluLXdp ZHRoOiA1MDAwcHg7IG1pbi1oZWlnaHQ6IDUwMDBweCI+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwv cD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCdDaGVj a3MgdGhhdCB0aGUgcG9wc3RhdGUgZXZlbnQgZmlyZXMgd2hlbiBkaXNwYXRjaGVkIHZpYSBjcmVh dGVFdmVudCcpOworCitvbnBvcHN0YXRlID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgaWYoISFl dmVudC5zdGF0ZSAmJiAhIWV2ZW50LnN0YXRlLnRlc3RWYWx1ZSkgCisgICAgeworICAgICAgICB0 ZXN0UGFzc2VkKCdQb3BzdGF0ZSBzdGF0ZTogKCcgKyBldmVudC5zdGF0ZS50ZXN0VmFsdWUgKycp Jyk7CisgICAgfQorfQorCitvbmxvYWQgPSBmdW5jdGlvbigpCit7CisgICAgdmFyIGV2dCA9IGRv Y3VtZW50LmNyZWF0ZUV2ZW50KCJQb3BTdGF0ZUV2ZW50Iik7CisgICAgZXZ0LmluaXRQb3BTdGF0 ZUV2ZW50KCJwb3BzdGF0ZSIsIGZhbHNlLCBmYWxzZSwgeyB0ZXN0VmFsdWU6ICJTdWNjZXNzIn0g KTsKKyAgICB3aW5kb3cuZGlzcGF0Y2hFdmVudChldnQpOworfQorCitzZXRUaW1lb3V0KGZpbmlz aEpTVGVzdCwgNTAwKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cit2YXIganNU ZXN0SXNBc3luYyA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 96037 2011-06-04 15:39:19 -0700 2011-06-05 11:02:25 -0700 My proposed patch and test +ChangeLog Fix PopStateEventPatch.txt text/plain 4431 paulkinlan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTIz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYt MDQgIFBhdWwgS2lubGFuICA8cGF1bGtpbmxhbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCBkZXZlbG9wZXJzIGNyZWF0ZUV2 ZW50KCJQb3BTdGF0ZUV2ZW50IiksIHByZXZpb3VzbHkgaXQgd2Fzbid0CisgICAgICAgIGV4cG9z ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjA5 OQorCisgICAgICAgICogLi4vTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1l dmVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIC4uL0xheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQuaHRtbDogQWRkZWQuCisgICAgICAgICogLi4vU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKiAuLi9Tb3VyY2UvV2ViQ29y ZS9kb20vUG9wU3RhdGVFdmVudC5jcHA6CisgICAgICAgICogLi4vU291cmNlL1dlYkNvcmUvZG9t L1BvcFN0YXRlRXZlbnQuaDoKKwogMjAxMS0wNi0wNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIENvbmZpZ3VyZSBuZXcgY29tbWl0LXF1ZXVlIGluc3RhbmNlLiAg KFBsZWFzZSBpZ25vcmUuKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiA4 Nzc5MikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM1NjgsNiArMzU2OCw4IEBAIFBhc3NSZWZQdHI8RXZlbnQ+IERvY3VtZW50OjpjcmVhdGVF dmVudCgKICAgICAgICAgZXZlbnQgPSBPdmVyZmxvd0V2ZW50OjpjcmVhdGUoKTsKICAgICBlbHNl IGlmIChldmVudFR5cGUgPT0gIlBhZ2VUcmFuc2l0aW9uRXZlbnQiKQogICAgICAgICBldmVudCA9 IFBhZ2VUcmFuc2l0aW9uRXZlbnQ6OmNyZWF0ZSgpOworICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9 PSAiUG9wU3RhdGVFdmVudCIpCisgICAgICAgIGV2ZW50ID0gUG9wU3RhdGVFdmVudDo6Y3JlYXRl KCk7IAogICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9PSAiUHJvZ3Jlc3NFdmVudCIpCiAgICAgICAg IGV2ZW50ID0gUHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKCk7CiAjaWYgRU5BQkxFKERPTV9TVE9SQUdF KQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2ZW50LmNwcAkocmV2aXNpb24gODc3OTIp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMxLDYgKzMxLDEwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorUG9wU3RhdGVFdmVu dDo6UG9wU3RhdGVFdmVudCgpCit7Cit9CisKIFBvcFN0YXRlRXZlbnQ6OlBvcFN0YXRlRXZlbnQo UGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRlT2JqZWN0KQogICAgIDogRXZl bnQoZXZlbnROYW1lcygpLnBvcHN0YXRlRXZlbnQsIGZhbHNlLCB0cnVlKQogICAgICwgbV9zdGF0 ZU9iamVjdChzdGF0ZU9iamVjdCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2 ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuaAko cmV2aXNpb24gODc3OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNywxMCBAQCBjbGFzcyBTZXJpYWxpemVkU2NyaXB0VmFs dWU7CiBjbGFzcyBQb3BTdGF0ZUV2ZW50IDogcHVibGljIEV2ZW50IHsKIHB1YmxpYzoKICAgICB2 aXJ0dWFsIH5Qb3BTdGF0ZUV2ZW50KCk7Ci0KKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxQb3BTdGF0 ZUV2ZW50PiBjcmVhdGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQb3BT dGF0ZUV2ZW50KTsKKyAgICB9CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UG9wU3RhdGVFdmVudD4g Y3JlYXRlKFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzdGF0ZU9iamVjdCkKICAg ICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wU3RhdGVFdmVudChzdGF0ZU9iamVj dCkpOwpAQCAtNDgsNiArNTEsOSBAQCBwdWJsaWM6CiAKICAgICBTZXJpYWxpemVkU2NyaXB0VmFs dWUqIHN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZU9iamVjdC5nZXQoKTsgfSAgICAKIAor cHJvdGVjdGVkOgorICAgIFBvcFN0YXRlRXZlbnQoKTsKKwogcHJpdmF0ZToKICAgICBleHBsaWNp dCBQb3BTdGF0ZUV2ZW50KFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPik7CiAKSW5k ZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQtZXhwZWN0ZWQu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUt ZXZlbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVu dHMvZmlyZS1wb3BzdGF0ZS1ldmVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTAgQEAKK0NoZWNrcyB0aGF0IHRoZSBwb3BzdGF0ZSBldmVudCBmaXJlcyB3aGVuIGRpc3Bh dGNoZWQgdmlhIGNyZWF0ZUV2ZW50CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmll cyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQ QVNTIFBvcHN0YXRlIHN0YXRlOiAoU3VjY2VzcykKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlz IHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9m aXJlLXBvcHN0YXRlLWV2ZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9l dmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDMzIEBACisKKzxodG1sPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9q cy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8Ym9keSBzdHlsZT0ibWluLXdpZHRoOiA1 MDAwcHg7IG1pbi1oZWlnaHQ6IDUwMDBweCI+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxk aXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCdDaGVja3MgdGhh dCB0aGUgcG9wc3RhdGUgZXZlbnQgZmlyZXMgd2hlbiBkaXNwYXRjaGVkIHZpYSBjcmVhdGVFdmVu dCcpOworCitvbnBvcHN0YXRlID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgaWYoISFldmVudC5z dGF0ZSAmJiAhIWV2ZW50LnN0YXRlLnRlc3RWYWx1ZSkgCisgICAgeworICAgICAgICB0ZXN0UGFz c2VkKCdQb3BzdGF0ZSBzdGF0ZTogKCcgKyBldmVudC5zdGF0ZS50ZXN0VmFsdWUgKycpJyk7Cisg ICAgfQorfQorCitvbmxvYWQgPSBmdW5jdGlvbigpCit7CisgICAgdmFyIGV2dCA9IGRvY3VtZW50 LmNyZWF0ZUV2ZW50KCJQb3BTdGF0ZUV2ZW50Iik7CisgICAgZXZ0LmluaXRQb3BTdGF0ZUV2ZW50 KCJwb3BzdGF0ZSIsIGZhbHNlLCBmYWxzZSwgeyB0ZXN0VmFsdWU6ICJTdWNjZXNzIn0gKTsKKyAg ICB3aW5kb3cuZGlzcGF0Y2hFdmVudChldnQpOworfQorCitzZXRUaW1lb3V0KGZpbmlzaEpTVGVz dCwgNTAwKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cit2YXIganNUZXN0SXNB c3luYyA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 96053 2011-06-05 11:02:25 -0700 2011-06-06 08:23:44 -0700 Fixes based on feedback from previous review. PopStateEventPatch.txt text/plain 5231 paulkinlan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTIz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYt MDQgIFBhdWwgS2lubGFuICA8cGF1bGtpbmxhbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCBkZXZlbG9wZXJzIGNyZWF0ZUV2 ZW50KCJQb3BTdGF0ZUV2ZW50IiksIHByZXZpb3VzbHkgaXQgd2Fzbid0CisgICAgICAgIGV4cG9z ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjA5 OQorCisgICAgICAgICogLi4vTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1l dmVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIC4uL0xheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQuaHRtbDogQWRkZWQuCisgICAgICAgICogLi4vU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKiAuLi9Tb3VyY2UvV2ViQ29y ZS9kb20vUG9wU3RhdGVFdmVudC5jcHA6CisgICAgICAgICogLi4vU291cmNlL1dlYkNvcmUvZG9t L1BvcFN0YXRlRXZlbnQuaDoKKwogMjAxMS0wNi0wNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIENvbmZpZ3VyZSBuZXcgY29tbWl0LXF1ZXVlIGluc3RhbmNlLiAg KFBsZWFzZSBpZ25vcmUuKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiA4 Nzc5MikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM1NjgsNiArMzU2OCw4IEBAIFBhc3NSZWZQdHI8RXZlbnQ+IERvY3VtZW50OjpjcmVhdGVF dmVudCgKICAgICAgICAgZXZlbnQgPSBPdmVyZmxvd0V2ZW50OjpjcmVhdGUoKTsKICAgICBlbHNl IGlmIChldmVudFR5cGUgPT0gIlBhZ2VUcmFuc2l0aW9uRXZlbnQiKQogICAgICAgICBldmVudCA9 IFBhZ2VUcmFuc2l0aW9uRXZlbnQ6OmNyZWF0ZSgpOworICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9 PSAiUG9wU3RhdGVFdmVudCIpCisgICAgICAgIGV2ZW50ID0gUG9wU3RhdGVFdmVudDo6Y3JlYXRl KCk7IAogICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9PSAiUHJvZ3Jlc3NFdmVudCIpCiAgICAgICAg IGV2ZW50ID0gUHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKCk7CiAjaWYgRU5BQkxFKERPTV9TVE9SQUdF KQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2ZW50LmNwcAkocmV2aXNpb24gODc3OTIp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMxLDYgKzMxLDEyIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorUG9wU3RhdGVFdmVu dDo6UG9wU3RhdGVFdmVudCgpCisgICAgOiBFdmVudChldmVudE5hbWVzKCkucG9wc3RhdGVFdmVu dCwgZmFsc2UsIHRydWUpCisgICAgLCBtX3N0YXRlT2JqZWN0KCkKK3sKK30KKwogUG9wU3RhdGVF dmVudDo6UG9wU3RhdGVFdmVudChQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc3Rh dGVPYmplY3QpCiAgICAgOiBFdmVudChldmVudE5hbWVzKCkucG9wc3RhdGVFdmVudCwgZmFsc2Us IHRydWUpCiAgICAgLCBtX3N0YXRlT2JqZWN0KHN0YXRlT2JqZWN0KQpAQCAtNDEsNiArNDcsMTYg QEAgUG9wU3RhdGVFdmVudDo6flBvcFN0YXRlRXZlbnQoKQogewogfQogCitQYXNzUmVmUHRyPFBv cFN0YXRlRXZlbnQ+IFBvcFN0YXRlRXZlbnQ6OmNyZWF0ZSgpCit7CisgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyBQb3BTdGF0ZUV2ZW50KTsKK30KKworUGFzc1JlZlB0cjxQb3BTdGF0ZUV2ZW50PiBQ b3BTdGF0ZUV2ZW50OjpjcmVhdGUoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0 YXRlT2JqZWN0KQoreworICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wU3RhdGVFdmVudChzdGF0 ZU9iamVjdCkpOworfQorCiB2b2lkIFBvcFN0YXRlRXZlbnQ6OmluaXRQb3BTdGF0ZUV2ZW50KGNv bnN0IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBjYW5CdWJibGUsIGJvb2wgY2FuY2VsYWJsZSwg UGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRlT2JqZWN0KQogewogICAgIGlm IChkaXNwYXRjaGVkKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3RhdGVFdmVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2ZW50LmgJKHJldmlz aW9uIDg3NzkyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzcsMjAgKzM3LDE2IEBAIGNsYXNzIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTsK IGNsYXNzIFBvcFN0YXRlRXZlbnQgOiBwdWJsaWMgRXZlbnQgewogcHVibGljOgogICAgIHZpcnR1 YWwgflBvcFN0YXRlRXZlbnQoKTsKLQotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFBvcFN0YXRlRXZl bnQ+IGNyZWF0ZShQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc3RhdGVPYmplY3Qp Ci0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcFN0YXRlRXZlbnQoc3RhdGVP YmplY3QpKTsKLSAgICB9Ci0KKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxQb3BTdGF0ZUV2ZW50PiBj cmVhdGUoKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxQb3BTdGF0ZUV2ZW50PiBjcmVhdGUoUGFz c1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRlT2JqZWN0KTsKICAgICB2b2lkIGlu aXRQb3BTdGF0ZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBjYW5CdWJibGUs IGJvb2wgY2FuY2VsYWJsZSwgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+KTsKICAg ICBib29sIGlzUG9wU3RhdGVFdmVudCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAogICAgIFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZSogc3RhdGUoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlT2JqZWN0 LmdldCgpOyB9ICAgIAogCiBwcml2YXRlOgorICAgIFBvcFN0YXRlRXZlbnQoKTsKICAgICBleHBs aWNpdCBQb3BTdGF0ZUV2ZW50KFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPik7Ci0K ICAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBtX3N0YXRlT2JqZWN0OwogfTsKIApJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0 ZS1ldmVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9maXJlLXBvcHN0YXRlLWV2ZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwxMCBAQAorQ2hlY2tzIHRoYXQgdGhlIHBvcHN0YXRlIGV2ZW50IGZpcmVzIHdoZW4gZGlz cGF0Y2hlZCB2aWEgY3JlYXRlRXZlbnQKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK K1BBU1MgUG9wc3RhdGUgc3RhdGU6IChTdWNjZXNzKQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQg aXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRz L2ZpcmUtcG9wc3RhdGUtZXZlbnQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy9maXJlLXBvcHN0YXRlLWV2ZW50Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy9maXJlLXBvcHN0YXRlLWV2ZW50Lmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMzMgQEAKKworPGh0bWw+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxib2R5IHN0eWxlPSJtaW4td2lkdGg6 IDUwMDBweDsgbWluLWhlaWdodDogNTAwMHB4Ij4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgor PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oJ0NoZWNrcyB0 aGF0IHRoZSBwb3BzdGF0ZSBldmVudCBmaXJlcyB3aGVuIGRpc3BhdGNoZWQgdmlhIGNyZWF0ZUV2 ZW50Jyk7CisKK29ucG9wc3RhdGUgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBpZighIWV2ZW50 LnN0YXRlICYmICEhZXZlbnQuc3RhdGUudGVzdFZhbHVlKSAKKyAgICB7CisgICAgICAgIHRlc3RQ YXNzZWQoJ1BvcHN0YXRlIHN0YXRlOiAoJyArIGV2ZW50LnN0YXRlLnRlc3RWYWx1ZSArJyknKTsK KyAgICB9Cit9CisKK29ubG9hZCA9IGZ1bmN0aW9uKCkKK3sKKyAgICB2YXIgZXZ0ID0gZG9jdW1l bnQuY3JlYXRlRXZlbnQoIlBvcFN0YXRlRXZlbnQiKTsKKyAgICBldnQuaW5pdFBvcFN0YXRlRXZl bnQoInBvcHN0YXRlIiwgZmFsc2UsIGZhbHNlLCB7IHRlc3RWYWx1ZTogIlN1Y2Nlc3MifSApOwor ICAgIHdpbmRvdy5kaXNwYXRjaEV2ZW50KGV2dCk7Cit9CisKK3NldFRpbWVvdXQoZmluaXNoSlNU ZXN0LCA1MDApOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKK3ZhciBqc1Rlc3RJ c0FzeW5jID0gdHJ1ZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9q cy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 96094 2011-06-06 08:23:44 -0700 2011-06-06 14:15:57 -0700 Fixes based on feedback from previous review. PopStateEventPatch.txt text/plain 5707 paulkinlan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NzkyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDYtMDQgIFBhdWwgS2lu bGFuICA8cGF1bGtpbmxhbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExldCBkZXZlbG9wZXJzIGNhbGwgY3JlYXRlRXZlbnQoIlBv cFN0YXRlRXZlbnQiKSwgcHJldmlvdXNseSBpdCB3YXNuJ3QKKyAgICAgICAgZXhwb3NlZCBhbmQg dGhyZXcgYW4gZXhlY2VwdGlvbi4gCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02MjA5OQorCisgICAgICAgICogV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw OgorICAgICAgICAqIFdlYkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuY3BwOgorICAgICAgICAqIFdl YkNvcmUvZG9tL1BvcFN0YXRlRXZlbnQuaDoKKwogMjAxMS0wNi0wMSAgSmF5IENpdmVsbGkgIDxq Y2l2ZWxsaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gODc3OTIpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTY4LDYgKzM1Njgs OCBAQCBQYXNzUmVmUHRyPEV2ZW50PiBEb2N1bWVudDo6Y3JlYXRlRXZlbnQoCiAgICAgICAgIGV2 ZW50ID0gT3ZlcmZsb3dFdmVudDo6Y3JlYXRlKCk7CiAgICAgZWxzZSBpZiAoZXZlbnRUeXBlID09 ICJQYWdlVHJhbnNpdGlvbkV2ZW50IikKICAgICAgICAgZXZlbnQgPSBQYWdlVHJhbnNpdGlvbkV2 ZW50OjpjcmVhdGUoKTsKKyAgICBlbHNlIGlmIChldmVudFR5cGUgPT0gIlBvcFN0YXRlRXZlbnQi KQorICAgICAgICBldmVudCA9IFBvcFN0YXRlRXZlbnQ6OmNyZWF0ZSgpOyAKICAgICBlbHNlIGlm IChldmVudFR5cGUgPT0gIlByb2dyZXNzRXZlbnQiKQogICAgICAgICBldmVudCA9IFByb2dyZXNz RXZlbnQ6OmNyZWF0ZSgpOwogI2lmIEVOQUJMRShET01fU1RPUkFHRSkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2RvbS9Qb3BTdGF0ZUV2ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vUG9wU3RhdGVFdmVudC5jcHAJKHJldmlzaW9uIDg3NzkyKQorKysgU291cmNlL1dlYkNv cmUvZG9tL1BvcFN0YXRlRXZlbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSwxMSBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK1BvcFN0YXRlRXZlbnQ6OlBvcFN0YXRlRXZlbnQo KQorICAgIDogRXZlbnQoZXZlbnROYW1lcygpLnBvcHN0YXRlRXZlbnQsIGZhbHNlLCB0cnVlKQor eworfQorCiBQb3BTdGF0ZUV2ZW50OjpQb3BTdGF0ZUV2ZW50KFBhc3NSZWZQdHI8U2VyaWFsaXpl ZFNjcmlwdFZhbHVlPiBzdGF0ZU9iamVjdCkKICAgICA6IEV2ZW50KGV2ZW50TmFtZXMoKS5wb3Bz dGF0ZUV2ZW50LCBmYWxzZSwgdHJ1ZSkKICAgICAsIG1fc3RhdGVPYmplY3Qoc3RhdGVPYmplY3Qp CkBAIC00MSw2ICs0NiwxNiBAQCBQb3BTdGF0ZUV2ZW50Ojp+UG9wU3RhdGVFdmVudCgpCiB7CiB9 CiAKK1Bhc3NSZWZQdHI8UG9wU3RhdGVFdmVudD4gUG9wU3RhdGVFdmVudDo6Y3JlYXRlKCkKK3sK KyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcFN0YXRlRXZlbnQpOworfQorCitQYXNzUmVmUHRy PFBvcFN0YXRlRXZlbnQ+IFBvcFN0YXRlRXZlbnQ6OmNyZWF0ZShQYXNzUmVmUHRyPFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZT4gc3RhdGVPYmplY3QpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQ b3BTdGF0ZUV2ZW50KHN0YXRlT2JqZWN0KSk7Cit9CisKIHZvaWQgUG9wU3RhdGVFdmVudDo6aW5p dFBvcFN0YXRlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGNhbkJ1YmJsZSwg Ym9vbCBjYW5jZWxhYmxlLCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc3RhdGVP YmplY3QpCiB7CiAgICAgaWYgKGRpc3BhdGNoZWQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Rv bS9Qb3BTdGF0ZUV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1BvcFN0 YXRlRXZlbnQuaAkocmV2aXNpb24gODc3OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9wU3Rh dGVFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNywyMCArMzcsMTYgQEAgY2xhc3MgU2VyaWFs aXplZFNjcmlwdFZhbHVlOwogY2xhc3MgUG9wU3RhdGVFdmVudCA6IHB1YmxpYyBFdmVudCB7CiBw dWJsaWM6CiAgICAgdmlydHVhbCB+UG9wU3RhdGVFdmVudCgpOwotCi0gICAgc3RhdGljIFBhc3NS ZWZQdHI8UG9wU3RhdGVFdmVudD4gY3JlYXRlKFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZh bHVlPiBzdGF0ZU9iamVjdCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9w U3RhdGVFdmVudChzdGF0ZU9iamVjdCkpOwotICAgIH0KLQorICAgIHN0YXRpYyBQYXNzUmVmUHRy PFBvcFN0YXRlRXZlbnQ+IGNyZWF0ZSgpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFBvcFN0YXRl RXZlbnQ+IGNyZWF0ZShQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4pOwogICAgIHZv aWQgaW5pdFBvcFN0YXRlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGNhbkJ1 YmJsZSwgYm9vbCBjYW5jZWxhYmxlLCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4p OwogICAgIGJvb2wgaXNQb3BTdGF0ZUV2ZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAg ICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKiBzdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGVP YmplY3QuZ2V0KCk7IH0gICAgCiAKIHByaXZhdGU6CisgICAgUG9wU3RhdGVFdmVudCgpOwogICAg IGV4cGxpY2l0IFBvcFN0YXRlRXZlbnQoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+ KTsKLQogICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IG1fc3RhdGVPYmplY3Q7CiB9 OwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4Nzc5MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTA2LTA0ICBQYXVsIEtpbmxhbiAg PHBhdWxraW5sYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRzIGEgdGVzdCBmb3IgZmlyaW5nIHBvcHN0YXRlLCB1c2luZyB3 aW5kb3cuZGlzcGF0Y2hFdmVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYyMDk5CisKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9maXJlLXBvcHN0YXRl LWV2ZW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ldmVudHMvZmlyZS1w b3BzdGF0ZS1ldmVudC5odG1sOiBBZGRlZC4KKwogMjAxMS0wNi0wMSAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCB0cml2aWFs IGZpeCBhZnRlciByODc3NzguCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9maXJlLXBv cHN0YXRlLWV2ZW50LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy9maXJlLXBvcHN0YXRlLWV2ZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQtZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEwIEBACitDaGVja3MgdGhhdCB0aGUgcG9wc3RhdGUg ZXZlbnQgZmlyZXMgd2hlbiBkaXNwYXRjaGVkIHZpYSBjcmVhdGVFdmVudAorCitPbiBzdWNjZXNz LCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAi VEVTVCBDT01QTEVURSIuCisKKworUEFTUyBQb3BzdGF0ZSBzdGF0ZTogKFN1Y2Nlc3MpCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvZmlyZS1wb3BzdGF0ZS1ldmVudC5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQuaHRtbAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2ZpcmUtcG9wc3RhdGUtZXZlbnQu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzMyBAQAorCis8aHRtbD4KKzxsaW5rIHJlbD0i c3R5bGVzaGVldCIgaHJlZj0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxz Y3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPGJv ZHkgc3R5bGU9Im1pbi13aWR0aDogNTAwMHB4OyBtaW4taGVpZ2h0OiA1MDAwcHgiPgorPHAgaWQ9 ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+Citk ZXNjcmlwdGlvbignQ2hlY2tzIHRoYXQgdGhlIHBvcHN0YXRlIGV2ZW50IGZpcmVzIHdoZW4gZGlz cGF0Y2hlZCB2aWEgY3JlYXRlRXZlbnQnKTsKKworb25wb3BzdGF0ZSA9IGZ1bmN0aW9uKGV2ZW50 KQoreworICAgIGlmKCEhZXZlbnQuc3RhdGUgJiYgISFldmVudC5zdGF0ZS50ZXN0VmFsdWUpIAor ICAgIHsKKyAgICAgICAgdGVzdFBhc3NlZCgnUG9wc3RhdGUgc3RhdGU6ICgnICsgZXZlbnQuc3Rh dGUudGVzdFZhbHVlICsnKScpOworICAgIH0KK30KKworb25sb2FkID0gZnVuY3Rpb24oKQorewor ICAgIHZhciBldnQgPSBkb2N1bWVudC5jcmVhdGVFdmVudCgiUG9wU3RhdGVFdmVudCIpOworICAg IGV2dC5pbml0UG9wU3RhdGVFdmVudCgicG9wc3RhdGUiLCBmYWxzZSwgZmFsc2UsIHsgdGVzdFZh bHVlOiAiU3VjY2VzcyJ9ICk7CisgICAgd2luZG93LmRpc3BhdGNoRXZlbnQoZXZ0KTsKK30KKwor c2V0VGltZW91dChmaW5pc2hKU1Rlc3QsIDUwMCk7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQg PSB0cnVlOwordmFyIGpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+Cg==