119622 2013-08-09 05:15:59 -0700 [CSS Regions] Not possible to clear the selection when mixing content from different FlowThreads 2013-09-16 04:20:24 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106817 109283 1 jfernandez webkit-unassigned buildbot commit-queue eflews.bot esprehn+autocc glenn gyuyoung.kim hyatt jfernandez kondapallykalyan mibalan rniwa WebkitBugTracker webkit-ews oldest_to_newest 915768 0 jfernandez 2013-08-09 05:15:59 -0700 This bug was hidden by the fix for the bug 105641, which basically prevented the selection to be rendered when crossing the FlowThread boundaries. Such fix is not correct, because instead of fixing the actual bug it adds restrictions on how the selection works with Regions. We need to properly fix the selection clearing operation, allowing selections to cross RenderFlow boundaries and select content from different Regions. 915789 1 208425 jfernandez 2013-08-09 06:10:21 -0700 Created attachment 208425 Patch 915790 2 208425 buildbot 2013-08-09 06:13:30 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/1353447 915791 3 208425 buildbot 2013-08-09 06:14:33 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/1405199 915793 4 208425 eflews.bot 2013-08-09 06:15:04 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1411318 915794 5 208425 webkit-ews 2013-08-09 06:15:55 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1369686 915795 6 208425 webkit-ews 2013-08-09 06:16:04 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1414328 915796 7 208425 eflews.bot 2013-08-09 06:16:12 -0700 Comment on attachment 208425 Patch Attachment 208425 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1369685 915807 8 208429 jfernandez 2013-08-09 06:34:42 -0700 Created attachment 208429 Patch 915808 9 208429 buildbot 2013-08-09 06:38:30 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/1385270 915809 10 208429 buildbot 2013-08-09 06:41:31 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/1369695 915823 11 208429 svillar 2013-08-09 07:31:50 -0700 Comment on attachment 208429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208429&action=review Not really my field of expertise, just doing an informal general review. > Source/WebCore/rendering/RenderView.cpp:782 > + bool cond = os && os != stop; Do not use "cond", use a more descriptive name. > Source/WebCore/rendering/RenderView.cpp:849 > + cond = o && o != stop; Ditto. > Source/WebCore/rendering/RenderView.cpp:873 > + } The code looks exactly the same than the above, would it be possible to refactor it in some function? 915829 12 208429 eflews.bot 2013-08-09 08:00:24 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1353465 915842 13 208429 eflews.bot 2013-08-09 08:28:31 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1414369 915845 14 208429 webkit-ews 2013-08-09 08:41:43 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1399219 915846 15 208429 webkit-ews 2013-08-09 08:42:53 -0700 Comment on attachment 208429 Patch Attachment 208429 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1350447 915907 16 208447 jfernandez 2013-08-09 12:07:19 -0700 Created attachment 208447 Patch 917264 17 208447 hyatt 2013-08-14 13:34:42 -0700 Comment on attachment 208447 Patch Patch looks fine, but you need a test. 917302 18 208765 jfernandez 2013-08-14 15:30:32 -0700 Created attachment 208765 Patch Added missing layout tests 924557 19 208765 hyatt 2013-09-04 12:26:34 -0700 Comment on attachment 208765 Patch r=me 924562 20 208765 commit-queue 2013-09-04 12:51:25 -0700 Comment on attachment 208765 Patch Clearing flags on attachment: 208765 Committed r155058: <http://trac.webkit.org/changeset/155058> 924563 21 commit-queue 2013-09-04 12:51:29 -0700 All reviewed patches have been landed. Closing bug. 208425 2013-08-09 06:10:21 -0700 2013-08-09 06:34:34 -0700 Patch bug-119622-20130809151019.patch text/plain 5202 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBjNDI4ZTVlNDVkNTc5 MGU1YzM1YWQ2ODg5YzNiNzMyZTIwMTExZS4uZDQ0Njk3OTJkOWJlMWZiYzk5OWMzNjkzNGFlZGQ0 NjgzNjU4MjliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA4LTA5ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vdCBwb3Nz aWJsZSB0byBjbGVhciB0aGUgc2VsZWN0aW9uIHdoZW4gbWl4aW5nIGNvbnRlbnQgZnJvbSBkaWZm ZXJlbnQgRmxvd1RocmVhZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExOTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gdXNpbmcgQ1NTIFJlZ2lvbnMgaXMgdXN1YWwgdGhhdCB0aGUgUmVuZGVy VHJlZSBkb2Vzbid0IG1hdGNoCisgICAgICAgIHRoZSBET00gVHJlZSBpbiB0ZXJtcyBvZiByZWxh dGl2ZSBwb3NpdGlvbiBvZiB0aGUgbm9kZXMuIEJlc2lkZXMsCisgICAgICAgIHVzdWFsbHkgdGhl IGNvbnRlbnQgb2YgYSBjZXJ0YWluIG5vZGUgaXMgc3BsaXQgYW5kIHNwcmVhZCBhY3Jvc3MKKyAg ICAgICAgbXVsdGlwbGUgYmxvY2tzLCByZW5kZXJlZCBpbiBkaWZmZXJlbnQgcG9zaXRpb25zLgor CisgICAgICAgIFJlZ2FyZGluZyB0aGUgU2VsZWN0aW9uLCB0aGlzIHByb2JsZW0gaXMgZXZlbiBt b3JlIGltcG9ydGFudDsgdGhlCisgICAgICAgIHNlbGVjdGlvbiBkaXJlY3Rpb24gY2hhbmdlcyB3 aGVuIGNyb3NzaW5nIHRoZSBGbG93VGhyZWFkCisgICAgICAgIGJvdW5kYXJpZXMuIFRoaXMgd2Vp cmQgYmVoYXZpb3IgaXMgYWxzbyBwcmVzZW50IGluIG90aGVyIGxheW91dHMKKyAgICAgICAgdXNp bmcgbm9uLXJlZ3VsYXIgcG9zaXRpb25pbmcgbWVjaGFuaXNtcywgbGlrZSBhYnNvbHV0ZSwKKyAg ICAgICAgc3RhdGljLiBIb3dldmVyLCBmb3IgdGhvc2UgbGF5b3V0cyB0aGUgUmVuZGVyVHJlZSBw cmVzZXJ2ZXMgdGhlCisgICAgICAgIG9yZGVyIG9mIHRoZSBub2RlcywgdW5saWtlIENTUyBSZWdp b25zIGxheW91dCBtb2RlbC4KKworICAgICAgICBCZWNhdXNlIG9mIGhvdyB0aGUgUmVuZGVyVHJl ZSBpcyBnZW5lcmF0ZWQgd2l0aCBDU1MgUmVnaW9ucywgdGhlCisgICAgICAgIFJlbmRlclZpZXc6 OnNldFNlbGVjdGlvbiBhbGdvcml0aG0gaXMgbm90IGFibGUgdG8gcmVwYWludCBzb21lIG9mCisg ICAgICAgIHRoZSByZWN0YW5nbGVzIGRlZmluZWQgZHVyaW5nIHRoZSBzZWxlY3Rpb24gcHJvY2Vz cy4gSW4gb3JkZXIgdG8KKyAgICAgICAgZmFjZSB0aGlzIGlzc3VlLCB0aGUgcHJvcG9zZWQgZml4 IGRldGVybWluZXMgd2hldGhlciBpdCBzaG91bGQKKyAgICAgICAgYmFja3dhcmRzIHRyYXZlcnNp bmcgdGhlIFJlbmRlclRyZWUsIGZyb20gdGhlICJzdG9wIiBub2RlIHRvIHRoZQorICAgICAgICBS ZW5kZXJWaWV3IG5vZGUuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQsIHNpbmNlIHRoZSB0 ZXN0IGFkZGVkIGZvciBidWcgMTA1NjQxIGlzIGVub3VnaC4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFNlbGVj dGlvbik6CisKIDIwMTMtMDgtMDkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgog CiAgICAgICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9yOiBVc2UgcmFuZ2UtYmFzZWQgZm9yIHN5bnRh eCBpbiBydWxlIGNvbGxlY3Rpb24gbG9vcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmNwcAppbmRleCA4MmUxZmY2ZjBhYTkwZGIyMmY2MDI4NTM4YWJiMjNiZmM0ZTM2N2UzLi5i OGRjMGVmNzBmNGQxZDMyNGI0MmUzZjBjOGEzOThjYmQ1ZWVmYjQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC03NTksOSArNzU5LDYgQEAgdm9pZCBSZW5kZXJW aWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5k ZXJPYmplY3QqIGUKICAgICAgICAgbV9zZWxlY3Rpb25FbmQgPT0gZW5kICYmIG1fc2VsZWN0aW9u RW5kUG9zID09IGVuZFBvcyAmJiAhY2FyZXRDaGFuZ2VkKQogICAgICAgICByZXR1cm47CiAKLSAg ICBpZiAoKHN0YXJ0ICYmIGVuZCkgJiYgKHN0YXJ0LT5mbG93VGhyZWFkQ29udGFpbmluZ0Jsb2Nr KCkgIT0gZW5kLT5mbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkpKQotICAgICAgICByZXR1cm47 Ci0KICAgICAvLyBSZWNvcmQgdGhlIG9sZCBzZWxlY3RlZCBvYmplY3RzLiAgVGhlc2Ugd2lsbCBi ZSB1c2VkIGxhdGVyCiAgICAgLy8gd2hlbiB3ZSBjb21wYXJlIGFnYWluc3QgdGhlIG5ldyBzZWxl Y3RlZCBvYmplY3RzLgogICAgIGludCBvbGRTdGFydFBvcyA9IG1fc2VsZWN0aW9uU3RhcnRQb3M7 CkBAIC03ODEsNyArNzc4LDkgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVy T2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGUKIAogICAgIFJlbmRl ck9iamVjdCogb3MgPSBtX3NlbGVjdGlvblN0YXJ0OwogICAgIFJlbmRlck9iamVjdCogc3RvcCA9 IHJlbmRlcmVyQWZ0ZXJQb3NpdGlvbihtX3NlbGVjdGlvbkVuZCwgbV9zZWxlY3Rpb25FbmRQb3Mp OwotICAgIHdoaWxlIChvcyAmJiBvcyAhPSBzdG9wKSB7CisgICAgYm9vbCBjaGFuZ2VEaXJlY3Rp b24gPSBmYWxzZTsKKyAgICBib29sIGNvbmQgPSBvcyAmJiBvcyAhPSBzdG9wOworICAgIHdoaWxl IChjb25kKSB7CiAgICAgICAgIGlmICgob3MtPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG9zID09 IG1fc2VsZWN0aW9uU3RhcnQgfHwgb3MgPT0gbV9zZWxlY3Rpb25FbmQpICYmIG9zLT5zZWxlY3Rp b25TdGF0ZSgpICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIC8vIEJsb2NrcyBhcmUg cmVzcG9uc2libGUgZm9yIHBhaW50aW5nIGxpbmUgZ2FwcyBhbmQgbWFyZ2luIGdhcHMuICBUaGV5 IG11c3QgYmUgZXhhbWluZWQgYXMgd2VsbC4KICAgICAgICAgICAgIG9sZFNlbGVjdGVkT2JqZWN0 cy5zZXQob3MsIGFkb3B0UHRyKG5ldyBSZW5kZXJTZWxlY3Rpb25JbmZvKG9zLCB0cnVlKSkpOwpA QCAtNzk3LDcgKzc5NiwxNyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJP YmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZQogICAgICAgICAgICAg fQogICAgICAgICB9CiAKLSAgICAgICAgb3MgPSBvcy0+bmV4dEluUHJlT3JkZXIoKTsKKyAgICAg ICAgaWYgKGNoYW5nZURpcmVjdGlvbikgeworICAgICAgICAgICAgb3MgPSBvcy0+cHJldmlvdXNJ blByZU9yZGVyKCk7CisgICAgICAgICAgICBjb25kID0gb3MgJiYgIW9zLT5pc1JlbmRlclZpZXco KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIG9zID0gb3MtPm5leHRJblByZU9yZGVy KCk7CisgICAgICAgICAgICBjb25kID0gb3MgJiYgb3MgIT0gc3RvcDsKKyAgICAgICAgICAgIGlm IChjaGFuZ2VEaXJlY3Rpb24gPSAhb3MgJiYgb3MgIT0gc3RvcCkgeworICAgICAgICAgICAgICAg IG9zID0gc3RvcC0+cHJldmlvdXNJblByZU9yZGVyKCk7CisgICAgICAgICAgICAgICAgY29uZCA9 IG9zICYmICFvcy0+aXNSZW5kZXJWaWV3KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAg ICB9CiAKICAgICAvLyBOb3cgY2xlYXIgdGhlIHNlbGVjdGlvbi4KQEAgLTgzNiw3ICs4NDUsOSBA QCB2b2lkIFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQg c3RhcnRQb3MsIFJlbmRlck9iamVjdCogZQogICAgIC8vIE5vdyB0aGF0IHRoZSBzZWxlY3Rpb24g c3RhdGUgaGFzIGJlZW4gdXBkYXRlZCBmb3IgdGhlIG5ldyBvYmplY3RzLCB3YWxrIHRoZW0gYWdh aW4gYW5kCiAgICAgLy8gcHV0IHRoZW0gaW4gdGhlIG5ldyBvYmplY3RzIGxpc3QuCiAgICAgbyA9 IHN0YXJ0OwotICAgIHdoaWxlIChvICYmIG8gIT0gc3RvcCkgeworICAgIGNoYW5nZURpcmVjdGlv biA9IGZhbHNlOworICAgIGNvbmQgPSBvICYmIG8gIT0gc3RvcDsKKyAgICB3aGlsZSAoY29uZCkg ewogICAgICAgICBpZiAoKG8tPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG8gPT0gc3RhcnQgfHwg byA9PSBlbmQpICYmIG8tPnNlbGVjdGlvblN0YXRlKCkgIT0gU2VsZWN0aW9uTm9uZSkgewogICAg ICAgICAgICAgbmV3U2VsZWN0ZWRPYmplY3RzLnNldChvLCBhZG9wdFB0cihuZXcgUmVuZGVyU2Vs ZWN0aW9uSW5mbyhvLCB0cnVlKSkpOwogICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGNiID0gby0+ Y29udGFpbmluZ0Jsb2NrKCk7CkBAIC04NDksNyArODYwLDE3IEBAIHZvaWQgUmVuZGVyVmlldzo6 c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2Jq ZWN0KiBlCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBvID0gby0+bmV4dElu UHJlT3JkZXIoKTsKKyAgICAgICAgaWYgKGNoYW5nZURpcmVjdGlvbikgeworICAgICAgICAgICAg byA9IG8tPnByZXZpb3VzSW5QcmVPcmRlcigpOworICAgICAgICAgICAgY29uZCA9IG8gJiYgIW8t PmlzUmVuZGVyVmlldygpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgbyA9IG8tPm5l eHRJblByZU9yZGVyKCk7CisgICAgICAgICAgICBjb25kID0gbyAmJiBvICE9IHN0b3A7CisgICAg ICAgICAgICBpZiAoY2hhbmdlRGlyZWN0aW9uID0gIW8gJiYgbyAhPSBzdG9wKSB7CisgICAgICAg ICAgICAgICAgbyA9IHN0b3AtPnByZXZpb3VzSW5QcmVPcmRlcigpOworICAgICAgICAgICAgICAg IGNvbmQgPSBvICYmICFvLT5pc1JlbmRlclZpZXcoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQogICAgIH0KIAogICAgIGlmICghbV9mcmFtZVZpZXcgfHwgYmxvY2tSZXBhaW50TW9kZSA9PSBS ZXBhaW50Tm90aGluZykK 208429 2013-08-09 06:34:42 -0700 2013-08-09 12:07:08 -0700 Patch bug-119622-20130809153440.patch text/plain 5206 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBjNDI4ZTVlNDVkNTc5 MGU1YzM1YWQ2ODg5YzNiNzMyZTIwMTExZS4uZDQ0Njk3OTJkOWJlMWZiYzk5OWMzNjkzNGFlZGQ0 NjgzNjU4MjliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA4LTA5ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vdCBwb3Nz aWJsZSB0byBjbGVhciB0aGUgc2VsZWN0aW9uIHdoZW4gbWl4aW5nIGNvbnRlbnQgZnJvbSBkaWZm ZXJlbnQgRmxvd1RocmVhZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExOTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gdXNpbmcgQ1NTIFJlZ2lvbnMgaXMgdXN1YWwgdGhhdCB0aGUgUmVuZGVy VHJlZSBkb2Vzbid0IG1hdGNoCisgICAgICAgIHRoZSBET00gVHJlZSBpbiB0ZXJtcyBvZiByZWxh dGl2ZSBwb3NpdGlvbiBvZiB0aGUgbm9kZXMuIEJlc2lkZXMsCisgICAgICAgIHVzdWFsbHkgdGhl IGNvbnRlbnQgb2YgYSBjZXJ0YWluIG5vZGUgaXMgc3BsaXQgYW5kIHNwcmVhZCBhY3Jvc3MKKyAg ICAgICAgbXVsdGlwbGUgYmxvY2tzLCByZW5kZXJlZCBpbiBkaWZmZXJlbnQgcG9zaXRpb25zLgor CisgICAgICAgIFJlZ2FyZGluZyB0aGUgU2VsZWN0aW9uLCB0aGlzIHByb2JsZW0gaXMgZXZlbiBt b3JlIGltcG9ydGFudDsgdGhlCisgICAgICAgIHNlbGVjdGlvbiBkaXJlY3Rpb24gY2hhbmdlcyB3 aGVuIGNyb3NzaW5nIHRoZSBGbG93VGhyZWFkCisgICAgICAgIGJvdW5kYXJpZXMuIFRoaXMgd2Vp cmQgYmVoYXZpb3IgaXMgYWxzbyBwcmVzZW50IGluIG90aGVyIGxheW91dHMKKyAgICAgICAgdXNp bmcgbm9uLXJlZ3VsYXIgcG9zaXRpb25pbmcgbWVjaGFuaXNtcywgbGlrZSBhYnNvbHV0ZSwKKyAg ICAgICAgc3RhdGljLiBIb3dldmVyLCBmb3IgdGhvc2UgbGF5b3V0cyB0aGUgUmVuZGVyVHJlZSBw cmVzZXJ2ZXMgdGhlCisgICAgICAgIG9yZGVyIG9mIHRoZSBub2RlcywgdW5saWtlIENTUyBSZWdp b25zIGxheW91dCBtb2RlbC4KKworICAgICAgICBCZWNhdXNlIG9mIGhvdyB0aGUgUmVuZGVyVHJl ZSBpcyBnZW5lcmF0ZWQgd2l0aCBDU1MgUmVnaW9ucywgdGhlCisgICAgICAgIFJlbmRlclZpZXc6 OnNldFNlbGVjdGlvbiBhbGdvcml0aG0gaXMgbm90IGFibGUgdG8gcmVwYWludCBzb21lIG9mCisg ICAgICAgIHRoZSByZWN0YW5nbGVzIGRlZmluZWQgZHVyaW5nIHRoZSBzZWxlY3Rpb24gcHJvY2Vz cy4gSW4gb3JkZXIgdG8KKyAgICAgICAgZmFjZSB0aGlzIGlzc3VlLCB0aGUgcHJvcG9zZWQgZml4 IGRldGVybWluZXMgd2hldGhlciBpdCBzaG91bGQKKyAgICAgICAgYmFja3dhcmRzIHRyYXZlcnNp bmcgdGhlIFJlbmRlclRyZWUsIGZyb20gdGhlICJzdG9wIiBub2RlIHRvIHRoZQorICAgICAgICBS ZW5kZXJWaWV3IG5vZGUuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQsIHNpbmNlIHRoZSB0 ZXN0IGFkZGVkIGZvciBidWcgMTA1NjQxIGlzIGVub3VnaC4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFNlbGVj dGlvbik6CisKIDIwMTMtMDgtMDkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgog CiAgICAgICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9yOiBVc2UgcmFuZ2UtYmFzZWQgZm9yIHN5bnRh eCBpbiBydWxlIGNvbGxlY3Rpb24gbG9vcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmNwcAppbmRleCA4MmUxZmY2ZjBhYTkwZGIyMmY2MDI4NTM4YWJiMjNiZmM0ZTM2N2UzLi4w NzQxZWJlNjQzYzc3ZjA0ZDhkMTFjYWFjYWVhNWNkNDU5NDE3NGFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC03NTksOSArNzU5LDYgQEAgdm9pZCBSZW5kZXJW aWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5k ZXJPYmplY3QqIGUKICAgICAgICAgbV9zZWxlY3Rpb25FbmQgPT0gZW5kICYmIG1fc2VsZWN0aW9u RW5kUG9zID09IGVuZFBvcyAmJiAhY2FyZXRDaGFuZ2VkKQogICAgICAgICByZXR1cm47CiAKLSAg ICBpZiAoKHN0YXJ0ICYmIGVuZCkgJiYgKHN0YXJ0LT5mbG93VGhyZWFkQ29udGFpbmluZ0Jsb2Nr KCkgIT0gZW5kLT5mbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkpKQotICAgICAgICByZXR1cm47 Ci0KICAgICAvLyBSZWNvcmQgdGhlIG9sZCBzZWxlY3RlZCBvYmplY3RzLiAgVGhlc2Ugd2lsbCBi ZSB1c2VkIGxhdGVyCiAgICAgLy8gd2hlbiB3ZSBjb21wYXJlIGFnYWluc3QgdGhlIG5ldyBzZWxl Y3RlZCBvYmplY3RzLgogICAgIGludCBvbGRTdGFydFBvcyA9IG1fc2VsZWN0aW9uU3RhcnRQb3M7 CkBAIC03ODEsNyArNzc4LDkgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVy T2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGUKIAogICAgIFJlbmRl ck9iamVjdCogb3MgPSBtX3NlbGVjdGlvblN0YXJ0OwogICAgIFJlbmRlck9iamVjdCogc3RvcCA9 IHJlbmRlcmVyQWZ0ZXJQb3NpdGlvbihtX3NlbGVjdGlvbkVuZCwgbV9zZWxlY3Rpb25FbmRQb3Mp OwotICAgIHdoaWxlIChvcyAmJiBvcyAhPSBzdG9wKSB7CisgICAgYm9vbCBjaGFuZ2VEaXJlY3Rp b24gPSBmYWxzZTsKKyAgICBib29sIGNvbmQgPSBvcyAmJiBvcyAhPSBzdG9wOworICAgIHdoaWxl IChjb25kKSB7CiAgICAgICAgIGlmICgob3MtPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG9zID09 IG1fc2VsZWN0aW9uU3RhcnQgfHwgb3MgPT0gbV9zZWxlY3Rpb25FbmQpICYmIG9zLT5zZWxlY3Rp b25TdGF0ZSgpICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIC8vIEJsb2NrcyBhcmUg cmVzcG9uc2libGUgZm9yIHBhaW50aW5nIGxpbmUgZ2FwcyBhbmQgbWFyZ2luIGdhcHMuICBUaGV5 IG11c3QgYmUgZXhhbWluZWQgYXMgd2VsbC4KICAgICAgICAgICAgIG9sZFNlbGVjdGVkT2JqZWN0 cy5zZXQob3MsIGFkb3B0UHRyKG5ldyBSZW5kZXJTZWxlY3Rpb25JbmZvKG9zLCB0cnVlKSkpOwpA QCAtNzk3LDcgKzc5NiwxNyBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJP YmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZQogICAgICAgICAgICAg fQogICAgICAgICB9CiAKLSAgICAgICAgb3MgPSBvcy0+bmV4dEluUHJlT3JkZXIoKTsKKyAgICAg ICAgaWYgKGNoYW5nZURpcmVjdGlvbikgeworICAgICAgICAgICAgb3MgPSBvcy0+cHJldmlvdXNJ blByZU9yZGVyKCk7CisgICAgICAgICAgICBjb25kID0gb3MgJiYgIW9zLT5pc1JlbmRlclZpZXco KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIG9zID0gb3MtPm5leHRJblByZU9yZGVy KCk7CisgICAgICAgICAgICBjb25kID0gb3MgJiYgb3MgIT0gc3RvcDsKKyAgICAgICAgICAgIGlm IChjaGFuZ2VEaXJlY3Rpb24gPSAoIW9zICYmIG9zICE9IHN0b3ApKSB7CisgICAgICAgICAgICAg ICAgb3MgPSBzdG9wLT5wcmV2aW91c0luUHJlT3JkZXIoKTsKKyAgICAgICAgICAgICAgICBjb25k ID0gb3MgJiYgIW9zLT5pc1JlbmRlclZpZXcoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQog ICAgIH0KIAogICAgIC8vIE5vdyBjbGVhciB0aGUgc2VsZWN0aW9uLgpAQCAtODM2LDcgKzg0NSw5 IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGlu dCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAgICAgLy8gTm93IHRoYXQgdGhlIHNlbGVjdGlv biBzdGF0ZSBoYXMgYmVlbiB1cGRhdGVkIGZvciB0aGUgbmV3IG9iamVjdHMsIHdhbGsgdGhlbSBh Z2FpbiBhbmQKICAgICAvLyBwdXQgdGhlbSBpbiB0aGUgbmV3IG9iamVjdHMgbGlzdC4KICAgICBv ID0gc3RhcnQ7Ci0gICAgd2hpbGUgKG8gJiYgbyAhPSBzdG9wKSB7CisgICAgY2hhbmdlRGlyZWN0 aW9uID0gZmFsc2U7CisgICAgY29uZCA9IG8gJiYgbyAhPSBzdG9wOworICAgIHdoaWxlIChjb25k KSB7CiAgICAgICAgIGlmICgoby0+Y2FuQmVTZWxlY3Rpb25MZWFmKCkgfHwgbyA9PSBzdGFydCB8 fCBvID09IGVuZCkgJiYgby0+c2VsZWN0aW9uU3RhdGUoKSAhPSBTZWxlY3Rpb25Ob25lKSB7CiAg ICAgICAgICAgICBuZXdTZWxlY3RlZE9iamVjdHMuc2V0KG8sIGFkb3B0UHRyKG5ldyBSZW5kZXJT ZWxlY3Rpb25JbmZvKG8sIHRydWUpKSk7CiAgICAgICAgICAgICBSZW5kZXJCbG9jayogY2IgPSBv LT5jb250YWluaW5nQmxvY2soKTsKQEAgLTg0OSw3ICs4NjAsMTcgQEAgdm9pZCBSZW5kZXJWaWV3 OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJP YmplY3QqIGUKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIG8gPSBvLT5uZXh0 SW5QcmVPcmRlcigpOworICAgICAgICBpZiAoY2hhbmdlRGlyZWN0aW9uKSB7CisgICAgICAgICAg ICBvID0gby0+cHJldmlvdXNJblByZU9yZGVyKCk7CisgICAgICAgICAgICBjb25kID0gbyAmJiAh by0+aXNSZW5kZXJWaWV3KCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBvID0gby0+ bmV4dEluUHJlT3JkZXIoKTsKKyAgICAgICAgICAgIGNvbmQgPSBvICYmIG8gIT0gc3RvcDsKKyAg ICAgICAgICAgIGlmIChjaGFuZ2VEaXJlY3Rpb24gPSAoIW8gJiYgbyAhPSBzdG9wKSkgeworICAg ICAgICAgICAgICAgIG8gPSBzdG9wLT5wcmV2aW91c0luUHJlT3JkZXIoKTsKKyAgICAgICAgICAg ICAgICBjb25kID0gbyAmJiAhby0+aXNSZW5kZXJWaWV3KCk7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KICAgICB9CiAKICAgICBpZiAoIW1fZnJhbWVWaWV3IHx8IGJsb2NrUmVwYWludE1vZGUg PT0gUmVwYWludE5vdGhpbmcpCg== 208447 2013-08-09 12:07:19 -0700 2013-08-14 15:30:24 -0700 Patch bug-119622-20130809210718.patch text/plain 5910 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBjNDI4ZTVlNDVkNTc5 MGU1YzM1YWQ2ODg5YzNiNzMyZTIwMTExZS4uYWFjZTk4MjdjMjFiYTUxZmMxNzBiYjc5ZTQ4NjJh OTEzZmY4MjYxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA4LTA5ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vdCBwb3Nz aWJsZSB0byBjbGVhciB0aGUgc2VsZWN0aW9uIHdoZW4gbWl4aW5nIGNvbnRlbnQgZnJvbSBkaWZm ZXJlbnQgRmxvd1RocmVhZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExOTYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gdXNpbmcgQ1NTIFJlZ2lvbnMgaXMgdXN1YWwgdGhhdCB0aGUgUmVuZGVy VHJlZSBkb2Vzbid0IG1hdGNoCisgICAgICAgIHRoZSBET00gVHJlZSBpbiB0ZXJtcyBvZiByZWxh dGl2ZSBwb3NpdGlvbiBvZiB0aGUgbm9kZXMuIEJlc2lkZXMsCisgICAgICAgIHVzdWFsbHkgdGhl IGNvbnRlbnQgb2YgYSBjZXJ0YWluIG5vZGUgaXMgc3BsaXQgYW5kIHNwcmVhZCBhY3Jvc3MKKyAg ICAgICAgbXVsdGlwbGUgYmxvY2tzLCByZW5kZXJlZCBpbiBkaWZmZXJlbnQgcG9zaXRpb25zLgor CisgICAgICAgIFJlZ2FyZGluZyB0aGUgU2VsZWN0aW9uLCB0aGlzIHByb2JsZW0gaXMgZXZlbiBt b3JlIGltcG9ydGFudDsgdGhlCisgICAgICAgIHNlbGVjdGlvbiBkaXJlY3Rpb24gY2hhbmdlcyB3 aGVuIGNyb3NzaW5nIHRoZSBGbG93VGhyZWFkCisgICAgICAgIGJvdW5kYXJpZXMuIFRoaXMgd2Vp cmQgYmVoYXZpb3IgaXMgYWxzbyBwcmVzZW50IGluIG90aGVyIGxheW91dHMKKyAgICAgICAgdXNp bmcgbm9uLXJlZ3VsYXIgcG9zaXRpb25pbmcgbWVjaGFuaXNtcywgbGlrZSBhYnNvbHV0ZSwKKyAg ICAgICAgc3RhdGljLiBIb3dldmVyLCBmb3IgdGhvc2UgbGF5b3V0cyB0aGUgUmVuZGVyVHJlZSBw cmVzZXJ2ZXMgdGhlCisgICAgICAgIG9yZGVyIG9mIHRoZSBub2RlcywgdW5saWtlIENTUyBSZWdp b25zIGxheW91dCBtb2RlbC4KKworICAgICAgICBCZWNhdXNlIG9mIGhvdyB0aGUgUmVuZGVyVHJl ZSBpcyBnZW5lcmF0ZWQgd2l0aCBDU1MgUmVnaW9ucywgdGhlCisgICAgICAgIFJlbmRlclZpZXc6 OnNldFNlbGVjdGlvbiBhbGdvcml0aG0gaXMgbm90IGFibGUgdG8gcmVwYWludCBzb21lIG9mCisg ICAgICAgIHRoZSByZWN0YW5nbGVzIGRlZmluZWQgZHVyaW5nIHRoZSBzZWxlY3Rpb24gcHJvY2Vz cy4gSW4gb3JkZXIgdG8KKyAgICAgICAgZmFjZSB0aGlzIGlzc3VlLCB0aGUgcHJvcG9zZWQgZml4 IGRldGVybWluZXMgd2hldGhlciBpdCBzaG91bGQKKyAgICAgICAgYmFja3dhcmRzIHRyYXZlcnNp bmcgdGhlIFJlbmRlclRyZWUsIGZyb20gdGhlICJzdG9wIiBub2RlIHRvIHRoZQorICAgICAgICBS ZW5kZXJWaWV3IG5vZGUuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQsIHNpbmNlIHRoZSB0 ZXN0IGFkZGVkIGZvciBidWcgMTA1NjQxIGlzIGVub3VnaC4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldE5leHRPclByZXZSZW5kZXJP YmplY3RCYXNlZE9uRGlyZWN0aW9uKTogQWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZp ZXc6OnNldFNlbGVjdGlvbik6CisKIDIwMTMtMDgtMDkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdA YXBwbGUuY29tPgogCiAgICAgICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9yOiBVc2UgcmFuZ2UtYmFz ZWQgZm9yIHN5bnRheCBpbiBydWxlIGNvbGxlY3Rpb24gbG9vcC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmNwcAppbmRleCA4MmUxZmY2ZjBhYTkwZGIyMmY2MDI4NTM4YWJiMjNi ZmM0ZTM2N2UzLi5hN2U3MjViYzk5ZDA1M2E3M2UwYzg2NjBhNjZlODMxY2Y4MjcwZDc5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC03NDUsNiArNzQ1LDI3IEBA IHZvaWQgUmVuZGVyVmlldzo6c2V0TWF4aW1hbE91dGxpbmVTaXplKGludCBvKQogfQogI2VuZGlm CiAKKy8vIFdoZW4gZXhwbG9yaW5nIHRoZSBSZW5kZXJUcmVlIGxvb2tpbmcgZm9yIHRoZSBub2Rl cyBpbnZvbHZlZCBpbiB0aGUgU2VsZWN0aW9uLCBzb21ldGltZXMgaXQncworLy8gcmVxdWlyZWQg dG8gY2hhbmdlIHRoZSB0cmF2ZXJzaW5nIGRpcmVjdGlvbiBiZWNhdXNlIHRoZSAic3RhcnQiIHBv c2l0aW9uIGlzIGJlbG93IHRoZSAiZW5kIiBvbmUuCitzdGF0aWMgaW5saW5lIFJlbmRlck9iamVj dCogZ2V0TmV4dE9yUHJldlJlbmRlck9iamVjdEJhc2VkT25EaXJlY3Rpb24oY29uc3QgUmVuZGVy T2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3QqIHN0b3AsIGJvb2wmIGNvbnRpbnVlRXhwbG9y aW5nLCBib29sJiBleHBsb3JpbmdCYWNrd2FyZHMpCit7CisgICAgUmVuZGVyT2JqZWN0KiBuZXh0 OworICAgIGlmIChleHBsb3JpbmdCYWNrd2FyZHMpIHsKKyAgICAgICAgbmV4dCA9IG8tPnByZXZp b3VzSW5QcmVPcmRlcigpOworICAgICAgICBjb250aW51ZUV4cGxvcmluZyA9IG5leHQgJiYgIShu ZXh0KS0+aXNSZW5kZXJWaWV3KCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgbmV4dCA9IG8tPm5l eHRJblByZU9yZGVyKCk7CisgICAgICAgIGNvbnRpbnVlRXhwbG9yaW5nID0gbmV4dCAmJiBuZXh0 ICE9IHN0b3A7CisgICAgICAgIGV4cGxvcmluZ0JhY2t3YXJkcyA9ICFuZXh0ICYmIChuZXh0ICE9 IHN0b3ApOworICAgICAgICBpZiAoZXhwbG9yaW5nQmFja3dhcmRzKSB7CisgICAgICAgICAgICBu ZXh0ID0gc3RvcC0+cHJldmlvdXNJblByZU9yZGVyKCk7CisgICAgICAgICAgICBjb250aW51ZUV4 cGxvcmluZyA9IG5leHQgJiYgIW5leHQtPmlzUmVuZGVyVmlldygpOworICAgICAgICB9CisgICAg fQorCisgICAgcmV0dXJuIG5leHQ7Cit9CisKIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9u KFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlbmQsIGlu dCBlbmRQb3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1vZGUpCiB7CiAgICAg Ly8gTWFrZSBzdXJlIGJvdGggb3VyIHN0YXJ0IGFuZCBlbmQgb2JqZWN0cyBhcmUgZGVmaW5lZC4K QEAgLTc1OSw5ICs3ODAsNiBAQCB2b2lkIFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJP YmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZQogICAgICAgICBtX3Nl bGVjdGlvbkVuZCA9PSBlbmQgJiYgbV9zZWxlY3Rpb25FbmRQb3MgPT0gZW5kUG9zICYmICFjYXJl dENoYW5nZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICgoc3RhcnQgJiYgZW5kKSAmJiAo c3RhcnQtPmZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSAhPSBlbmQtPmZsb3dUaHJlYWRDb250 YWluaW5nQmxvY2soKSkpCi0gICAgICAgIHJldHVybjsKLQogICAgIC8vIFJlY29yZCB0aGUgb2xk IHNlbGVjdGVkIG9iamVjdHMuICBUaGVzZSB3aWxsIGJlIHVzZWQgbGF0ZXIKICAgICAvLyB3aGVu IHdlIGNvbXBhcmUgYWdhaW5zdCB0aGUgbmV3IHNlbGVjdGVkIG9iamVjdHMuCiAgICAgaW50IG9s ZFN0YXJ0UG9zID0gbV9zZWxlY3Rpb25TdGFydFBvczsKQEAgLTc4MSw3ICs3OTksOSBAQCB2b2lk IFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQ b3MsIFJlbmRlck9iamVjdCogZQogCiAgICAgUmVuZGVyT2JqZWN0KiBvcyA9IG1fc2VsZWN0aW9u U3RhcnQ7CiAgICAgUmVuZGVyT2JqZWN0KiBzdG9wID0gcmVuZGVyZXJBZnRlclBvc2l0aW9uKG1f c2VsZWN0aW9uRW5kLCBtX3NlbGVjdGlvbkVuZFBvcyk7Ci0gICAgd2hpbGUgKG9zICYmIG9zICE9 IHN0b3ApIHsKKyAgICBib29sIGV4cGxvcmluZ0JhY2t3YXJkcyA9IGZhbHNlOworICAgIGJvb2wg Y29udGludWVFeHBsb3JpbmcgPSBvcyAmJiAob3MgIT0gc3RvcCk7CisgICAgd2hpbGUgKGNvbnRp bnVlRXhwbG9yaW5nKSB7CiAgICAgICAgIGlmICgob3MtPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8 IG9zID09IG1fc2VsZWN0aW9uU3RhcnQgfHwgb3MgPT0gbV9zZWxlY3Rpb25FbmQpICYmIG9zLT5z ZWxlY3Rpb25TdGF0ZSgpICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIC8vIEJsb2Nr cyBhcmUgcmVzcG9uc2libGUgZm9yIHBhaW50aW5nIGxpbmUgZ2FwcyBhbmQgbWFyZ2luIGdhcHMu ICBUaGV5IG11c3QgYmUgZXhhbWluZWQgYXMgd2VsbC4KICAgICAgICAgICAgIG9sZFNlbGVjdGVk T2JqZWN0cy5zZXQob3MsIGFkb3B0UHRyKG5ldyBSZW5kZXJTZWxlY3Rpb25JbmZvKG9zLCB0cnVl KSkpOwpAQCAtNzk3LDcgKzgxNyw3IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJl bmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBvcyA9IG9zLT5uZXh0SW5QcmVPcmRlcigpOwor ICAgICAgICBvcyA9IGdldE5leHRPclByZXZSZW5kZXJPYmplY3RCYXNlZE9uRGlyZWN0aW9uKG9z LCBzdG9wLCBjb250aW51ZUV4cGxvcmluZywgZXhwbG9yaW5nQmFja3dhcmRzKTsKICAgICB9CiAK ICAgICAvLyBOb3cgY2xlYXIgdGhlIHNlbGVjdGlvbi4KQEAgLTgzNiw3ICs4NTYsOSBAQCB2b2lk IFJlbmRlclZpZXc6OnNldFNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQ b3MsIFJlbmRlck9iamVjdCogZQogICAgIC8vIE5vdyB0aGF0IHRoZSBzZWxlY3Rpb24gc3RhdGUg aGFzIGJlZW4gdXBkYXRlZCBmb3IgdGhlIG5ldyBvYmplY3RzLCB3YWxrIHRoZW0gYWdhaW4gYW5k CiAgICAgLy8gcHV0IHRoZW0gaW4gdGhlIG5ldyBvYmplY3RzIGxpc3QuCiAgICAgbyA9IHN0YXJ0 OwotICAgIHdoaWxlIChvICYmIG8gIT0gc3RvcCkgeworICAgIGV4cGxvcmluZ0JhY2t3YXJkcyA9 IGZhbHNlOworICAgIGNvbnRpbnVlRXhwbG9yaW5nID0gbyAmJiAobyAhPSBzdG9wKTsKKyAgICB3 aGlsZSAoY29udGludWVFeHBsb3JpbmcpIHsKICAgICAgICAgaWYgKChvLT5jYW5CZVNlbGVjdGlv bkxlYWYoKSB8fCBvID09IHN0YXJ0IHx8IG8gPT0gZW5kKSAmJiBvLT5zZWxlY3Rpb25TdGF0ZSgp ICE9IFNlbGVjdGlvbk5vbmUpIHsKICAgICAgICAgICAgIG5ld1NlbGVjdGVkT2JqZWN0cy5zZXQo bywgYWRvcHRQdHIobmV3IFJlbmRlclNlbGVjdGlvbkluZm8obywgdHJ1ZSkpKTsKICAgICAgICAg ICAgIFJlbmRlckJsb2NrKiBjYiA9IG8tPmNvbnRhaW5pbmdCbG9jaygpOwpAQCAtODQ5LDcgKzg3 MSw3IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQs IGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAgICAgICAgICAgICB9CiAgICAgICAgIH0K IAotICAgICAgICBvID0gby0+bmV4dEluUHJlT3JkZXIoKTsKKyAgICAgICAgbyA9IGdldE5leHRP clByZXZSZW5kZXJPYmplY3RCYXNlZE9uRGlyZWN0aW9uKG8sIHN0b3AsIGNvbnRpbnVlRXhwbG9y aW5nLCBleHBsb3JpbmdCYWNrd2FyZHMpOwogICAgIH0KIAogICAgIGlmICghbV9mcmFtZVZpZXcg fHwgYmxvY2tSZXBhaW50TW9kZSA9PSBSZXBhaW50Tm90aGluZykK 208765 2013-08-14 15:30:32 -0700 2013-09-04 12:51:25 -0700 Patch bug-119622-20130815003031.patch text/plain 10419 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNiNjFiNDBmOTk5OTU1 NDBlNDNiMWUyYWQ2ODZjOTBkMGQ2MjdjMS4uMjI4MjkyMjYwOGM5ZGEwOWE3Njk0ODU2MDUzMjFm MGYyMzJhMDk2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA4LTE0ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIDxodHRwczov L3dlYmtpdC5vcmcvYi8xMTk2MjI+IFtDU1NSZWdpb25zXSBOb3QgcG9zc2libGUgdG8gY2xlYXIg dGhlIHNlbGVjdGlvbiB3aGVuIG1peGluZyBjb250ZW50IGZyb20gZGlmZmVyZW50IEZsb3dUaHJl YWRzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hl biB1c2luZyBDU1MgUmVnaW9ucyBpcyB1c3VhbCB0aGF0IHRoZSBSZW5kZXJUcmVlIGRvZXNuJ3Qg bWF0Y2gKKyAgICAgICAgdGhlIERPTSBUcmVlIGluIHRlcm1zIG9mIHJlbGF0aXZlIHBvc2l0aW9u IG9mIHRoZSBub2Rlcy4gQmVzaWRlcywKKyAgICAgICAgdXN1YWxseSB0aGUgY29udGVudCBvZiBh IGNlcnRhaW4gbm9kZSBpcyBzcGxpdCBhbmQgc3ByZWFkIGFjcm9zcworICAgICAgICBtdWx0aXBs ZSBibG9ja3MsIHJlbmRlcmVkIGluIGRpZmZlcmVudCBwb3NpdGlvbnMuCisKKyAgICAgICAgUmVn YXJkaW5nIHRoZSBTZWxlY3Rpb24sIHRoaXMgcHJvYmxlbSBpcyBldmVuIG1vcmUgaW1wb3J0YW50 OyB0aGUKKyAgICAgICAgc2VsZWN0aW9uIGRpcmVjdGlvbiBjaGFuZ2VzIHdoZW4gY3Jvc3Npbmcg dGhlIEZsb3dUaHJlYWQKKyAgICAgICAgYm91bmRhcmllcy4gVGhpcyB3ZWlyZCBiZWhhdmlvciBp cyBhbHNvIHByZXNlbnQgaW4gb3RoZXIgbGF5b3V0cworICAgICAgICB1c2luZyBub24tcmVndWxh ciBwb3NpdGlvbmluZyBtZWNoYW5pc21zLCBsaWtlIGFic29sdXRlLAorICAgICAgICBzdGF0aWMu IEhvd2V2ZXIsIGZvciB0aG9zZSBsYXlvdXRzIHRoZSBSZW5kZXJUcmVlIHByZXNlcnZlcyB0aGUK KyAgICAgICAgb3JkZXIgb2YgdGhlIG5vZGVzLCB1bmxpa2UgdGhlIENTUyBSZWdpb25zIGxheW91 dCBtb2RlbC4KKworICAgICAgICBCZWNhdXNlIG9mIGhvdyB0aGUgUmVuZGVyVHJlZSBpcyBnZW5l cmF0ZWQgd2l0aCBDU1MgUmVnaW9ucywgdGhlCisgICAgICAgIFJlbmRlclZpZXc6OnNldFNlbGVj dGlvbiBhbGdvcml0aG0gaXMgbm90IGFibGUgdG8gcmVwYWludCBzb21lIG9mCisgICAgICAgIHRo ZSByZWN0YW5nbGVzIGRlZmluZWQgZHVyaW5nIHRoZSBzZWxlY3Rpb24gcHJvY2Vzcy4gSW4gb3Jk ZXIgdG8KKyAgICAgICAgZmFjZSB0aGlzIGlzc3VlLCB0aGUgcHJvcG9zZWQgZml4IGRldGVybWlu ZXMgd2hldGhlciBpdCBzaG91bGQKKyAgICAgICAgYmFja3dhcmRzIHRyYXZlcnNpbmcgdGhlIFJl bmRlclRyZWUsIGZyb20gdGhlICJzdG9wIiBub2RlIHRvIHRoZQorICAgICAgICBSZW5kZXJWaWV3 IG5vZGUuCisKKyAgICAgICAgVGVzdDogZmFzdC9yZWdpb25zL3NlbGVjdGluZy10ZXh0LXRocm91 Z2gtZGlmZmVyZW50LXJlZ2lvbi1mbG93cy0yLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldE5leHRPclByZXZSZW5kZXJPYmpl Y3RCYXNlZE9uRGlyZWN0aW9uKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3 OjpzZXRTZWxlY3Rpb24pOgorCiAyMDEzLTA4LTE0ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNo aWN1QGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIFJlbmRlclJlZ2lvbnMgc2hv dWxkIGhhdmUgYSBSZW5kZXJMYXllcitCYWNraW5nIHdoZW4gdGhleSBjb250YWluIGEgQ29tcG9z aXRlZCBSZW5kZXJMYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmlu ZGV4IDgyZTFmZjZmMGFhOTBkYjIyZjYwMjg1MzhhYmIyM2JmYzRlMzY3ZTMuLmE3ZTcyNWJjOTlk MDUzYTczZTBjODY2MGE2NmU4MzFjZjgyNzBkNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlldy5jcHAKQEAgLTc0NSw2ICs3NDUsMjcgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRN YXhpbWFsT3V0bGluZVNpemUoaW50IG8pCiB9CiAjZW5kaWYKIAorLy8gV2hlbiBleHBsb3Jpbmcg dGhlIFJlbmRlclRyZWUgbG9va2luZyBmb3IgdGhlIG5vZGVzIGludm9sdmVkIGluIHRoZSBTZWxl Y3Rpb24sIHNvbWV0aW1lcyBpdCdzCisvLyByZXF1aXJlZCB0byBjaGFuZ2UgdGhlIHRyYXZlcnNp bmcgZGlyZWN0aW9uIGJlY2F1c2UgdGhlICJzdGFydCIgcG9zaXRpb24gaXMgYmVsb3cgdGhlICJl bmQiIG9uZS4KK3N0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBnZXROZXh0T3JQcmV2UmVuZGVy T2JqZWN0QmFzZWRPbkRpcmVjdGlvbihjb25zdCBSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRl ck9iamVjdCogc3RvcCwgYm9vbCYgY29udGludWVFeHBsb3JpbmcsIGJvb2wmIGV4cGxvcmluZ0Jh Y2t3YXJkcykKK3sKKyAgICBSZW5kZXJPYmplY3QqIG5leHQ7CisgICAgaWYgKGV4cGxvcmluZ0Jh Y2t3YXJkcykgeworICAgICAgICBuZXh0ID0gby0+cHJldmlvdXNJblByZU9yZGVyKCk7CisgICAg ICAgIGNvbnRpbnVlRXhwbG9yaW5nID0gbmV4dCAmJiAhKG5leHQpLT5pc1JlbmRlclZpZXcoKTsK KyAgICB9IGVsc2UgeworICAgICAgICBuZXh0ID0gby0+bmV4dEluUHJlT3JkZXIoKTsKKyAgICAg ICAgY29udGludWVFeHBsb3JpbmcgPSBuZXh0ICYmIG5leHQgIT0gc3RvcDsKKyAgICAgICAgZXhw bG9yaW5nQmFja3dhcmRzID0gIW5leHQgJiYgKG5leHQgIT0gc3RvcCk7CisgICAgICAgIGlmIChl eHBsb3JpbmdCYWNrd2FyZHMpIHsKKyAgICAgICAgICAgIG5leHQgPSBzdG9wLT5wcmV2aW91c0lu UHJlT3JkZXIoKTsKKyAgICAgICAgICAgIGNvbnRpbnVlRXhwbG9yaW5nID0gbmV4dCAmJiAhbmV4 dC0+aXNSZW5kZXJWaWV3KCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gbmV4dDsK K30KKwogdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwg aW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0aW9uUmVw YWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSkKIHsKICAgICAvLyBNYWtlIHN1cmUgYm90aCBvdXIg c3RhcnQgYW5kIGVuZCBvYmplY3RzIGFyZSBkZWZpbmVkLgpAQCAtNzU5LDkgKzc4MCw2IEBAIHZv aWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFy dFBvcywgUmVuZGVyT2JqZWN0KiBlCiAgICAgICAgIG1fc2VsZWN0aW9uRW5kID09IGVuZCAmJiBt X3NlbGVjdGlvbkVuZFBvcyA9PSBlbmRQb3MgJiYgIWNhcmV0Q2hhbmdlZCkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaWYgKChzdGFydCAmJiBlbmQpICYmIChzdGFydC0+Zmxvd1RocmVhZENvbnRh aW5pbmdCbG9jaygpICE9IGVuZC0+Zmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpKSkKLSAgICAg ICAgcmV0dXJuOwotCiAgICAgLy8gUmVjb3JkIHRoZSBvbGQgc2VsZWN0ZWQgb2JqZWN0cy4gIFRo ZXNlIHdpbGwgYmUgdXNlZCBsYXRlcgogICAgIC8vIHdoZW4gd2UgY29tcGFyZSBhZ2FpbnN0IHRo ZSBuZXcgc2VsZWN0ZWQgb2JqZWN0cy4KICAgICBpbnQgb2xkU3RhcnRQb3MgPSBtX3NlbGVjdGlv blN0YXJ0UG9zOwpAQCAtNzgxLDcgKzc5OSw5IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0 aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAK ICAgICBSZW5kZXJPYmplY3QqIG9zID0gbV9zZWxlY3Rpb25TdGFydDsKICAgICBSZW5kZXJPYmpl Y3QqIHN0b3AgPSByZW5kZXJlckFmdGVyUG9zaXRpb24obV9zZWxlY3Rpb25FbmQsIG1fc2VsZWN0 aW9uRW5kUG9zKTsKLSAgICB3aGlsZSAob3MgJiYgb3MgIT0gc3RvcCkgeworICAgIGJvb2wgZXhw bG9yaW5nQmFja3dhcmRzID0gZmFsc2U7CisgICAgYm9vbCBjb250aW51ZUV4cGxvcmluZyA9IG9z ICYmIChvcyAhPSBzdG9wKTsKKyAgICB3aGlsZSAoY29udGludWVFeHBsb3JpbmcpIHsKICAgICAg ICAgaWYgKChvcy0+Y2FuQmVTZWxlY3Rpb25MZWFmKCkgfHwgb3MgPT0gbV9zZWxlY3Rpb25TdGFy dCB8fCBvcyA9PSBtX3NlbGVjdGlvbkVuZCkgJiYgb3MtPnNlbGVjdGlvblN0YXRlKCkgIT0gU2Vs ZWN0aW9uTm9uZSkgewogICAgICAgICAgICAgLy8gQmxvY2tzIGFyZSByZXNwb25zaWJsZSBmb3Ig cGFpbnRpbmcgbGluZSBnYXBzIGFuZCBtYXJnaW4gZ2Fwcy4gIFRoZXkgbXVzdCBiZSBleGFtaW5l ZCBhcyB3ZWxsLgogICAgICAgICAgICAgb2xkU2VsZWN0ZWRPYmplY3RzLnNldChvcywgYWRvcHRQ dHIobmV3IFJlbmRlclNlbGVjdGlvbkluZm8ob3MsIHRydWUpKSk7CkBAIC03OTcsNyArODE3LDcg QEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50 IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGUKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0g ICAgICAgIG9zID0gb3MtPm5leHRJblByZU9yZGVyKCk7CisgICAgICAgIG9zID0gZ2V0TmV4dE9y UHJldlJlbmRlck9iamVjdEJhc2VkT25EaXJlY3Rpb24ob3MsIHN0b3AsIGNvbnRpbnVlRXhwbG9y aW5nLCBleHBsb3JpbmdCYWNrd2FyZHMpOwogICAgIH0KIAogICAgIC8vIE5vdyBjbGVhciB0aGUg c2VsZWN0aW9uLgpAQCAtODM2LDcgKzg1Niw5IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0 aW9uKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAg ICAgLy8gTm93IHRoYXQgdGhlIHNlbGVjdGlvbiBzdGF0ZSBoYXMgYmVlbiB1cGRhdGVkIGZvciB0 aGUgbmV3IG9iamVjdHMsIHdhbGsgdGhlbSBhZ2FpbiBhbmQKICAgICAvLyBwdXQgdGhlbSBpbiB0 aGUgbmV3IG9iamVjdHMgbGlzdC4KICAgICBvID0gc3RhcnQ7Ci0gICAgd2hpbGUgKG8gJiYgbyAh PSBzdG9wKSB7CisgICAgZXhwbG9yaW5nQmFja3dhcmRzID0gZmFsc2U7CisgICAgY29udGludWVF eHBsb3JpbmcgPSBvICYmIChvICE9IHN0b3ApOworICAgIHdoaWxlIChjb250aW51ZUV4cGxvcmlu ZykgewogICAgICAgICBpZiAoKG8tPmNhbkJlU2VsZWN0aW9uTGVhZigpIHx8IG8gPT0gc3RhcnQg fHwgbyA9PSBlbmQpICYmIG8tPnNlbGVjdGlvblN0YXRlKCkgIT0gU2VsZWN0aW9uTm9uZSkgewog ICAgICAgICAgICAgbmV3U2VsZWN0ZWRPYmplY3RzLnNldChvLCBhZG9wdFB0cihuZXcgUmVuZGVy U2VsZWN0aW9uSW5mbyhvLCB0cnVlKSkpOwogICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGNiID0g by0+Y29udGFpbmluZ0Jsb2NrKCk7CkBAIC04NDksNyArODcxLDcgQEAgdm9pZCBSZW5kZXJWaWV3 OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJP YmplY3QqIGUKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIG8gPSBvLT5uZXh0 SW5QcmVPcmRlcigpOworICAgICAgICBvID0gZ2V0TmV4dE9yUHJldlJlbmRlck9iamVjdEJhc2Vk T25EaXJlY3Rpb24obywgc3RvcCwgY29udGludWVFeHBsb3JpbmcsIGV4cGxvcmluZ0JhY2t3YXJk cyk7CiAgICAgfQogCiAgICAgaWYgKCFtX2ZyYW1lVmlldyB8fCBibG9ja1JlcGFpbnRNb2RlID09 IFJlcGFpbnROb3RoaW5nKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDk1MGFhZjE1YjE3OTc3YWI0NjUwYTAyMjI1ZDFiNmRm NDc5MGQ1MWQuLjk4OWVlYWU5YzViNThhYzhlNjY1MDA5Mjg5YWYxNTkxOGRiZGFhMjcgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMiBAQAorMjAxMy0wOC0xNCAgSmF2aWVyIEZlcm5hbmRleiAgPGpmZXJuYW5k ZXpAaWdhbGlhLmNvbT4KKworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5NjIyPiBb Q1NTUmVnaW9uc10gTm90IHBvc3NpYmxlIHRvIGNsZWFyIHRoZSBzZWxlY3Rpb24gd2hlbiBtaXhp bmcgY29udGVudCBmcm9tIGRpZmZlcmVudCBGbG93VGhyZWFkcworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9yZWdpb25zL3NlbGVjdGluZy10 ZXh0LXRocm91Z2gtZGlmZmVyZW50LXJlZ2lvbi1mbG93cy0yLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9zZWxlY3RpbmctdGV4dC10aHJvdWdoLWRpZmZlcmVu dC1yZWdpb24tZmxvd3MtMi5odG1sOiBBZGRlZC4KKwogMjAxMy0wOC0xNCAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luZG93c10gVW5yZXZpZXdlZCBi dWlsZCBnYXJkZW5pbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2Vs ZWN0aW5nLXRleHQtdGhyb3VnaC1kaWZmZXJlbnQtcmVnaW9uLWZsb3dzLTItZXhwZWN0ZWQuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zZWxlY3RpbmctdGV4dC10aHJvdWdoLWRpZmZl cmVudC1yZWdpb24tZmxvd3MtMi1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmIyYWViNWUxNmFl ZTQyMGIxNTJhMzVhMTg5ZTMwYTEzZDUzYWM0OWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvc2VsZWN0aW5nLXRleHQtdGhyb3VnaC1kaWZmZXJlbnQtcmVnaW9u LWZsb3dzLTItZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDMxIEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Citib2R5IHsgd2lkdGg6IDYwMHB4OyB9CisjZm9vdE5v dGUgeyBmb250LXNpemU6IDEzcHg7IH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorZnVuY3Rpb24gc2Vs ZWN0VGV4dCgpCit7CisgIHZhciBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CisK KyAgdmFyIHN0YXJ0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN0YXJ0Iik7CisgIHZhciBl bmQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZW5kIik7CisKKyAgc2VsZWN0aW9uLnNldEJh c2VBbmRFeHRlbnQoc3RhcnQsIDAsIGVuZCwgMCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5IG9ubG9hZD0ic2VsZWN0VGV4dCgpIj4KKzxkaXYgaWQ9ImNvbnRlbnQiPgorICAgIDxoMSBz dHlsZT0ibWFyZ2luLXRvcDogMHB4Ij5TZWxlY3RpbmcgdGV4dCB0aHJvdWdoIGRpZmZlcmVudCBD U1MtUmVnaW9uIGZsb3dzPC9oMT4KKyAgICA8ZGl2PgorICAgIFRoaXMgdGV4dCBjb250YWlucyBh IGZvb3Rub3RlIGFzIGEgbmVzdGVkIHJlZ2lvbiB3aGF0IGlzIGRpcGxheWVkIDxzcGFuIGlkPSJz dGFydCI+YmVsb3c8c3Bhbj4gdGhlIGFydGljbGUuICgxKSBJZiB5b3Ugc3RhcnQgc2VsZWN0aW5n CisgICAgICAgIHRleHQgZnJvbSB0aGlzIGFydGljbGUgdW50aWwgc29tZXdoZXJlIGluIHRoZSBm b290bm90ZSBhbmQgdGhlbiBjbGljayBzb21ld2hlcmUsIHRoZSBzZWxlY3Rpb24gc2hvdWxkIGJl IGNsZWFyZWQuCisgICAgPC9kaXY+CisgICAgPGRpdiBpZD0iZm9vdE5vdGUiPigxKSBUaGlzIGlz IGEgZm9vdG5vdGUuIEZvb3Rub3RlcyBjYW4gYmUgcXVpdGUgbG9uZyBhbmQgZ28gb3ZlciBzZXZl cmFsIGxpbmVzLiBUaGlzIGZvb3Rub3RlCisgICAgaXMgbmVzdGVkIGluc2lkZSB0aGUgdGV4dCA8 c3BhbiBpZD0iZW5kIj5hYm92ZTxzcGFuPiBhbmQgZGlzcGxheWVkIGhlcmUgd2l0aCB0aGUgaGVs cCBvZiBjc3MtcmVnaW9ucy48L3NwYW4+PC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zZWxlY3RpbmctdGV4dC10aHJv dWdoLWRpZmZlcmVudC1yZWdpb24tZmxvd3MtMi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL3NlbGVjdGluZy10ZXh0LXRocm91Z2gtZGlmZmVyZW50LXJlZ2lvbi1mbG93cy0yLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uZTI4M2UwMjY2NjJlNzhhMGY5M2MwZjE1OGMxZTkzMDBjYjZlZTZjOQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zZWxlY3RpbmctdGV4dC10 aHJvdWdoLWRpZmZlcmVudC1yZWdpb24tZmxvd3MtMi5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwh RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KK2JvZHkgeyB3aWR0aDogNjAw cHg7IH0KKworI2Zvb3ROb3RlIHsKKyAgICAtd2Via2l0LWZsb3ctaW50bzogZm9vdE5vdGU7Cisg ICAgZGlzcGxheTogYmxvY2s7CisgICAgZm9udC1zaXplOiAxM3B4OworfQorCisjZm9vdE5vdGVS ZWdpb24geyAtd2Via2l0LWZsb3ctZnJvbTogZm9vdE5vdGU7IH0KKyNjb250ZW50IHsgLXdlYmtp dC1mbG93LWludG86IGNvbnRlbnQ7IH0KKyNyZWdpb24geyAtd2Via2l0LWZsb3ctZnJvbTogY29u dGVudDsgfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJyZWdpb24iPjwv ZGl2PgorPGRpdiBpZD0iZm9vdE5vdGVSZWdpb24iPjwvZGl2PgorPGRpdiBpZD0iY29udGVudCI+ CisgICAgPGgxIHN0eWxlPSJtYXJnaW4tdG9wOiAwcHgiPlNlbGVjdGluZyB0ZXh0IHRocm91Z2gg ZGlmZmVyZW50IENTUy1SZWdpb24gZmxvd3M8L2gxPgorICAgIDxkaXYgaWQ9ImNvbnRlbnRUZXh0 Ij4KKyAgICAgICAgVGhpcyB0ZXh0IGNvbnRhaW5zIGEgZm9vdG5vdGUgYXMgYSBuZXN0ZWQgcmVn aW9uIHdoYXQgaXMgZGlwbGF5ZWQgPHNwYW4gaWQ9InN0YXJ0Ij5iZWxvdzwvc3Bhbj4gdGhlIGFy dGljbGUuICgxKSA8c3BhbiBpZD0iZm9vdE5vdGUiPgorICAgICAgICA8c3Bhbj48c3Bhbj48L3Nw YW4+KDEpIFRoaXMgaXMgYSBmb290bm90ZS4gRm9vdG5vdGVzIGNhbiBiZSBxdWl0ZSBsb25nIGFu ZCBnbyBvdmVyIHNldmVyYWwgbGluZXMuIFRoaXMgZm9vdG5vdGUKKyAgICAgICAgaXMgbmVzdGVk IGluc2lkZSB0aGUgdGV4dCA8c3BhbiBpZD0iZW5kIj5hYm92ZTwvc3Bhbj4gYW5kIGRpc3BsYXll ZCBoZXJlIHdpdGggdGhlIGhlbHAgb2YgY3NzLXJlZ2lvbnMuPC9zcGFuPjwvc3Bhbj4gSWYgeW91 IHN0YXJ0IHNlbGVjdGluZworICAgICAgICB0ZXh0IGZyb20gdGhpcyBhcnRpY2xlIHVudGlsIHNv bWV3aGVyZSBpbiB0aGUgZm9vdG5vdGUgYW5kIHRoZW4gY2xpY2sgc29tZXdoZXJlLCB0aGUgc2Vs ZWN0aW9uIHNob3VsZCBiZSBjbGVhcmVkLgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxzY3JpcHQ+ CitpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAvLyBXZSBhcmUgcG9zaXRpb25pbmcgdGhl IG1vdXNlIHRvIHRoZSBjZW50ZXIgb2YgdGhlIGNvbnRlbnRUZXh0IGFuZCBzdGFydCBob2xkaW5n IHRoZSBtb3VzZSBkb3duCisgICAgdmFyIHN0YXJ0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InN0YXJ0Iik7CisgICAgdmFyIHhTdGFydFBvc2l0aW9uID0gc3RhcnQub2Zmc2V0TGVmdCArIDA7 CisgICAgdmFyIHlTdGFydFBvc2l0aW9uID0gc3RhcnQub2Zmc2V0VG9wICsgc3RhcnQub2Zmc2V0 SGVpZ2h0IC8gMjsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4U3RhcnRQb3NpdGlvbiwg eVN0YXJ0UG9zaXRpb24pOworICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworCisgICAgLy8g V2UgYXJlIHBvc2l0aW9uaW5nIHRoZSBtb3VzZSB0byB0aGUgY2VudGVyIG9mIHRoZSBmb290Tm90 ZSAod2hhdCBpcyBhIGRpZmZlcmVudCByZWdpb24gZmxvdykgYW5kIHJlbGVhc2UgdGhlIGJ1dHRv bgorICAgIHZhciBlbmQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZW5kIik7CisgICAgdmFy IHhFbmRQb3NpdGlvbiA9IGVuZC5vZmZzZXRMZWZ0ICsgMDsKKyAgICB2YXIgeUVuZFBvc2l0aW9u ID0gZW5kLm9mZnNldFRvcCArIGVuZC5vZmZzZXRIZWlnaHQgLyAyOworICAgIGV2ZW50U2VuZGVy Lm1vdXNlTW92ZVRvKHhFbmRQb3NpdGlvbiwgeUVuZFBvc2l0aW9uKTsKKyAgICBldmVudFNlbmRl ci5tb3VzZVVwKCk7Cit9Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K