21412 2008-10-06 14:50:53 -0700 Refactor user initiated profile count to be more stable 2008-10-06 16:08:38 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 kmccullough kmccullough oldest_to_newest 94275 0 kmccullough 2008-10-06 14:50:53 -0700 We increment the user initiated profile count in the Web Inspector's JS, but this causes problems as it's incremented every time we display the log message, and is only currently working by being very careful to clear messages and the count at the right time. We should move this into the InspectorController 94276 1 24126 kmccullough 2008-10-06 14:55:24 -0700 Created attachment 24126 Proposed patch 94277 2 24126 timothy 2008-10-06 15:06:14 -0700 Comment on attachment 24126 Proposed patch I am not sure m_startedProfileNumber is a good name. Maybe m_runningUserInitiatedProfileNumber, m_recordingUserInitiatedProfileNumber or m_activeUserInitiatedProfileNumber? 137 if (profile.title.indexOf(UserInitiatedProfileName) != 0) { Use !== here. 237 if (title.indexOf(UserInitiatedProfileName, 0) == 0) { Use === here. 238 title = WebInspector.UIString("Profile %d", title.substring(35)); Use UserInitiatedProfileName.length instead of the magic number. 380 if (this.profile.title.indexOf(UserInitiatedProfileName, 0) == 0) 381 this._profileNumber = this.profile.title.substring(35); Same applies here: === and no magic number. Also indexOf only takes 1 argument. 398 if (this.profile.title.indexOf(UserInitiatedProfileName, 0) == 0) The indexOf function only takes 1 argument and use ===. 443 console.log("followLink"); r=me to remove that console.log in a separate commit. r- for now. 94281 3 24127 kmccullough 2008-10-06 15:25:22 -0700 Created attachment 24127 New patch with changes 94282 4 24127 oliver 2008-10-06 15:29:46 -0700 Comment on attachment 24127 New patch with changes r=me 94284 5 24127 timothy 2008-10-06 15:42:20 -0700 Comment on attachment 24127 New patch with changes nextUserInitiatedProfileNumber should be m_ nextUserInitiatedProfileNumber. 94288 6 kmccullough 2008-10-06 16:08:38 -0700 Committed revision 37349. 24126 2008-10-06 14:55:24 -0700 2008-10-06 15:25:22 -0700 Proposed patch moveProfileCount.txt text/plain 7426 kmccullough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3MzQ1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMTAtMDYgIEtldmluIE1j Q3VsbG91Z2ggIDxrbWNjdWxsb3VnaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNDEyCisgICAgICAgIEJ1ZyAyMTQxMjogUmVmYWN0b3IgdXNlciBpbml0aWF0 ZWQgcHJvZmlsZSBjb3VudCB0byBiZSBtb3JlIHN0YWJsZQorICAgICAgICAtIEV4cG9ydCBVU3Ry aW5nOjpmcm9tIGZvciB1c2Ugd2l0aCBjcmVhdGluZyB0aGUgcHJvZmlsZSB0aXRsZS4KKworICAg ICAgICAqIEphdmFTY3JpcHRDb3JlLmV4cDoKKwogMjAwOC0xMC0wNiAgTWFjaWVqIFN0YWNob3dp YWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gQnVpbGQgZml4LgpJ bmRleDogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gMzczMzApCisrKyBKYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMyw2ICsy MTMsNyBAQCBfX1pOM0pTQzdQcm9maWxlN2ZvckVhY2hFTU5TXzExUHJvZmlsZU5vCiBfX1pOM0pT QzdVU3RyaW5nM1JlcDExY29tcHV0ZUhhc2hFUEt0aQogX19aTjNKU0M3VVN0cmluZzNSZXA0bnVs bEUKIF9fWk4zSlNDN1VTdHJpbmczUmVwN2Rlc3Ryb3lFdgorX19aTjNKU0M3VVN0cmluZzRmcm9t RWkKIF9fWk4zSlNDN1VTdHJpbmc0ZnJvbUVqCiBfX1pOM0pTQzdVU3RyaW5nNmFwcGVuZEVQS2MK IF9fWk4zSlNDN1VTdHJpbmc2YXBwZW5kRVJLUzBfCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMzczNDUpCisrKyBXZWJD b3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDA4LTEwLTA2 ICBLZXZpbiBNY0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQxMgorICAgICAgICBCdWcgMjE0MTI6IFJlZmFjdG9yIHVz ZXIgaW5pdGlhdGVkIHByb2ZpbGUgY291bnQgdG8gYmUgbW9yZSBzdGFibGUKKworICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDogS2VlcCB0cmFjayBvZiB0aGUgdXNl ci1pbml0aWF0ZWQKKyAgICAgICAgcHJvZmlsZXMgaGVyZSBub3cuCisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzdG9wVXNlckluaXRpYXRl ZFByb2ZpbGluZyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoK KyAgICAgICAgVGhlIGZyb250IGVuZCB3aWxsIG5vdyBuZWVkIHRvIGNoZWNrIGZvciB0aGUgZXhp c3RlbmNlIG9mIHRoZSB1c2VyLQorICAgICAgICBpbml0aWF0ZWQgcHJvZmlsZSB0aXRsZSBhbmQg dXNlIGl0cyBjb3VudCBpbnN0ZWFkIG9mIGtlZXBpbmcgaXRzIG93bi4KKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanM6CisKIDIwMDgtMTAtMDYgIERhbiBCZXJuc3RlaW4gIDxtaXR6 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDM3MzMwKQor KysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTk2MCw2ICs5NjAsOCBAQCBJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250 cm9sbGVyCiAgICAgLCBtX25leHRJZGVudGlmaWVyKC0yKQogICAgICwgbV9ncm91cExldmVsKDAp CiAgICAgLCBtX3NlYXJjaGluZ0Zvck5vZGUoZmFsc2UpCisgICAgLCBtX3N0YXJ0ZWRQcm9maWxl TnVtYmVyKC0xKQorICAgICwgbmV4dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyKDEpCiAgICAg LCBtX3ByZXZpb3VzTWVzc2FnZSgwKQogewogICAgIEFTU0VSVF9BUkcocGFnZSwgcGFnZSk7CkBA IC0xNTAzLDcgKzE1MDUsMTEgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzdGFydFVzZXJJ bml0aQogICAgIG1fcmVjb3JkaW5nVXNlckluaXRpYXRlZFByb2ZpbGUgPSB0cnVlOwogCiAgICAg RXhlY1N0YXRlKiBleGVjID0gdG9KU0RPTVdpbmRvdyhtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFt ZSgpKS0+Z2xvYmFsRXhlYygpOwotICAgIFByb2ZpbGVyOjpwcm9maWxlcigpLT5zdGFydFByb2Zp bGluZyhleGVjLCBVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUpOworICAgIG1fc3RhcnRlZFByb2Zp bGVOdW1iZXIgPSBuZXh0VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXIrKzsKKyAgICBVU3RyaW5n IHRpdGxlID0gVXNlckluaXRpYXRlZFByb2ZpbGVOYW1lOworICAgIHRpdGxlICs9ICIuIjsKKyAg ICB0aXRsZSArPSBVU3RyaW5nOjpmcm9tKG1fc3RhcnRlZFByb2ZpbGVOdW1iZXIpOworICAgIFBy b2ZpbGVyOjpwcm9maWxlcigpLT5zdGFydFByb2ZpbGluZyhleGVjLCB0aXRsZSk7CiAgICAgdG9n Z2xlUmVjb3JkQnV0dG9uKHRydWUpOwogfQogCkBAIC0xNTE1LDcgKzE1MjEsMTAgQEAgdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpzdG9wVXNlckluaXRpYQogICAgIG1fcmVjb3JkaW5nVXNlcklu aXRpYXRlZFByb2ZpbGUgPSBmYWxzZTsKIAogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHRvSlNET01X aW5kb3cobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKSktPmdsb2JhbEV4ZWMoKTsKLSAgICBS ZWZQdHI8UHJvZmlsZT4gcHJvZmlsZSA9IFByb2ZpbGVyOjpwcm9maWxlcigpLT5zdG9wUHJvZmls aW5nKGV4ZWMsIFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSk7CisgICAgVVN0cmluZyB0aXRsZSA9 ICBVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWU7CisgICAgdGl0bGUgKz0gIi4iOworICAgIHRpdGxl ICs9IFVTdHJpbmc6OmZyb20obV9zdGFydGVkUHJvZmlsZU51bWJlcik7CisgICAgUmVmUHRyPFBy b2ZpbGU+IHByb2ZpbGUgPSBQcm9maWxlcjo6cHJvZmlsZXIoKS0+c3RvcFByb2ZpbGluZyhleGVj LCB0aXRsZSk7CiAgICAgaWYgKHByb2ZpbGUpCiAgICAgICAgIGFkZFByb2ZpbGUocHJvZmlsZSwg MCwgVVN0cmluZygpKTsKICAgICB0b2dnbGVSZWNvcmRCdXR0b24oZmFsc2UpOwpJbmRleDogV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAkocmV2aXNpb24gMzczMzApCisrKyBX ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTI1NSw2ICsyNTUsOCBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxOb2RlPiBtX2hpZ2hsaWdodGVk Tm9kZTsKICAgICB1bnNpZ25lZCBtX2dyb3VwTGV2ZWw7CiAgICAgYm9vbCBtX3NlYXJjaGluZ0Zv ck5vZGU7CisgICAgaW50IG1fc3RhcnRlZFByb2ZpbGVOdW1iZXI7CisgICAgdW5zaWduZWQgbmV4 dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyOwogICAgIENvbnNvbGVNZXNzYWdlKiBtX3ByZXZp b3VzTWVzc2FnZTsKIH07CiAKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Q cm9maWxlc1BhbmVsLmpzCShyZXZpc2lvbiAzNzMzMCkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC05Niw5ICs5Niw2IEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHJlc2V0OiBm dW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLm5leHRVc2VySW5pdGlhdGVkUHJvZmlsZU51 bWJlciA9IDE7Ci0gICAgICAgIHRoaXMubmV4dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyRm9y TGlua3MgPSAxOwotCiAgICAgICAgIGlmICh0aGlzLl9wcm9maWxlcykgewogICAgICAgICAgICAg dmFyIHByb2ZpbGVkTGVuZ3RoID0gdGhpcy5fcHJvZmlsZXMubGVuZ3RoOwogICAgICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBwcm9maWxlZExlbmd0aDsgKytpKSB7CkBAIC0xMzcsNyArMTM0 LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2 YXIgc21hbGwgPSBmYWxzZTsKICAgICAgICAgdmFyIGFsdGVybmF0ZVRpdGxlOwogCi0gICAgICAg IGlmIChwcm9maWxlLnRpdGxlICE9PSBVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUpIHsKKyAgICAg ICAgaWYgKHByb2ZpbGUudGl0bGUuaW5kZXhPZihVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUpICE9 IDApIHsKICAgICAgICAgICAgIGlmICghKHByb2ZpbGUudGl0bGUgaW4gdGhpcy5fcHJvZmlsZUdy b3VwcykpCiAgICAgICAgICAgICAgICAgdGhpcy5fcHJvZmlsZUdyb3Vwc1twcm9maWxlLnRpdGxl XSA9IFtdOwogCkBAIC0yMzcsOSArMjM0LDkgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwu cHJvdG90eXBlID0gewogICAgIGRpc3BsYXlUaXRsZUZvclByb2ZpbGVMaW5rOiBmdW5jdGlvbih0 aXRsZSkKICAgICB7CiAgICAgICAgIHRpdGxlID0gdW5lc2NhcGUodGl0bGUpOwotICAgICAgICBp ZiAodGl0bGUgPT09IFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSkKLSAgICAgICAgICAgIHRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm9maWxlICVkIiwgdGhpcy5uZXh0VXNlckluaXRp YXRlZFByb2ZpbGVOdW1iZXJGb3JMaW5rcysrKTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIGlm ICh0aXRsZS5pbmRleE9mKFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSwgMCkgPT0gMCkgeworICAg ICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByb2ZpbGUgJWQiLCB0aXRs ZS5zdWJzdHJpbmcoMzUpKTsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmICghKHRp dGxlIGluIHRoaXMuX3Byb2ZpbGVHcm91cHNGb3JMaW5rcykpCiAgICAgICAgICAgICAgICAgdGhp cy5fcHJvZmlsZUdyb3Vwc0ZvckxpbmtzW3RpdGxlXSA9IDA7CiAKQEAgLTM4MCw4ICszNzcsOCBA QCBXZWJJbnNwZWN0b3IuUHJvZmlsZVNpZGViYXJUcmVlRWxlbWVudCA9CiB7CiAgICAgdGhpcy5w cm9maWxlID0gcHJvZmlsZTsKIAotICAgIGlmICh0aGlzLnByb2ZpbGUudGl0bGUgPT09IFVzZXJJ bml0aWF0ZWRQcm9maWxlTmFtZSkKLSAgICAgICAgdGhpcy5fcHJvZmlsZU51bWJlciA9IFdlYklu c3BlY3Rvci5wYW5lbHMucHJvZmlsZXMubmV4dFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyKys7 CisgICAgaWYgKHRoaXMucHJvZmlsZS50aXRsZS5pbmRleE9mKFVzZXJJbml0aWF0ZWRQcm9maWxl TmFtZSwgMCkgPT0gMCkKKyAgICAgICAgdGhpcy5fcHJvZmlsZU51bWJlciA9IHRoaXMucHJvZmls ZS50aXRsZS5zdWJzdHJpbmcoMzUpOwogCiAgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxl bWVudC5jYWxsKHRoaXMsICJwcm9maWxlLXNpZGViYXItdHJlZS1pdGVtIiwgIiIsICIiLCBwcm9m aWxlLCBmYWxzZSk7CiAKQEAgLTM5OCw3ICszOTUsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVNp ZGViYXJUcmVlRWxlbWVudC5wCiAgICAgewogICAgICAgICBpZiAodGhpcy5fbWFpblRpdGxlKQog ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX21haW5UaXRsZTsKLSAgICAgICAgaWYgKHRoaXMucHJv ZmlsZS50aXRsZSA9PT0gVXNlckluaXRpYXRlZFByb2ZpbGVOYW1lKQorICAgICAgICBpZiAodGhp cy5wcm9maWxlLnRpdGxlLmluZGV4T2YoVXNlckluaXRpYXRlZFByb2ZpbGVOYW1lLCAwKSA9PSAw KQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvZmlsZSAlZCIs IHRoaXMuX3Byb2ZpbGVOdW1iZXIpOwogICAgICAgICByZXR1cm4gdGhpcy5wcm9maWxlLnRpdGxl OwogICAgIH0sCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMJ KHJldmlzaW9uIDM3MzMwKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwkod29ya2luZyBjb3B5KQpAQCAtNDQwLDcgKzQ0MCw2IEBAIFdlYkluc3BlY3Rvci5kb2N1 bWVudENsaWNrID0gZnVuY3Rpb24oZXYKIAogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dS ZXNvdXJjZUZvclVSTChhbmNob3IuaHJlZiwgYW5jaG9yLmxpbmVOdW1iZXIsIGFuY2hvci5wcmVm ZXJyZWRQYW5lbCk7CiAgICAgICAgIH0gZWxzZSB7Ci1jb25zb2xlLmxvZygiZm9sbG93TGluayIp OwogICAgICAgICAgICAgdmFyIHByb2ZpbGVTdHJpbmdSZWdFeCA9IG5ldyBSZWdFeHAoIndlYmtp dC1wcm9maWxlOi8vLisvKFswLTldKykiKTsKICAgICAgICAgICAgIHZhciBwcm9maWxlU3RyaW5n ID0gcHJvZmlsZVN0cmluZ1JlZ0V4LmV4ZWMoYW5jaG9yLmhyZWYpOwogICAgICAgICAgICAgaWYg KHByb2ZpbGVTdHJpbmcpCg== 24127 2008-10-06 15:25:22 -0700 2008-10-06 15:42:31 -0700 New patch with changes moveProfileCount.txt text/plain 6874 kmccullough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3MzQ1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMTAtMDYgIEtldmluIE1j Q3VsbG91Z2ggIDxrbWNjdWxsb3VnaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNDEyCisgICAgICAgIEJ1ZyAyMTQxMjogUmVmYWN0b3IgdXNlciBpbml0aWF0 ZWQgcHJvZmlsZSBjb3VudCB0byBiZSBtb3JlIHN0YWJsZQorICAgICAgICAtIEV4cG9ydCBVU3Ry aW5nOjpmcm9tIGZvciB1c2Ugd2l0aCBjcmVhdGluZyB0aGUgcHJvZmlsZSB0aXRsZS4KKworICAg ICAgICAqIEphdmFTY3JpcHRDb3JlLmV4cDoKKwogMjAwOC0xMC0wNiAgTWFjaWVqIFN0YWNob3dp YWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gQnVpbGQgZml4LgpJ bmRleDogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gMzczMzApCisrKyBKYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMyw2ICsy MTMsNyBAQCBfX1pOM0pTQzdQcm9maWxlN2ZvckVhY2hFTU5TXzExUHJvZmlsZU5vCiBfX1pOM0pT QzdVU3RyaW5nM1JlcDExY29tcHV0ZUhhc2hFUEt0aQogX19aTjNKU0M3VVN0cmluZzNSZXA0bnVs bEUKIF9fWk4zSlNDN1VTdHJpbmczUmVwN2Rlc3Ryb3lFdgorX19aTjNKU0M3VVN0cmluZzRmcm9t RWkKIF9fWk4zSlNDN1VTdHJpbmc0ZnJvbUVqCiBfX1pOM0pTQzdVU3RyaW5nNmFwcGVuZEVQS2MK IF9fWk4zSlNDN1VTdHJpbmc2YXBwZW5kRVJLUzBfCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMzczNDUpCisrKyBXZWJD b3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDA4LTEwLTA2 ICBLZXZpbiBNY0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQxMgorICAgICAgICBCdWcgMjE0MTI6IFJlZmFjdG9yIHVz ZXIgaW5pdGlhdGVkIHByb2ZpbGUgY291bnQgdG8gYmUgbW9yZSBzdGFibGUKKworICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDogS2VlcCB0cmFjayBvZiB0aGUgdXNl ci1pbml0aWF0ZWQKKyAgICAgICAgcHJvZmlsZXMgaGVyZSBub3cuCisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZyk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzdG9wVXNlckluaXRpYXRl ZFByb2ZpbGluZyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoK KyAgICAgICAgVGhlIGZyb250IGVuZCB3aWxsIG5vdyBuZWVkIHRvIGNoZWNrIGZvciB0aGUgZXhp c3RlbmNlIG9mIHRoZSB1c2VyLQorICAgICAgICBpbml0aWF0ZWQgcHJvZmlsZSB0aXRsZSBhbmQg dXNlIGl0cyBjb3VudCBpbnN0ZWFkIG9mIGtlZXBpbmcgaXRzIG93bi4KKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisKIDIwMDgtMTAtMDYgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vpbmln LgpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlz aW9uIDM3MzMwKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTk2MCw2ICs5NjAsOCBAQCBJbnNwZWN0b3JDb250cm9sbGVyOjpJ bnNwZWN0b3JDb250cm9sbGVyCiAgICAgLCBtX25leHRJZGVudGlmaWVyKC0yKQogICAgICwgbV9n cm91cExldmVsKDApCiAgICAgLCBtX3NlYXJjaGluZ0Zvck5vZGUoZmFsc2UpCisgICAgLCBtX2N1 cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJlcigtMSkKKyAgICAsIG5leHRVc2VySW5pdGlh dGVkUHJvZmlsZU51bWJlcigxKQogICAgICwgbV9wcmV2aW91c01lc3NhZ2UoMCkKIHsKICAgICBB U1NFUlRfQVJHKHBhZ2UsIHBhZ2UpOwpAQCAtMTUwMyw3ICsxNTA1LDExIEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6c3RhcnRVc2VySW5pdGkKICAgICBtX3JlY29yZGluZ1VzZXJJbml0aWF0 ZWRQcm9maWxlID0gdHJ1ZTsKIAogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHRvSlNET01XaW5kb3co bV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKSktPmdsb2JhbEV4ZWMoKTsKLSAgICBQcm9maWxl cjo6cHJvZmlsZXIoKS0+c3RhcnRQcm9maWxpbmcoZXhlYywgVXNlckluaXRpYXRlZFByb2ZpbGVO YW1lKTsKKyAgICBtX2N1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJlciA9IG5leHRVc2Vy SW5pdGlhdGVkUHJvZmlsZU51bWJlcisrOworICAgIFVTdHJpbmcgdGl0bGUgPSBVc2VySW5pdGlh dGVkUHJvZmlsZU5hbWU7CisgICAgdGl0bGUgKz0gIi4iOworICAgIHRpdGxlICs9IFVTdHJpbmc6 OmZyb20obV9jdXJyZW50VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXIpOworICAgIFByb2ZpbGVy Ojpwcm9maWxlcigpLT5zdGFydFByb2ZpbGluZyhleGVjLCB0aXRsZSk7CiAgICAgdG9nZ2xlUmVj b3JkQnV0dG9uKHRydWUpOwogfQogCkBAIC0xNTE1LDcgKzE1MjEsMTAgQEAgdm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjpzdG9wVXNlckluaXRpYQogICAgIG1fcmVjb3JkaW5nVXNlckluaXRpYXRl ZFByb2ZpbGUgPSBmYWxzZTsKIAogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHRvSlNET01XaW5kb3co bV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKSktPmdsb2JhbEV4ZWMoKTsKLSAgICBSZWZQdHI8 UHJvZmlsZT4gcHJvZmlsZSA9IFByb2ZpbGVyOjpwcm9maWxlcigpLT5zdG9wUHJvZmlsaW5nKGV4 ZWMsIFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSk7CisgICAgVVN0cmluZyB0aXRsZSA9ICBVc2Vy SW5pdGlhdGVkUHJvZmlsZU5hbWU7CisgICAgdGl0bGUgKz0gIi4iOworICAgIHRpdGxlICs9IFVT dHJpbmc6OmZyb20obV9jdXJyZW50VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXIpOworICAgIFJl ZlB0cjxQcm9maWxlPiBwcm9maWxlID0gUHJvZmlsZXI6OnByb2ZpbGVyKCktPnN0b3BQcm9maWxp bmcoZXhlYywgdGl0bGUpOwogICAgIGlmIChwcm9maWxlKQogICAgICAgICBhZGRQcm9maWxlKHBy b2ZpbGUsIDAsIFVTdHJpbmcoKSk7CiAgICAgdG9nZ2xlUmVjb3JkQnV0dG9uKGZhbHNlKTsKSW5k ZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgJKHJldmlzaW9uIDM3MzMw KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNTUsNiArMjU1LDggQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8Tm9kZT4gbV9oaWdo bGlnaHRlZE5vZGU7CiAgICAgdW5zaWduZWQgbV9ncm91cExldmVsOwogICAgIGJvb2wgbV9zZWFy Y2hpbmdGb3JOb2RlOworICAgIGludCBtX2N1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJl cjsKKyAgICB1bnNpZ25lZCBuZXh0VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXI7CiAgICAgQ29u c29sZU1lc3NhZ2UqIG1fcHJldmlvdXNNZXNzYWdlOwogfTsKIApJbmRleDogV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMJKHJldmlzaW9uIDM3MzMwKQorKysg V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMJKHdvcmtpbmcgY29w eSkKQEAgLTk2LDkgKzk2LDYgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMubmV4dFVz ZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyID0gMTsKLSAgICAgICAgdGhpcy5uZXh0VXNlckluaXRp YXRlZFByb2ZpbGVOdW1iZXJGb3JMaW5rcyA9IDE7Ci0KICAgICAgICAgaWYgKHRoaXMuX3Byb2Zp bGVzKSB7CiAgICAgICAgICAgICB2YXIgcHJvZmlsZWRMZW5ndGggPSB0aGlzLl9wcm9maWxlcy5s ZW5ndGg7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb2ZpbGVkTGVuZ3RoOyAr K2kpIHsKQEAgLTEzNyw3ICsxMzQsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBzbWFsbCA9IGZhbHNlOwogICAgICAgICB2YXIgYWx0ZXJu YXRlVGl0bGU7CiAKLSAgICAgICAgaWYgKHByb2ZpbGUudGl0bGUgIT09IFVzZXJJbml0aWF0ZWRQ cm9maWxlTmFtZSkgeworICAgICAgICBpZiAocHJvZmlsZS50aXRsZS5pbmRleE9mKFVzZXJJbml0 aWF0ZWRQcm9maWxlTmFtZSkgIT09IDApIHsKICAgICAgICAgICAgIGlmICghKHByb2ZpbGUudGl0 bGUgaW4gdGhpcy5fcHJvZmlsZUdyb3VwcykpCiAgICAgICAgICAgICAgICAgdGhpcy5fcHJvZmls ZUdyb3Vwc1twcm9maWxlLnRpdGxlXSA9IFtdOwogCkBAIC0yMzcsOSArMjM0LDkgQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgIGRpc3BsYXlUaXRsZUZvclBy b2ZpbGVMaW5rOiBmdW5jdGlvbih0aXRsZSkKICAgICB7CiAgICAgICAgIHRpdGxlID0gdW5lc2Nh cGUodGl0bGUpOwotICAgICAgICBpZiAodGl0bGUgPT09IFVzZXJJbml0aWF0ZWRQcm9maWxlTmFt ZSkKLSAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm9maWxlICVk IiwgdGhpcy5uZXh0VXNlckluaXRpYXRlZFByb2ZpbGVOdW1iZXJGb3JMaW5rcysrKTsKLSAgICAg ICAgZWxzZSB7CisgICAgICAgIGlmICh0aXRsZS5pbmRleE9mKFVzZXJJbml0aWF0ZWRQcm9maWxl TmFtZSkgPT09IDApIHsKKyAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJQcm9maWxlICVkIiwgdGl0bGUuc3Vic3RyaW5nKFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZS5s ZW5ndGggKyAxKSk7CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoISh0aXRsZSBp biB0aGlzLl9wcm9maWxlR3JvdXBzRm9yTGlua3MpKQogICAgICAgICAgICAgICAgIHRoaXMuX3By b2ZpbGVHcm91cHNGb3JMaW5rc1t0aXRsZV0gPSAwOwogCkBAIC0zODAsOCArMzc3LDggQEAgV2Vi SW5zcGVjdG9yLlByb2ZpbGVTaWRlYmFyVHJlZUVsZW1lbnQgPQogewogICAgIHRoaXMucHJvZmls ZSA9IHByb2ZpbGU7CiAKLSAgICBpZiAodGhpcy5wcm9maWxlLnRpdGxlID09PSBVc2VySW5pdGlh dGVkUHJvZmlsZU5hbWUpCi0gICAgICAgIHRoaXMuX3Byb2ZpbGVOdW1iZXIgPSBXZWJJbnNwZWN0 b3IucGFuZWxzLnByb2ZpbGVzLm5leHRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJlcisrOworICAg IGlmICh0aGlzLnByb2ZpbGUudGl0bGUuaW5kZXhPZihVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUp ID09PSAwKQorICAgICAgICB0aGlzLl9wcm9maWxlTnVtYmVyID0gdGhpcy5wcm9maWxlLnRpdGxl LnN1YnN0cmluZyhVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUubGVuZ3RoICsgMSk7CiAKICAgICBX ZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LmNhbGwodGhpcywgInByb2ZpbGUtc2lkZWJh ci10cmVlLWl0ZW0iLCAiIiwgIiIsIHByb2ZpbGUsIGZhbHNlKTsKIApAQCAtMzk4LDcgKzM5NSw3 IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50LnAKICAgICB7CiAgICAg ICAgIGlmICh0aGlzLl9tYWluVGl0bGUpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fbWFpblRp dGxlOwotICAgICAgICBpZiAodGhpcy5wcm9maWxlLnRpdGxlID09PSBVc2VySW5pdGlhdGVkUHJv ZmlsZU5hbWUpCisgICAgICAgIGlmICh0aGlzLnByb2ZpbGUudGl0bGUuaW5kZXhPZihVc2VySW5p dGlhdGVkUHJvZmlsZU5hbWUpID09PSAwKQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUHJvZmlsZSAlZCIsIHRoaXMuX3Byb2ZpbGVOdW1iZXIpOwogICAgICAgICBy ZXR1cm4gdGhpcy5wcm9maWxlLnRpdGxlOwogICAgIH0sCg==