31838 2009-11-24 10:11:08 -0800 Nested start/stop events in dispatchDidChangeLocationWithinPage for pages that do fragment redirect in window.onload 2009-12-01 10:44:12 -0800 1 1 1 Unclassified WebKit WebKit API 420+ All All RESOLVED FIXED P2 Normal --- 0 xiyuan webkit-unassigned abarth commit-queue fishd oldest_to_newest 166136 0 xiyuan 2009-11-24 10:11:08 -0800 Start/stop events are generated in dispatchDidChangeLocationWithinPage for WebView delegate. Currently they are generated regardless whether a frame is is loading or not. This causes nested start/stop events being fired when dispatchDidChangeLocationWithinPage happens from a fragment redirect in window.onloader handler. Attached patch makes the start/stop events only being fired when the page's main frame has stopped loading to avoid such situation. 166138 1 43780 xiyuan 2009-11-24 10:13:32 -0800 Created attachment 43780 Proposed patch. 166228 2 43780 fishd 2009-11-24 12:08:50 -0800 Comment on attachment 43780 Proposed patch. > Index: third_party/WebKit/WebKit/chromium/src/FrameLoaderClientImpl.cpp ... > + // Flag of whether frame loader is completed. Generate didStartLoading and > + // didStopLoading only when loader is completed so that we don't fire > + // them for fragment redirection that happens in window.onload handler. > + // See http://crbug.com/15782 nit: please link to the bugs.webkit.org bug instead. that bug can have a reference to the chromium bug if you think it would be helpful. also, you need to include a modification to WebCore/ChangeLog. please see the instructions here: http://webkit.org/coding/contributing.html 166249 3 43800 xiyuan 2009-11-24 12:43:38 -0800 Created attachment 43800 updated per Darin's comments - Added ChangeLog using prepare-ChangeLog; - Update bug link per suggestion; 166250 4 43801 xiyuan 2009-11-24 12:50:30 -0800 Created attachment 43801 remove scm.py change Remove my local scm.py change that accidentally gets into the previous diff. 166310 5 43801 fishd 2009-11-24 16:48:31 -0800 Comment on attachment 43801 remove scm.py change R=me, but please remember to set the '?' on the review flag in the future. Otherwise, reviewers may never notice your patch! 166315 6 43801 commit-queue 2009-11-24 17:53:52 -0800 Comment on attachment 43801 remove scm.py change Rejecting patch 43801 from commit-queue. Found no modified ChangeLogs, cannot create a commit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html 166351 7 43801 xiyuan 2009-11-24 22:02:42 -0800 Comment on attachment 43801 remove scm.py change Is it because my diff is from git? 166649 8 43801 eric 2009-11-25 22:43:20 -0800 Comment on attachment 43801 remove scm.py change I have no idea why the cq failed here. Let's spin again and see if it fails a second time. If it does, then I'll try to debug why. 166652 9 43801 commit-queue 2009-11-25 22:54:35 -0800 Comment on attachment 43801 remove scm.py change Rejecting patch 43801 from commit-queue. Found no modified ChangeLogs, cannot create a commit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html 167306 10 44030 xiyuan 2009-11-30 11:19:36 -0800 Created attachment 44030 update patch Previous patch is rejected by commit-queue bot because my base ChangeLog is too old and the bot failed to patc. I have updated the patch and hopefully it works this time. Thanks. 167392 11 abarth 2009-11-30 12:52:24 -0800 style-queue ran check-webkit-style on attachment 44030 without any errors. 167671 12 44030 commit-queue 2009-12-01 10:44:04 -0800 Comment on attachment 44030 update patch Clearing flags on attachment: 44030 Committed r51548: <http://trac.webkit.org/changeset/51548> 167672 13 commit-queue 2009-12-01 10:44:12 -0800 All reviewed patches have been landed. Closing bug. 43780 2009-11-24 10:13:32 -0800 2009-11-24 12:43:38 -0800 Proposed patch. frame_loader_client_impl.diff text/plain 1448 xiyuan SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViS2l0 L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCShyZXZpc2lvbiA1MTIzNykN CisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNs aWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTMzLDcgKzUzMywxNiBAQA0KICAgICAv LyBBbmNob3IgZnJhZ21lbnQgbmF2aWdhdGlvbnMgYXJlIG5vdCBub3JtYWwgbG9hZHMsIHNvIHdl IG5lZWQgdG8gc3ludGhlc2l6ZQogICAgIC8vIHNvbWUgZXZlbnRzIGZvciBvdXIgZGVsZWdhdGUu CiAgICAgV2ViVmlld0ltcGwqIHdlYlZpZXcgPSBtX3dlYkZyYW1lLT52aWV3SW1wbCgpOwotICAg IGlmICh3ZWJWaWV3LT5jbGllbnQoKSkKKworICAgIC8vIEZsYWcgb2Ygd2hldGhlciBmcmFtZSBs b2FkZXIgaXMgY29tcGxldGVkLiBHZW5lcmF0ZSBkaWRTdGFydExvYWRpbmcgYW5kCisgICAgLy8g ZGlkU3RvcExvYWRpbmcgb25seSB3aGVuIGxvYWRlciBpcyBjb21wbGV0ZWQgc28gdGhhdCB3ZSBk b24ndCBmaXJlCisgICAgLy8gdGhlbSBmb3IgZnJhZ21lbnQgcmVkaXJlY3Rpb24gdGhhdCBoYXBw ZW5zIGluIHdpbmRvdy5vbmxvYWQgaGFuZGxlci4KKyAgICAvLyBTZWUgaHR0cDovL2NyYnVnLmNv bS8xNTc4MgorICAgIGJvb2wgbG9hZGVyQ29tcGxldGVkID0KKyAgICAgICAgIW1fd2ViRnJhbWUt PmZyYW1lKCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5pc0xvYWRpbmcoKTsKKwor ICAgIC8vIEdlbmVyYXRlIGRpZFN0YXJ0TG9hZGluZyBpZiBsb2FkZXIgaXMgY29tcGxldGVkLgor ICAgIGlmICh3ZWJWaWV3LT5jbGllbnQoKSAmJiBsb2FkZXJDb21wbGV0ZWQpCiAgICAgICAgIHdl YlZpZXctPmNsaWVudCgpLT5kaWRTdGFydExvYWRpbmcoKTsKIAogICAgIFdlYkRhdGFTb3VyY2VJ bXBsKiBkcyA9IG1fd2ViRnJhbWUtPmRhdGFTb3VyY2VJbXBsKCk7CkBAIC01NzksNyArNTg4LDgg QEANCiAgICAgaWYgKG1fd2ViRnJhbWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5j bGllbnQoKS0+ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKG1fd2ViRnJhbWUsIGlzTmV3TmF2 aWdhdGlvbik7CiAKLSAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkpCisgICAgLy8gR2VuZXJhdGUg ZGlkU3RvcExvYWRpbmcgaWYgbG9hZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+ Y2xpZW50KCkgJiYgbG9hZGVyQ29tcGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ ZGlkU3RvcExvYWRpbmcoKTsKIH0KIAo= 43800 2009-11-24 12:43:38 -0800 2009-11-24 12:50:30 -0800 updated per Darin's comments frame_loader_client_impl.diff text/plain 2749 xiyuan ZGlmZiAtLWdpdCBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKaW5kZXggOTIwMmVkMC4uZGE5MDMxZCAxMDA2NDQKLS0tIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAwOS0xMS0yNCAgWGl5dWFuICA8eGl5dWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGZpcmUgc3RhcnQvc3RvcCBl dmVudHMgd2hlbiBtYWluIGZyYW1lIGlzIG5vdCBsb2FkaW5nLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTgzOAorCisgICAgICAgICogc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xp ZW50SW1wbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UpOgorCiAyMDA5LTEx LTE5ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAgV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuY3BwCmluZGV4IDRhYjZlZDguLjNmN2Y1NGUgMTAwNjQ0Ci0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv RnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAtNTMzLDcgKzUzMywxNiBAQCB2b2lkIEZyYW1l TG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQog ICAgIC8vIEFuY2hvciBmcmFnbWVudCBuYXZpZ2F0aW9ucyBhcmUgbm90IG5vcm1hbCBsb2Fkcywg c28gd2UgbmVlZCB0byBzeW50aGVzaXplCiAgICAgLy8gc29tZSBldmVudHMgZm9yIG91ciBkZWxl Z2F0ZS4KICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IG1fd2ViRnJhbWUtPnZpZXdJbXBsKCk7 Ci0gICAgaWYgKHdlYlZpZXctPmNsaWVudCgpKQorCisgICAgLy8gRmxhZyBvZiB3aGV0aGVyIGZy YW1lIGxvYWRlciBpcyBjb21wbGV0ZWQuIEdlbmVyYXRlIGRpZFN0YXJ0TG9hZGluZyBhbmQKKyAg ICAvLyBkaWRTdG9wTG9hZGluZyBvbmx5IHdoZW4gbG9hZGVyIGlzIGNvbXBsZXRlZCBzbyB0aGF0 IHdlIGRvbid0IGZpcmUKKyAgICAvLyB0aGVtIGZvciBmcmFnbWVudCByZWRpcmVjdGlvbiB0aGF0 IGhhcHBlbnMgaW4gd2luZG93Lm9ubG9hZCBoYW5kbGVyLgorICAgIC8vIFNlZSBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE4MzgKKyAgICBib29sIGxvYWRlckNvbXBs ZXRlZCA9CisgICAgICAgICFtX3dlYkZyYW1lLT5mcmFtZSgpLT5wYWdlKCktPm1haW5GcmFtZSgp LT5sb2FkZXIoKS0+aXNMb2FkaW5nKCk7CisKKyAgICAvLyBHZW5lcmF0ZSBkaWRTdGFydExvYWRp bmcgaWYgbG9hZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkgJiYg bG9hZGVyQ29tcGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkU3RhcnRMb2Fk aW5nKCk7CiAKICAgICBXZWJEYXRhU291cmNlSW1wbCogZHMgPSBtX3dlYkZyYW1lLT5kYXRhU291 cmNlSW1wbCgpOwpAQCAtNTc5LDcgKzU4OCw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBs OjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpCiAgICAgaWYgKG1fd2ViRnJh bWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5jbGllbnQoKS0+ZGlkQ2hhbmdlTG9j YXRpb25XaXRoaW5QYWdlKG1fd2ViRnJhbWUsIGlzTmV3TmF2aWdhdGlvbik7CiAKLSAgICBpZiAo d2ViVmlldy0+Y2xpZW50KCkpCisgICAgLy8gR2VuZXJhdGUgZGlkU3RvcExvYWRpbmcgaWYgbG9h ZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkgJiYgbG9hZGVyQ29t cGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkU3RvcExvYWRpbmcoKTsKIH0K IApkaWZmIC0tZ2l0IFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkgV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCA3N2IzYTIxLi40NzA0YmJhIDEwMDY0NAot LS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQorKysgV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMTI4LDcgKzEyOCwxMSBAQCBjbGFzcyBTQ006CiAgICAg ICAgICAgICBzdGRpbiA9IGlucHV0CiAgICAgICAgICAgICBzdHJpbmdfdG9fY29tbXVuaWNhdGUg PSBOb25lCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzdGRpbiA9IHN1YnByb2Nlc3MuUElQ RSBpZiBpbnB1dCBlbHNlIE5vbmUKKyAgICAgICAgICAgICMgc3RkaW4gPSBzdWJwcm9jZXNzLlBJ UEUgaWYgaW5wdXQgZWxzZSBOb25lCisgICAgICAgICAgICBpZiBpbnB1dDoKKyAgICAgICAgICAg ICAgc3RkaW4gPSBzdWJwcm9jZXNzLlBJUEUKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAg ICAgIHN0ZGluID0gTm9uZQogICAgICAgICAgICAgc3RyaW5nX3RvX2NvbW11bmljYXRlID0gaW5w dXQKICAgICAgICAgaWYgcmV0dXJuX3N0ZGVycjoKICAgICAgICAgICAgIHN0ZGVyciA9IHN1YnBy b2Nlc3MuU1RET1VUCg== 43801 2009-11-24 12:50:30 -0800 2009-11-30 11:19:36 -0800 remove scm.py change frame_loader_client_impl.diff text/plain 2111 xiyuan ZGlmZiAtLWdpdCBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKaW5kZXggOTIwMmVkMC4uZGE5MDMxZCAxMDA2NDQKLS0tIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAwOS0xMS0yNCAgWGl5dWFuICA8eGl5dWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGZpcmUgc3RhcnQvc3RvcCBl dmVudHMgd2hlbiBtYWluIGZyYW1lIGlzIG5vdCBsb2FkaW5nLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTgzOAorCisgICAgICAgICogc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xp ZW50SW1wbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UpOgorCiAyMDA5LTEx LTE5ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAgV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuY3BwCmluZGV4IDRhYjZlZDguLjNmN2Y1NGUgMTAwNjQ0Ci0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv RnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAtNTMzLDcgKzUzMywxNiBAQCB2b2lkIEZyYW1l TG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQog ICAgIC8vIEFuY2hvciBmcmFnbWVudCBuYXZpZ2F0aW9ucyBhcmUgbm90IG5vcm1hbCBsb2Fkcywg c28gd2UgbmVlZCB0byBzeW50aGVzaXplCiAgICAgLy8gc29tZSBldmVudHMgZm9yIG91ciBkZWxl Z2F0ZS4KICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IG1fd2ViRnJhbWUtPnZpZXdJbXBsKCk7 Ci0gICAgaWYgKHdlYlZpZXctPmNsaWVudCgpKQorCisgICAgLy8gRmxhZyBvZiB3aGV0aGVyIGZy YW1lIGxvYWRlciBpcyBjb21wbGV0ZWQuIEdlbmVyYXRlIGRpZFN0YXJ0TG9hZGluZyBhbmQKKyAg ICAvLyBkaWRTdG9wTG9hZGluZyBvbmx5IHdoZW4gbG9hZGVyIGlzIGNvbXBsZXRlZCBzbyB0aGF0 IHdlIGRvbid0IGZpcmUKKyAgICAvLyB0aGVtIGZvciBmcmFnbWVudCByZWRpcmVjdGlvbiB0aGF0 IGhhcHBlbnMgaW4gd2luZG93Lm9ubG9hZCBoYW5kbGVyLgorICAgIC8vIFNlZSBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE4MzgKKyAgICBib29sIGxvYWRlckNvbXBs ZXRlZCA9CisgICAgICAgICFtX3dlYkZyYW1lLT5mcmFtZSgpLT5wYWdlKCktPm1haW5GcmFtZSgp LT5sb2FkZXIoKS0+aXNMb2FkaW5nKCk7CisKKyAgICAvLyBHZW5lcmF0ZSBkaWRTdGFydExvYWRp bmcgaWYgbG9hZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkgJiYg bG9hZGVyQ29tcGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkU3RhcnRMb2Fk aW5nKCk7CiAKICAgICBXZWJEYXRhU291cmNlSW1wbCogZHMgPSBtX3dlYkZyYW1lLT5kYXRhU291 cmNlSW1wbCgpOwpAQCAtNTc5LDcgKzU4OCw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBs OjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpCiAgICAgaWYgKG1fd2ViRnJh bWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5jbGllbnQoKS0+ZGlkQ2hhbmdlTG9j YXRpb25XaXRoaW5QYWdlKG1fd2ViRnJhbWUsIGlzTmV3TmF2aWdhdGlvbik7CiAKLSAgICBpZiAo d2ViVmlldy0+Y2xpZW50KCkpCisgICAgLy8gR2VuZXJhdGUgZGlkU3RvcExvYWRpbmcgaWYgbG9h ZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkgJiYgbG9hZGVyQ29t cGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkU3RvcExvYWRpbmcoKTsKIH0K IAo= 44030 2009-11-30 11:19:36 -0800 2009-12-01 10:44:04 -0800 update patch 31838.diff text/plain 2129 xiyuan SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTE1MDEpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTEtMzAgIFhpeXVh biBYaWEgIDx4aXl1YW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgZmlyZSBzdGFydC9zdG9wIGV2ZW50cyB3aGVuIG1h aW4gZnJhbWUgaXMgbm90IGxvYWRpbmcuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMxODM4CisKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGll bnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNw YXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSk6CisKIDIwMDktMTEtMjcgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2 ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJ bXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xp ZW50SW1wbC5jcHAJKHJldmlzaW9uIDUxNDk5KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFt ZUxvYWRlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzksNyArNTM5LDE2IEBA IHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERpZEMKICAgICAvLyBBbmNob3Ig ZnJhZ21lbnQgbmF2aWdhdGlvbnMgYXJlIG5vdCBub3JtYWwgbG9hZHMsIHNvIHdlIG5lZWQgdG8g c3ludGhlc2l6ZQogICAgIC8vIHNvbWUgZXZlbnRzIGZvciBvdXIgZGVsZWdhdGUuCiAgICAgV2Vi Vmlld0ltcGwqIHdlYlZpZXcgPSBtX3dlYkZyYW1lLT52aWV3SW1wbCgpOwotICAgIGlmICh3ZWJW aWV3LT5jbGllbnQoKSkKKworICAgIC8vIEZsYWcgb2Ygd2hldGhlciBmcmFtZSBsb2FkZXIgaXMg Y29tcGxldGVkLiBHZW5lcmF0ZSBkaWRTdGFydExvYWRpbmcgYW5kCisgICAgLy8gZGlkU3RvcExv YWRpbmcgb25seSB3aGVuIGxvYWRlciBpcyBjb21wbGV0ZWQgc28gdGhhdCB3ZSBkb24ndCBmaXJl CisgICAgLy8gdGhlbSBmb3IgZnJhZ21lbnQgcmVkaXJlY3Rpb24gdGhhdCBoYXBwZW5zIGluIHdp bmRvdy5vbmxvYWQgaGFuZGxlci4KKyAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMxODM4CisgICAgYm9vbCBsb2FkZXJDb21wbGV0ZWQgPQorICAgICAg ICAhbV93ZWJGcmFtZS0+ZnJhbWUoKS0+cGFnZSgpLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmlz TG9hZGluZygpOworCisgICAgLy8gR2VuZXJhdGUgZGlkU3RhcnRMb2FkaW5nIGlmIGxvYWRlciBp cyBjb21wbGV0ZWQuCisgICAgaWYgKHdlYlZpZXctPmNsaWVudCgpICYmIGxvYWRlckNvbXBsZXRl ZCkKICAgICAgICAgd2ViVmlldy0+Y2xpZW50KCktPmRpZFN0YXJ0TG9hZGluZygpOwogCiAgICAg V2ViRGF0YVNvdXJjZUltcGwqIGRzID0gbV93ZWJGcmFtZS0+ZGF0YVNvdXJjZUltcGwoKTsKQEAg LTU4NSw3ICs1OTQsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWRD CiAgICAgaWYgKG1fd2ViRnJhbWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5jbGll bnQoKS0+ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKG1fd2ViRnJhbWUsIGlzTmV3TmF2aWdh dGlvbik7CiAKLSAgICBpZiAod2ViVmlldy0+Y2xpZW50KCkpCisgICAgLy8gR2VuZXJhdGUgZGlk U3RvcExvYWRpbmcgaWYgbG9hZGVyIGlzIGNvbXBsZXRlZC4KKyAgICBpZiAod2ViVmlldy0+Y2xp ZW50KCkgJiYgbG9hZGVyQ29tcGxldGVkKQogICAgICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlk U3RvcExvYWRpbmcoKTsKIH0KIAo=