94983 2012-08-24 17:03:02 -0700 [Chromium] Stop texture updates when context is lost. 2012-08-27 18:59:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reveman reveman cc-bugs jamesr piman webkit.review.bot oldest_to_newest 704530 0 reveman 2012-08-24 17:03:02 -0700 Stop texture uploads when context is lost rather than relying on the throttled texture uploader to still make progress with a lost context. 704537 1 160525 reveman 2012-08-24 17:07:42 -0700 Created attachment 160525 Patch Work in progress. Needs a unit test. 704548 2 160525 piman 2012-08-24 17:19:58 -0700 Comment on attachment 160525 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160525&action=review > Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp:-623 > - ASSERT(!m_currentTextureUpdateControllerOnImplThread->hasMoreUpdates()); Maybe you can replace those 2 with ASSERT(!hasMoreResourceUpdates()) which should work with either case? 704892 3 160616 reveman 2012-08-26 14:37:13 -0700 Created attachment 160616 Patch Add unit test and ASSERT 705416 4 160616 jamesr 2012-08-27 11:10:42 -0700 Comment on attachment 160616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160616&action=review > Source/WebKit/chromium/ChangeLog:10 > + (WTF::CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext::create): the anonymous namespace for tests confuses the ChangeLog script - could you delete the WTF::s before landing? 705447 5 160760 reveman 2012-08-27 11:35:55 -0700 Created attachment 160760 Patch Remove WTF:: 705713 6 160760 webkit.review.bot 2012-08-27 14:58:35 -0700 Comment on attachment 160760 Patch Rejecting attachment 160760 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Kit/chromium/third_party/yasm/source/patched-yasm --revision 134927 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 50>At revision 134927. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/13639019 705727 7 160819 reveman 2012-08-27 15:07:34 -0700 Created attachment 160819 Patch fix changelog 705986 8 160819 webkit.review.bot 2012-08-27 18:59:52 -0700 Comment on attachment 160819 Patch Clearing flags on attachment: 160819 Committed r126835: <http://trac.webkit.org/changeset/126835> 705987 9 webkit.review.bot 2012-08-27 18:59:56 -0700 All reviewed patches have been landed. Closing bug. 160525 2012-08-24 17:07:42 -0700 2012-08-26 14:37:11 -0700 Patch bug-94983-20120824200737.patch text/plain 2011 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI5YjdiMzA3ZGI5MTY2 ZWNiZTkzYjQ5OWRjNDNhODU2ZGM2YzI0OC4uYWM0ZDZhZjM5NGNhYjdlYTg3YTBiZDMzZDQ1YjE4 NmI2MjM2NDAzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTI0ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBT dG9wIHRleHR1cmUgdXBkYXRlcyB3aGVuIGNvbnRleHQgaXMgbG9zdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJlZSBtX2N1cnJlbnRUZXh0dXJlVXBk YXRlQ29udHJvbGxlciB3aGVuCisgICAgICAgIENDVGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0 T25JbXBsVGhyZWFkKCkgaXMgY2FsbGVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q0NUaHJlYWRQcm94eTo6ZGlkTG9zZUNvbnRleHRPbkltcGxUaHJl YWQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NUaHJlYWRQcm94eTo6c2NoZWR1bGVkQWN0aW9uQ29t bWl0KToKKwogMjAxMi0wOC0yNCAgSm9zaHVhIE5ldHRlcmZpZWxkICA8am5ldHRlcmZpZWxkQHJp bS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEV4dGVuZCBMYXllckZpbHRlclJlbmRlcmVy IGluIHByZXBhcmF0aW9uIGZvciBDU1MgU2hhZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNw cAppbmRleCA1ODNjNzBjNjA0MzZmNTM3ZWU4NzhiMmQ3NDBkYWYyNmM5Mjk3NDUxLi44ZTE5NTVl OWFmZmQ4YzI2ODNkNDVlZjAxYWFjYzZjNmM3NzFmZDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFBy b3h5LmNwcApAQCAtMzE0LDYgKzMxNCw3IEBAIHZvaWQgQ0NUaHJlYWRQcm94eTo6ZGlkTG9zZUNv bnRleHRPbkltcGxUaHJlYWQoKQogewogICAgIEFTU0VSVChpc0ltcGxUaHJlYWQoKSk7CiAgICAg VFJBQ0VfRVZFTlQwKCJjYyIsICJDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4dE9uSW1wbFRo cmVhZCIpOworICAgIG1fY3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBsVGhyZWFk LmNsZWFyKCk7CiAgICAgbV9zY2hlZHVsZXJPbkltcGxUaHJlYWQtPmRpZExvc2VDb250ZXh0KCk7 CiB9CiAKQEAgLTYxOSw4ICs2MjAsNiBAQCB2b2lkIENDVGhyZWFkUHJveHk6OnNjaGVkdWxlZEFj dGlvbkNvbW1pdCgpCiB7CiAgICAgVFJBQ0VfRVZFTlQwKCJjYyIsICJDQ1RocmVhZFByb3h5Ojpz Y2hlZHVsZWRBY3Rpb25Db21taXQiKTsKICAgICBBU1NFUlQoaXNJbXBsVGhyZWFkKCkpOwotICAg IEFTU0VSVChtX2N1cnJlbnRUZXh0dXJlVXBkYXRlQ29udHJvbGxlck9uSW1wbFRocmVhZCk7Ci0g ICAgQVNTRVJUKCFtX2N1cnJlbnRUZXh0dXJlVXBkYXRlQ29udHJvbGxlck9uSW1wbFRocmVhZC0+ aGFzTW9yZVVwZGF0ZXMoKSk7CiAgICAgQVNTRVJUKG1fY29tbWl0Q29tcGxldGlvbkV2ZW50T25J bXBsVGhyZWFkKTsKIAogICAgIG1fY3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBs VGhyZWFkLmNsZWFyKCk7Cg== 160616 2012-08-26 14:37:13 -0700 2012-08-27 11:35:53 -0700 Patch bug-94983-20120826173706.patch text/plain 8370 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I1N2YyMTA5OGEyNzVi NzM0MWUzOWI0MWZmOGMwYWU1OGYxYzk1My4uNjM0M2ExMGUxMTU1NTk1Njk2M2E0ODJlYzY4ZGZk Y2U1NGVhYjFkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTI2ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBT dG9wIHRleHR1cmUgdXBkYXRlcyB3aGVuIGNvbnRleHQgaXMgbG9zdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJlZSBtX2N1cnJlbnRUZXh0dXJlVXBk YXRlQ29udHJvbGxlciB3aGVuCisgICAgICAgIENDVGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0 T25JbXBsVGhyZWFkKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFVuaXQgdGVzdDogQ0NMYXllclRy ZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcy5ydW5NdWx0aVRocmVh ZAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4dE9u SW1wbFRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpzY2hlZHVsZWRB Y3Rpb25Db21taXQpOgorCiAyMDEyLTA4LTI2ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgQ29uc29sZVZpZXcgbGlz dGVuIHRvIHRoZSBKYXZhU2NyaXB0Q29udGV4dE1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggODIyMjY4MzNkYTcyYjMyNmE4OTQxZGRkN2U2OWEwMTE5Y2Y1YzhmMC4uNWNlZjM1 Njg0ZGI3OWZkZjQ4YWE2MjBlODgxMzJhY2Y5Nzc2YmZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMi0wOC0yNiAgRGF2aWQgUmV2ZW1hbiAgPHJldmVt YW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gU3RvcCB0ZXh0dXJlIHVwZGF0 ZXMgd2hlbiBjb250ZXh0IGlzIGxvc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05NDk4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAg IChDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xv c3RDb250ZXh0KToKKyAgICAgICAgKFdURjo6Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRl eHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6Y3JlYXRlKToKKyAgICAgICAgKFdU Rjo6Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdM b3N0Q29udGV4dDo6c2V0Q29udGV4dExvc3RDYWxsYmFjayk6CisgICAgICAgIChXVEY6OkNvbXBv c2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRl eHQ6OmlzQ29udGV4dExvc3QpOgorICAgICAgICAoV1RGOjpDb21wb3NpdG9yRmFrZVdlYkdyYXBo aWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xvc3RDb250ZXh0OjpiZWdpblF1ZXJ5RVhU KToKKyAgICAgICAgKFdURjo6Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhF bmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6ZW5kUXVlcnlFWFQpOgorICAgICAgICAoV1RGOjpD b21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xvc3RD b250ZXh0OjpnZXRRdWVyeU9iamVjdHVpdkVYVCk6CisgICAgICAgIChXVEY6OkNvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OkNv bXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENv bnRleHQpOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0 Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXMpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJl ZUhvc3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzOjpDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzKToKKyAgICAgICAgKFdURjo6 Q0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlczo6Y3Jl YXRlT3V0cHV0U3VyZmFjZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0 Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmJlZ2luVGVzdCk6CisgICAgICAgIChXVEY6 OkNDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmNv bW1pdENvbXBsZXRlT25DQ1RocmVhZCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRl c3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmxheW91dCk6CisgICAgICAgIChX VEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6 OmFmdGVyVGVzdCk6CisgICAgICAgIChXVEY6OlRFU1RfRik6CisKIDIwMTItMDgtMjQgIERvbWlu aWMgTWF6em9uaSAgPGRtYXp6b25pQGdvb2dsZS5jb20+CiAKICAgICAgICAgQ2hyb21pdW06IFdl YkFjY2Vzc2liaWxpdHlPYmplY3Qgc2hvdWxkIGV4cG9zZSB1cGRhdGVCYWNraW5nU3RvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND VGhyZWFkUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKaW5kZXggNTgzYzcwYzYwNDM2ZjUzN2VlODc4YjJkNzQw ZGFmMjZjOTI5NzQ1MS4uZjg5NjkyNWJhMmQ1MTMxMjhjNDEwMDRmYWVjNDI4NmY1NmQ1YTYxMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKQEAgLTMxNCw2ICszMTQsNyBAQCB2b2lkIEND VGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0T25JbXBsVGhyZWFkKCkKIHsKICAgICBBU1NFUlQo aXNJbXBsVGhyZWFkKCkpOwogICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiQ0NUaHJlYWRQcm94eTo6 ZGlkTG9zZUNvbnRleHRPbkltcGxUaHJlYWQiKTsKKyAgICBtX2N1cnJlbnRUZXh0dXJlVXBkYXRl Q29udHJvbGxlck9uSW1wbFRocmVhZC5jbGVhcigpOwogICAgIG1fc2NoZWR1bGVyT25JbXBsVGhy ZWFkLT5kaWRMb3NlQ29udGV4dCgpOwogfQogCkBAIC02MTksOCArNjIwLDcgQEAgdm9pZCBDQ1Ro cmVhZFByb3h5OjpzY2hlZHVsZWRBY3Rpb25Db21taXQoKQogewogICAgIFRSQUNFX0VWRU5UMCgi Y2MiLCAiQ0NUaHJlYWRQcm94eTo6c2NoZWR1bGVkQWN0aW9uQ29tbWl0Iik7CiAgICAgQVNTRVJU KGlzSW1wbFRocmVhZCgpKTsKLSAgICBBU1NFUlQobV9jdXJyZW50VGV4dHVyZVVwZGF0ZUNvbnRy b2xsZXJPbkltcGxUaHJlYWQpOwotICAgIEFTU0VSVCghbV9jdXJyZW50VGV4dHVyZVVwZGF0ZUNv bnRyb2xsZXJPbkltcGxUaHJlYWQtPmhhc01vcmVVcGRhdGVzKCkpOworICAgIEFTU0VSVCghaGFz TW9yZVJlc291cmNlVXBkYXRlcygpKTsKICAgICBBU1NFUlQobV9jb21taXRDb21wbGV0aW9uRXZl bnRPbkltcGxUaHJlYWQpOwogCiAgICAgbV9jdXJyZW50VGV4dHVyZVVwZGF0ZUNvbnRyb2xsZXJP bkltcGxUaHJlYWQuY2xlYXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCmluZGV4IDczMThmMTM2Y2NiMDY4YjU5N2FjZWU1 ODRlODZmNzVmYTdiNDZjODMuLmRmMmY4ZGY3YzhlZmViZjRjZTI5NTlmYWU2MGQ2YTBmNDJhMTg2 YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVI b3N0VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJl ZUhvc3RUZXN0LmNwcApAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIkNDVGhyZWFkZWRUZXN0 LmgiCiAjaW5jbHVkZSAiQ0NUaW1pbmdGdW5jdGlvbi5oIgogI2luY2x1ZGUgIkNvbnRlbnRMYXll ckNocm9taXVtLmgiCisjaW5jbHVkZSAiRXh0ZW5zaW9uczNEQ2hyb21pdW0uaCIKKyNpbmNsdWRl ICJGYWtlV2ViQ29tcG9zaXRvck91dHB1dFN1cmZhY2UuaCIKICNpbmNsdWRlIDxnbW9jay9nbW9j ay5oPgogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CiAjaW5jbHVkZSA8cHVibGljL1BsYXRmb3Jt Lmg+CkBAIC0yNjg4LDQgKzI2OTAsOTYgQEAgcHJpdmF0ZToKIAogU0lOR0xFX0FORF9NVUxUSV9U SFJFQURfVEVTVF9GKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dEFmdGVyRXZpY3RUZXh0 dXJlcykKIAorY2xhc3MgQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhFbmRR dWVyeUNhdXNpbmdMb3N0Q29udGV4dCA6IHB1YmxpYyBXZWJLaXQ6OkNvbXBvc2l0b3JGYWtlV2Vi R3JhcGhpY3NDb250ZXh0M0QgeworcHVibGljOgorICAgIHN0YXRpYyBQYXNzT3duUHRyPENvbXBv c2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRl eHQ+IGNyZWF0ZShBdHRyaWJ1dGVzIGF0dHJzKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0 UHRyKG5ldyBDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1 c2luZ0xvc3RDb250ZXh0KGF0dHJzKSk7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIHNldENv bnRleHRMb3N0Q2FsbGJhY2soV2ViR3JhcGhpY3NDb250ZXh0TG9zdENhbGxiYWNrKiBjYWxsYmFj aykgeyBtX2NvbnRleHRMb3N0Q2FsbGJhY2sgPSBjYWxsYmFjazsgfQorICAgIHZpcnR1YWwgYm9v bCBpc0NvbnRleHRMb3N0KCkgeyByZXR1cm4gbV9pc0NvbnRleHRMb3N0OyB9CisKKyAgICB2aXJ0 dWFsIHZvaWQgYmVnaW5RdWVyeUVYVChHQzNEZW51bSwgV2ViR0xJZCkgeyB9CisgICAgdmlydHVh bCB2b2lkIGVuZFF1ZXJ5RVhUKEdDM0RlbnVtKQorICAgIHsKKyAgICAgICAgLy8gTG9zZSBjb250 ZXh0LgorICAgICAgICBpZiAoIW1faXNDb250ZXh0TG9zdCkgeworICAgICAgICAgICAgbV9jb250 ZXh0TG9zdENhbGxiYWNrLT5vbkNvbnRleHRMb3N0KCk7CisgICAgICAgICAgICBtX2lzQ29udGV4 dExvc3QgPSB0cnVlOworICAgICAgICB9CisgICAgfQorICAgIHZpcnR1YWwgdm9pZCBnZXRRdWVy eU9iamVjdHVpdkVYVChXZWJHTElkLCBHQzNEZW51bSBwbmFtZSwgR0MzRHVpbnQqIHBhcmFtcykK KyAgICB7CisgICAgICAgIC8vIENvbnRleHQgaXMgbG9zdC4gUmVzdWx0IHdpbGwgbmV2ZXIgYmUg YXZhaWxhYmxlLgorICAgICAgICBpZiAocG5hbWUgPT0gRXh0ZW5zaW9uczNEQ2hyb21pdW06OlFV RVJZX1JFU1VMVF9BVkFJTEFCTEVfRVhUKQorICAgICAgICAgICAgKnBhcmFtcyA9IDA7CisgICAg fQorCitwcml2YXRlOgorICAgIGV4cGxpY2l0IENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250 ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQoQXR0cmlidXRlcyBhdHRycykKKyAg ICAgICAgOiBDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEKGF0dHJzKQorICAgICAg ICAsIG1fY29udGV4dExvc3RDYWxsYmFjaygwKQorICAgICAgICAsIG1faXNDb250ZXh0TG9zdChm YWxzZSkgeyB9CisKKyAgICBXZWJHcmFwaGljc0NvbnRleHRMb3N0Q2FsbGJhY2sqIG1fY29udGV4 dExvc3RDYWxsYmFjazsKKyAgICBib29sIG1faXNDb250ZXh0TG9zdDsKK307CisKK2NsYXNzIEND TGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXMgOiBwdWJs aWMgQ0NMYXllclRyZWVIb3N0VGVzdCB7CitwdWJsaWM6CisgICAgQ0NMYXllclRyZWVIb3N0VGVz dExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcygpCisgICAgICAgIDogbV9wYXJlbnQo Q29udGVudExheWVyQ2hyb21pdW1XaXRoVXBkYXRlVHJhY2tpbmc6OmNyZWF0ZSgmbV9kZWxlZ2F0 ZSkpCisgICAgICAgICwgbV9udW1DaGlsZHJlbig1MCkKKyAgICB7CisgICAgICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgbV9udW1DaGlsZHJlbjsgaSsrKQorICAgICAgICAgICAgbV9jaGlsZHJlbi5h cHBlbmQoQ29udGVudExheWVyQ2hyb21pdW1XaXRoVXBkYXRlVHJhY2tpbmc6OmNyZWF0ZSgmbV9k ZWxlZ2F0ZSkpOworICAgIH0KKworICAgIHZpcnR1YWwgUGFzc093blB0cjxXZWJLaXQ6OldlYkNv bXBvc2l0b3JPdXRwdXRTdXJmYWNlPiBjcmVhdGVPdXRwdXRTdXJmYWNlKCkKKyAgICB7CisgICAg ICAgIHJldHVybiBGYWtlV2ViQ29tcG9zaXRvck91dHB1dFN1cmZhY2U6OmNyZWF0ZShDb21wb3Np dG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xvc3RDb250ZXh0 OjpjcmVhdGUoV2ViR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMoKSkpOworICAgIH0KKwor ICAgIHZpcnR1YWwgdm9pZCBiZWdpblRlc3QoKQorICAgIHsKKyAgICAgICAgbV9sYXllclRyZWVI b3N0LT5zZXRSb290TGF5ZXIobV9wYXJlbnQpOworICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNl dFZpZXdwb3J0U2l6ZShJbnRTaXplKG1fbnVtQ2hpbGRyZW4sIDEpLCBJbnRTaXplKG1fbnVtQ2hp bGRyZW4sIDEpKTsKKworICAgICAgICBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCBpZGVudGl0eU1h dHJpeDsKKyAgICAgICAgc2V0TGF5ZXJQcm9wZXJ0aWVzRm9yVGVzdGluZyhtX3BhcmVudC5nZXQo KSwgMCwgaWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEZsb2F0UG9pbnQoMCwgMCks IEludFNpemUobV9udW1DaGlsZHJlbiwgMSksIHRydWUpOworICAgICAgICBmb3IgKGludCBpID0g MDsgaSA8IG1fbnVtQ2hpbGRyZW47IGkrKykKKyAgICAgICAgICAgIHNldExheWVyUHJvcGVydGll c0ZvclRlc3RpbmcobV9jaGlsZHJlbltpXS5nZXQoKSwgbV9wYXJlbnQuZ2V0KCksIGlkZW50aXR5 TWF0cml4LCBGbG9hdFBvaW50KDAsIDApLCBGbG9hdFBvaW50KGksIDApLCBJbnRTaXplKDEsIDEp LCBmYWxzZSk7CisKKyAgICAgICAgcG9zdFNldE5lZWRzQ29tbWl0VG9NYWluVGhyZWFkKCk7Cisg ICAgfQorCisgICAgdmlydHVhbCB2b2lkIGNvbW1pdENvbXBsZXRlT25DQ1RocmVhZChDQ0xheWVy VHJlZUhvc3RJbXBsKiBpbXBsKQorICAgIHsKKyAgICAgICAgZW5kVGVzdCgpOworICAgIH0KKwor ICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKQorICAgIHsKKyAgICAgICAgbV9wYXJlbnQtPnNldE5l ZWRzRGlzcGxheSgpOworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG1fbnVtQ2hpbGRyZW47 IGkrKykKKyAgICAgICAgICAgIG1fY2hpbGRyZW5baV0tPnNldE5lZWRzRGlzcGxheSgpOworICAg IH0KKworICAgIHZpcnR1YWwgdm9pZCBhZnRlclRlc3QoKQorICAgIHsKKyAgICB9CisKK3ByaXZh dGU6CisgICAgTW9ja0NvbnRlbnRMYXllckRlbGVnYXRlIG1fZGVsZWdhdGU7CisgICAgUmVmUHRy PENvbnRlbnRMYXllckNocm9taXVtV2l0aFVwZGF0ZVRyYWNraW5nPiBtX3BhcmVudDsKKyAgICBp bnQgbV9udW1DaGlsZHJlbjsKKyAgICBWZWN0b3I8UmVmUHRyPENvbnRlbnRMYXllckNocm9taXVt V2l0aFVwZGF0ZVRyYWNraW5nPiA+IG1fY2hpbGRyZW47Cit9OworCitURVNUX0YoQ0NMYXllclRy ZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcywgcnVuTXVsdGlUaHJl YWQpCit7CisgICAgcnVuVGVzdCh0cnVlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UK 160760 2012-08-27 11:35:55 -0700 2012-08-27 15:07:32 -0700 Patch bug-94983-20120827143547.patch text/plain 8408 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzExOTcxYzk0MmM4YzFj ZTdlMDE4NzQ5NmE4NjY0MGRlZWU4ZjZjOC4uOGRkNzg2ZjI1ZTUzYWNkMjI0OTVmYWIzZGExNDBk ZTY4NGJiZmE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTI3ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBT dG9wIHRleHR1cmUgdXBkYXRlcyB3aGVuIGNvbnRleHQgaXMgbG9zdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJlZSBtX2N1cnJlbnRUZXh0dXJlVXBk YXRlQ29udHJvbGxlciB3aGVuCisgICAgICAgIENDVGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0 T25JbXBsVGhyZWFkKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFVuaXQgdGVzdDogQ0NMYXllclRy ZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcy5ydW5NdWx0aVRocmVh ZAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4dE9u SW1wbFRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpzY2hlZHVsZWRB Y3Rpb25Db21taXQpOgorCiAyMDEyLTA4LTI3ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFp eEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgTWFjIENocm9taXVtIGJ1aWxkIGZp eCBhZnRlciByMTI2NzYzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBiN2U0ZDUwM2Ew NDJhNzYwYmIwODM5MzNlNjNhMDQyZWUzYWIzNjEyLi42NDAwMjY2NjliNDdmZWU3NTMxM2YwNGE1 MTRhNjE1NzM4MzEzYzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDEyLTA4LTI3ICBEYXZpZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW0Nocm9taXVtXSBTdG9wIHRleHR1cmUgdXBkYXRlcyB3aGVuIGNvbnRleHQgaXMg bG9zdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0 OTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk aXRpb25hbCBpbmZvcm1hdGlvbiBvZiB0aGUgY2hhbmdlIHN1Y2ggYXMgYXBwcm9hY2gsIHJhdGlv bmFsZS4gUGxlYXNlIGFkZCBwZXItZnVuY3Rpb24gZGVzY3JpcHRpb25zIGJlbG93IChPT1BTISku CisKKyAgICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAgKENv bXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENv bnRleHQpOgorICAgICAgICAoQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhF bmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6Y3JlYXRlKToKKyAgICAgICAgKENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OnNl dENvbnRleHRMb3N0Q2FsbGJhY2spOgorICAgICAgICAoQ29tcG9zaXRvckZha2VXZWJHcmFwaGlj c0NvbnRleHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6aXNDb250ZXh0TG9zdCk6 CisgICAgICAgIChDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5 Q2F1c2luZ0xvc3RDb250ZXh0OjpiZWdpblF1ZXJ5RVhUKToKKyAgICAgICAgKENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OmVu ZFF1ZXJ5RVhUKToKKyAgICAgICAgKENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RX aXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OmdldFF1ZXJ5T2JqZWN0dWl2RVhUKToKKyAg ICAgICAgKENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVz aW5nTG9zdENvbnRleHQ6OkNvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5k UXVlcnlDYXVzaW5nTG9zdENvbnRleHQpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVzdExv c3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcyk6CisgICAgICAgIChDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzOjpDQ0xheWVyVHJlZUhvc3RU ZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzKToKKyAgICAgICAgKENDTGF5ZXJU cmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmNyZWF0ZU91dHB1 dFN1cmZhY2UpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVV cGRhdGluZ1Jlc291cmNlczo6YmVnaW5UZXN0KToKKyAgICAgICAgKENDTGF5ZXJUcmVlSG9zdFRl c3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmNvbW1pdENvbXBsZXRlT25DQ1Ro cmVhZCk6CisgICAgICAgIChDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0 aW5nUmVzb3VyY2VzOjpsYXlvdXQpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RD b250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlczo6YWZ0ZXJUZXN0KToKKyAgICAgICAgKFRFU1Rf Rik6CisKIDIwMTItMDgtMjcgIEp1c3RpbiBOb3Zvc2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtDaHJvbWl1bV0gSW1wbGVtZW50aW5nIGEgZ2xvYmFsIGxpbWl0IG9uIG1lbW9y eSBjb25zdW1lZCBieSBkZWZlcnJlZCAyRCBjYW52YXNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5 LmNwcAppbmRleCA1ODNjNzBjNjA0MzZmNTM3ZWU4NzhiMmQ3NDBkYWYyNmM5Mjk3NDUxLi5mODk2 OTI1YmEyZDUxMzEyOGM0MTAwNGZhZWM0Mjg2ZjU2ZDVhNjEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVh ZFByb3h5LmNwcApAQCAtMzE0LDYgKzMxNCw3IEBAIHZvaWQgQ0NUaHJlYWRQcm94eTo6ZGlkTG9z ZUNvbnRleHRPbkltcGxUaHJlYWQoKQogewogICAgIEFTU0VSVChpc0ltcGxUaHJlYWQoKSk7CiAg ICAgVFJBQ0VfRVZFTlQwKCJjYyIsICJDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4dE9uSW1w bFRocmVhZCIpOworICAgIG1fY3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBsVGhy ZWFkLmNsZWFyKCk7CiAgICAgbV9zY2hlZHVsZXJPbkltcGxUaHJlYWQtPmRpZExvc2VDb250ZXh0 KCk7CiB9CiAKQEAgLTYxOSw4ICs2MjAsNyBAQCB2b2lkIENDVGhyZWFkUHJveHk6OnNjaGVkdWxl ZEFjdGlvbkNvbW1pdCgpCiB7CiAgICAgVFJBQ0VfRVZFTlQwKCJjYyIsICJDQ1RocmVhZFByb3h5 OjpzY2hlZHVsZWRBY3Rpb25Db21taXQiKTsKICAgICBBU1NFUlQoaXNJbXBsVGhyZWFkKCkpOwot ICAgIEFTU0VSVChtX2N1cnJlbnRUZXh0dXJlVXBkYXRlQ29udHJvbGxlck9uSW1wbFRocmVhZCk7 Ci0gICAgQVNTRVJUKCFtX2N1cnJlbnRUZXh0dXJlVXBkYXRlQ29udHJvbGxlck9uSW1wbFRocmVh ZC0+aGFzTW9yZVVwZGF0ZXMoKSk7CisgICAgQVNTRVJUKCFoYXNNb3JlUmVzb3VyY2VVcGRhdGVz KCkpOwogICAgIEFTU0VSVChtX2NvbW1pdENvbXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCk7CiAK ICAgICBtX2N1cnJlbnRUZXh0dXJlVXBkYXRlQ29udHJvbGxlck9uSW1wbFRocmVhZC5jbGVhcigp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0 VGVzdC5jcHAKaW5kZXggNzMxOGYxMzZjY2IwNjhiNTk3YWNlZTU4NGU4NmY3NWZhN2I0NmM4My4u ZGYyZjhkZjdjOGVmZWJmNGNlMjk1OWZhZTYwZDZhMGY0MmExODZiZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCkBAIC0z NSw2ICszNSw4IEBACiAjaW5jbHVkZSAiQ0NUaHJlYWRlZFRlc3QuaCIKICNpbmNsdWRlICJDQ1Rp bWluZ0Z1bmN0aW9uLmgiCiAjaW5jbHVkZSAiQ29udGVudExheWVyQ2hyb21pdW0uaCIKKyNpbmNs dWRlICJFeHRlbnNpb25zM0RDaHJvbWl1bS5oIgorI2luY2x1ZGUgIkZha2VXZWJDb21wb3NpdG9y T3V0cHV0U3VyZmFjZS5oIgogI2luY2x1ZGUgPGdtb2NrL2dtb2NrLmg+CiAjaW5jbHVkZSA8Z3Rl c3QvZ3Rlc3QuaD4KICNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KQEAgLTI2ODgsNCArMjY5 MCw5NiBAQCBwcml2YXRlOgogCiBTSU5HTEVfQU5EX01VTFRJX1RIUkVBRF9URVNUX0YoQ0NMYXll clRyZWVIb3N0VGVzdExvc3RDb250ZXh0QWZ0ZXJFdmljdFRleHR1cmVzKQogCitjbGFzcyBDb21w b3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xvc3RDb250 ZXh0IDogcHVibGljIFdlYktpdDo6Q29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRCB7 CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NPd25QdHI8Q29tcG9zaXRvckZha2VXZWJHcmFwaGlj c0NvbnRleHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dD4gY3JlYXRlKEF0dHJpYnV0 ZXMgYXR0cnMpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQoYXR0 cnMpKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGV4dExvc3RDYWxsYmFjayhX ZWJHcmFwaGljc0NvbnRleHRMb3N0Q2FsbGJhY2sqIGNhbGxiYWNrKSB7IG1fY29udGV4dExvc3RD YWxsYmFjayA9IGNhbGxiYWNrOyB9CisgICAgdmlydHVhbCBib29sIGlzQ29udGV4dExvc3QoKSB7 IHJldHVybiBtX2lzQ29udGV4dExvc3Q7IH0KKworICAgIHZpcnR1YWwgdm9pZCBiZWdpblF1ZXJ5 RVhUKEdDM0RlbnVtLCBXZWJHTElkKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZW5kUXVlcnlFWFQo R0MzRGVudW0pCisgICAgeworICAgICAgICAvLyBMb3NlIGNvbnRleHQuCisgICAgICAgIGlmICgh bV9pc0NvbnRleHRMb3N0KSB7CisgICAgICAgICAgICBtX2NvbnRleHRMb3N0Q2FsbGJhY2stPm9u Q29udGV4dExvc3QoKTsKKyAgICAgICAgICAgIG1faXNDb250ZXh0TG9zdCA9IHRydWU7CisgICAg ICAgIH0KKyAgICB9CisgICAgdmlydHVhbCB2b2lkIGdldFF1ZXJ5T2JqZWN0dWl2RVhUKFdlYkdM SWQsIEdDM0RlbnVtIHBuYW1lLCBHQzNEdWludCogcGFyYW1zKQorICAgIHsKKyAgICAgICAgLy8g Q29udGV4dCBpcyBsb3N0LiBSZXN1bHQgd2lsbCBuZXZlciBiZSBhdmFpbGFibGUuCisgICAgICAg IGlmIChwbmFtZSA9PSBFeHRlbnNpb25zM0RDaHJvbWl1bTo6UVVFUllfUkVTVUxUX0FWQUlMQUJM RV9FWFQpCisgICAgICAgICAgICAqcGFyYW1zID0gMDsKKyAgICB9CisKK3ByaXZhdGU6CisgICAg ZXhwbGljaXQgQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhFbmRRdWVyeUNh dXNpbmdMb3N0Q29udGV4dChBdHRyaWJ1dGVzIGF0dHJzKQorICAgICAgICA6IENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0QoYXR0cnMpCisgICAgICAgICwgbV9jb250ZXh0TG9zdENh bGxiYWNrKDApCisgICAgICAgICwgbV9pc0NvbnRleHRMb3N0KGZhbHNlKSB7IH0KKworICAgIFdl YkdyYXBoaWNzQ29udGV4dExvc3RDYWxsYmFjayogbV9jb250ZXh0TG9zdENhbGxiYWNrOworICAg IGJvb2wgbV9pc0NvbnRleHRMb3N0OworfTsKKworY2xhc3MgQ0NMYXllclRyZWVIb3N0VGVzdExv c3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RU ZXN0IHsKK3B1YmxpYzoKKyAgICBDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRXaGlsZVVw ZGF0aW5nUmVzb3VyY2VzKCkKKyAgICAgICAgOiBtX3BhcmVudChDb250ZW50TGF5ZXJDaHJvbWl1 bVdpdGhVcGRhdGVUcmFja2luZzo6Y3JlYXRlKCZtX2RlbGVnYXRlKSkKKyAgICAgICAgLCBtX251 bUNoaWxkcmVuKDUwKQorICAgIHsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX251bUNo aWxkcmVuOyBpKyspCisgICAgICAgICAgICBtX2NoaWxkcmVuLmFwcGVuZChDb250ZW50TGF5ZXJD aHJvbWl1bVdpdGhVcGRhdGVUcmFja2luZzo6Y3JlYXRlKCZtX2RlbGVnYXRlKSk7CisgICAgfQor CisgICAgdmlydHVhbCBQYXNzT3duUHRyPFdlYktpdDo6V2ViQ29tcG9zaXRvck91dHB1dFN1cmZh Y2U+IGNyZWF0ZU91dHB1dFN1cmZhY2UoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIEZha2VXZWJD b21wb3NpdG9yT3V0cHV0U3VyZmFjZTo6Y3JlYXRlKENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3ND b250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OmNyZWF0ZShXZWJHcmFwaGlj c0NvbnRleHQzRDo6QXR0cmlidXRlcygpKSk7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGJl Z2luVGVzdCgpCisgICAgeworICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldFJvb3RMYXllciht X3BhcmVudCk7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0Vmlld3BvcnRTaXplKEludFNp emUobV9udW1DaGlsZHJlbiwgMSksIEludFNpemUobV9udW1DaGlsZHJlbiwgMSkpOworCisgICAg ICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGlkZW50aXR5TWF0cml4OworICAgICAgICBzZXRM YXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fcGFyZW50LmdldCgpLCAwLCBpZGVudGl0eU1hdHJp eCwgRmxvYXRQb2ludCgwLCAwKSwgRmxvYXRQb2ludCgwLCAwKSwgSW50U2l6ZShtX251bUNoaWxk cmVuLCAxKSwgdHJ1ZSk7CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9udW1DaGlsZHJl bjsgaSsrKQorICAgICAgICAgICAgc2V0TGF5ZXJQcm9wZXJ0aWVzRm9yVGVzdGluZyhtX2NoaWxk cmVuW2ldLmdldCgpLCBtX3BhcmVudC5nZXQoKSwgaWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQo MCwgMCksIEZsb2F0UG9pbnQoaSwgMCksIEludFNpemUoMSwgMSksIGZhbHNlKTsKKworICAgICAg ICBwb3N0U2V0TmVlZHNDb21taXRUb01haW5UaHJlYWQoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFs IHZvaWQgY29tbWl0Q29tcGxldGVPbkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGltcGwp CisgICAgeworICAgICAgICBlbmRUZXN0KCk7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGxh eW91dCgpCisgICAgeworICAgICAgICBtX3BhcmVudC0+c2V0TmVlZHNEaXNwbGF5KCk7CisgICAg ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9udW1DaGlsZHJlbjsgaSsrKQorICAgICAgICAgICAg bV9jaGlsZHJlbltpXS0+c2V0TmVlZHNEaXNwbGF5KCk7CisgICAgfQorCisgICAgdmlydHVhbCB2 b2lkIGFmdGVyVGVzdCgpCisgICAgeworICAgIH0KKworcHJpdmF0ZToKKyAgICBNb2NrQ29udGVu dExheWVyRGVsZWdhdGUgbV9kZWxlZ2F0ZTsKKyAgICBSZWZQdHI8Q29udGVudExheWVyQ2hyb21p dW1XaXRoVXBkYXRlVHJhY2tpbmc+IG1fcGFyZW50OworICAgIGludCBtX251bUNoaWxkcmVuOwor ICAgIFZlY3RvcjxSZWZQdHI8Q29udGVudExheWVyQ2hyb21pdW1XaXRoVXBkYXRlVHJhY2tpbmc+ ID4gbV9jaGlsZHJlbjsKK307CisKK1RFU1RfRihDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRl eHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzLCBydW5NdWx0aVRocmVhZCkKK3sKKyAgICBydW5UZXN0 KHRydWUpOworfQorCiB9IC8vIG5hbWVzcGFjZQo= 160819 2012-08-27 15:07:34 -0700 2012-08-27 18:59:52 -0700 Patch bug-94983-20120827180726.patch text/plain 8287 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2ODAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFjYWRkZGZmMzc1NDE0 YzQ2YWE1OGNhNjdkOGZiNzQ0NDM4MTEyMC4uNTU3ZWE5YWYzNGI0NzE2ZWI1OTgyZWYxNmNjM2M0 MTEyYWFmOTI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTI3ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBT dG9wIHRleHR1cmUgdXBkYXRlcyB3aGVuIGNvbnRleHQgaXMgbG9zdC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJlZSBtX2N1cnJlbnRUZXh0dXJlVXBk YXRlQ29udHJvbGxlciB3aGVuCisgICAgICAgIENDVGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0 T25JbXBsVGhyZWFkKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFVuaXQgdGVzdDogQ0NMYXllclRy ZWVIb3N0VGVzdExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcy5ydW5NdWx0aVRocmVh ZAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4dE9u SW1wbFRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpzY2hlZHVsZWRB Y3Rpb25Db21taXQpOgorCiAyMDEyLTA4LTI0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDbGVhbiB1cCBkZXBlbmRlbmNpZXMgb2Yg V2ViU2Nyb2xsYmFyIGFuZCBXZWJTY3JvbGxiYXJMYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwppbmRleCAzODhiMjIyMDljOTQ5NjUxZmNhMGNhOGE2NzQ5YjhkZWU3YmQzODllLi44MmJmZDM0 ZmUxYWI3ZDZlYjY1NWQ2M2Y3NzA1OTJjOWIyNGIxNmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA4LTI3ICBEYXZpZCBSZXZlbWFuICA8cmV2ZW1h bkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBTdG9wIHRleHR1cmUgdXBkYXRl cyB3aGVuIGNvbnRleHQgaXMgbG9zdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk0OTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcDoKKyAgICAgICAg KENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9z dENvbnRleHQpOgorICAgICAgICAoQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdp dGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6Y3JlYXRlKToKKyAgICAgICAgKENvbXBvc2l0 b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6 OnNldENvbnRleHRMb3N0Q2FsbGJhY2spOgorICAgICAgICAoQ29tcG9zaXRvckZha2VXZWJHcmFw aGljc0NvbnRleHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6aXNDb250ZXh0TG9z dCk6CisgICAgICAgIChDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1 ZXJ5Q2F1c2luZ0xvc3RDb250ZXh0OjpiZWdpblF1ZXJ5RVhUKToKKyAgICAgICAgKENvbXBvc2l0 b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6 OmVuZFF1ZXJ5RVhUKToKKyAgICAgICAgKENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0 M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQ6OmdldFF1ZXJ5T2JqZWN0dWl2RVhUKToK KyAgICAgICAgKENvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlD YXVzaW5nTG9zdENvbnRleHQ6OkNvbXBvc2l0b3JGYWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRo RW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVz dExvc3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlcyk6CisgICAgICAgIChDQ0xheWVyVHJl ZUhvc3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzOjpDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzKToKKyAgICAgICAgKENDTGF5 ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmNyZWF0ZU91 dHB1dFN1cmZhY2UpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVzdExvc3RDb250ZXh0V2hp bGVVcGRhdGluZ1Jlc291cmNlczo6YmVnaW5UZXN0KToKKyAgICAgICAgKENDTGF5ZXJUcmVlSG9z dFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdSZXNvdXJjZXM6OmNvbW1pdENvbXBsZXRlT25D Q1RocmVhZCk6CisgICAgICAgIChDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRleHRXaGlsZVVw ZGF0aW5nUmVzb3VyY2VzOjpsYXlvdXQpOgorICAgICAgICAoQ0NMYXllclRyZWVIb3N0VGVzdExv c3RDb250ZXh0V2hpbGVVcGRhdGluZ1Jlc291cmNlczo6YWZ0ZXJUZXN0KToKKyAgICAgICAgKFRF U1RfRik6CisKIDIwMTItMDgtMjQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIENsZWFuIHVwIGRlcGVuZGVuY2llcyBvZiBXZWJTY3Jv bGxiYXIgYW5kIFdlYlNjcm9sbGJhckxheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHkuY3BwCmlu ZGV4IDU4M2M3MGM2MDQzNmY1MzdlZTg3OGIyZDc0MGRhZjI2YzkyOTc0NTEuLmY4OTY5MjViYTJk NTEzMTI4YzQxMDA0ZmFlYzQyODZmNTZkNWE2MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGhyZWFkUHJveHku Y3BwCkBAIC0zMTQsNiArMzE0LDcgQEAgdm9pZCBDQ1RocmVhZFByb3h5OjpkaWRMb3NlQ29udGV4 dE9uSW1wbFRocmVhZCgpCiB7CiAgICAgQVNTRVJUKGlzSW1wbFRocmVhZCgpKTsKICAgICBUUkFD RV9FVkVOVDAoImNjIiwgIkNDVGhyZWFkUHJveHk6OmRpZExvc2VDb250ZXh0T25JbXBsVGhyZWFk Iik7CisgICAgbV9jdXJyZW50VGV4dHVyZVVwZGF0ZUNvbnRyb2xsZXJPbkltcGxUaHJlYWQuY2xl YXIoKTsKICAgICBtX3NjaGVkdWxlck9uSW1wbFRocmVhZC0+ZGlkTG9zZUNvbnRleHQoKTsKIH0K IApAQCAtNjE5LDggKzYyMCw3IEBAIHZvaWQgQ0NUaHJlYWRQcm94eTo6c2NoZWR1bGVkQWN0aW9u Q29tbWl0KCkKIHsKICAgICBUUkFDRV9FVkVOVDAoImNjIiwgIkNDVGhyZWFkUHJveHk6OnNjaGVk dWxlZEFjdGlvbkNvbW1pdCIpOwogICAgIEFTU0VSVChpc0ltcGxUaHJlYWQoKSk7Ci0gICAgQVNT RVJUKG1fY3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBsVGhyZWFkKTsKLSAgICBB U1NFUlQoIW1fY3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBsVGhyZWFkLT5oYXNN b3JlVXBkYXRlcygpKTsKKyAgICBBU1NFUlQoIWhhc01vcmVSZXNvdXJjZVVwZGF0ZXMoKSk7CiAg ICAgQVNTRVJUKG1fY29tbWl0Q29tcGxldGlvbkV2ZW50T25JbXBsVGhyZWFkKTsKIAogICAgIG1f Y3VycmVudFRleHR1cmVVcGRhdGVDb250cm9sbGVyT25JbXBsVGhyZWFkLmNsZWFyKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNw cAppbmRleCA3MzE4ZjEzNmNjYjA2OGI1OTdhY2VlNTg0ZTg2Zjc1ZmE3YjQ2YzgzLi5kZjJmOGRm N2M4ZWZlYmY0Y2UyOTU5ZmFlNjBkNmEwZjQyYTE4NmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKQEAgLTM1LDYgKzM1 LDggQEAKICNpbmNsdWRlICJDQ1RocmVhZGVkVGVzdC5oIgogI2luY2x1ZGUgIkNDVGltaW5nRnVu Y3Rpb24uaCIKICNpbmNsdWRlICJDb250ZW50TGF5ZXJDaHJvbWl1bS5oIgorI2luY2x1ZGUgIkV4 dGVuc2lvbnMzRENocm9taXVtLmgiCisjaW5jbHVkZSAiRmFrZVdlYkNvbXBvc2l0b3JPdXRwdXRT dXJmYWNlLmgiCiAjaW5jbHVkZSA8Z21vY2svZ21vY2suaD4KICNpbmNsdWRlIDxndGVzdC9ndGVz dC5oPgogI2luY2x1ZGUgPHB1YmxpYy9QbGF0Zm9ybS5oPgpAQCAtMjY4OCw0ICsyNjkwLDk2IEBA IHByaXZhdGU6CiAKIFNJTkdMRV9BTkRfTVVMVElfVEhSRUFEX1RFU1RfRihDQ0xheWVyVHJlZUhv c3RUZXN0TG9zdENvbnRleHRBZnRlckV2aWN0VGV4dHVyZXMpCiAKK2NsYXNzIENvbXBvc2l0b3JG YWtlV2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoRW5kUXVlcnlDYXVzaW5nTG9zdENvbnRleHQgOiBw dWJsaWMgV2ViS2l0OjpDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEIHsKK3B1Ymxp YzoKKyAgICBzdGF0aWMgUGFzc093blB0cjxDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4 dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xvc3RDb250ZXh0PiBjcmVhdGUoQXR0cmlidXRlcyBhdHRy cykKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgQ29tcG9zaXRvckZha2VXZWJH cmFwaGljc0NvbnRleHQzRFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dChhdHRycykpOwor ICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZXh0TG9zdENhbGxiYWNrKFdlYkdyYXBo aWNzQ29udGV4dExvc3RDYWxsYmFjayogY2FsbGJhY2spIHsgbV9jb250ZXh0TG9zdENhbGxiYWNr ID0gY2FsbGJhY2s7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNDb250ZXh0TG9zdCgpIHsgcmV0dXJu IG1faXNDb250ZXh0TG9zdDsgfQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luUXVlcnlFWFQoR0Mz RGVudW0sIFdlYkdMSWQpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBlbmRRdWVyeUVYVChHQzNEZW51 bSkKKyAgICB7CisgICAgICAgIC8vIExvc2UgY29udGV4dC4KKyAgICAgICAgaWYgKCFtX2lzQ29u dGV4dExvc3QpIHsKKyAgICAgICAgICAgIG1fY29udGV4dExvc3RDYWxsYmFjay0+b25Db250ZXh0 TG9zdCgpOworICAgICAgICAgICAgbV9pc0NvbnRleHRMb3N0ID0gdHJ1ZTsKKyAgICAgICAgfQor ICAgIH0KKyAgICB2aXJ0dWFsIHZvaWQgZ2V0UXVlcnlPYmplY3R1aXZFWFQoV2ViR0xJZCwgR0Mz RGVudW0gcG5hbWUsIEdDM0R1aW50KiBwYXJhbXMpCisgICAgeworICAgICAgICAvLyBDb250ZXh0 IGlzIGxvc3QuIFJlc3VsdCB3aWxsIG5ldmVyIGJlIGF2YWlsYWJsZS4KKyAgICAgICAgaWYgKHBu YW1lID09IEV4dGVuc2lvbnMzRENocm9taXVtOjpRVUVSWV9SRVNVTFRfQVZBSUxBQkxFX0VYVCkK KyAgICAgICAgICAgICpwYXJhbXMgPSAwOworICAgIH0KKworcHJpdmF0ZToKKyAgICBleHBsaWNp dCBDb21wb3NpdG9yRmFrZVdlYkdyYXBoaWNzQ29udGV4dDNEV2l0aEVuZFF1ZXJ5Q2F1c2luZ0xv c3RDb250ZXh0KEF0dHJpYnV0ZXMgYXR0cnMpCisgICAgICAgIDogQ29tcG9zaXRvckZha2VXZWJH cmFwaGljc0NvbnRleHQzRChhdHRycykKKyAgICAgICAgLCBtX2NvbnRleHRMb3N0Q2FsbGJhY2so MCkKKyAgICAgICAgLCBtX2lzQ29udGV4dExvc3QoZmFsc2UpIHsgfQorCisgICAgV2ViR3JhcGhp Y3NDb250ZXh0TG9zdENhbGxiYWNrKiBtX2NvbnRleHRMb3N0Q2FsbGJhY2s7CisgICAgYm9vbCBt X2lzQ29udGV4dExvc3Q7Cit9OworCitjbGFzcyBDQ0xheWVyVHJlZUhvc3RUZXN0TG9zdENvbnRl eHRXaGlsZVVwZGF0aW5nUmVzb3VyY2VzIDogcHVibGljIENDTGF5ZXJUcmVlSG9zdFRlc3Qgewor cHVibGljOgorICAgIENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxlVXBkYXRpbmdS ZXNvdXJjZXMoKQorICAgICAgICA6IG1fcGFyZW50KENvbnRlbnRMYXllckNocm9taXVtV2l0aFVw ZGF0ZVRyYWNraW5nOjpjcmVhdGUoJm1fZGVsZWdhdGUpKQorICAgICAgICAsIG1fbnVtQ2hpbGRy ZW4oNTApCisgICAgeworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG1fbnVtQ2hpbGRyZW47 IGkrKykKKyAgICAgICAgICAgIG1fY2hpbGRyZW4uYXBwZW5kKENvbnRlbnRMYXllckNocm9taXVt V2l0aFVwZGF0ZVRyYWNraW5nOjpjcmVhdGUoJm1fZGVsZWdhdGUpKTsKKyAgICB9CisKKyAgICB2 aXJ0dWFsIFBhc3NPd25QdHI8V2ViS2l0OjpXZWJDb21wb3NpdG9yT3V0cHV0U3VyZmFjZT4gY3Jl YXRlT3V0cHV0U3VyZmFjZSgpCisgICAgeworICAgICAgICByZXR1cm4gRmFrZVdlYkNvbXBvc2l0 b3JPdXRwdXRTdXJmYWNlOjpjcmVhdGUoQ29tcG9zaXRvckZha2VXZWJHcmFwaGljc0NvbnRleHQz RFdpdGhFbmRRdWVyeUNhdXNpbmdMb3N0Q29udGV4dDo6Y3JlYXRlKFdlYkdyYXBoaWNzQ29udGV4 dDNEOjpBdHRyaWJ1dGVzKCkpKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYmVnaW5UZXN0 KCkKKyAgICB7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0Um9vdExheWVyKG1fcGFyZW50 KTsKKyAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRWaWV3cG9ydFNpemUoSW50U2l6ZShtX251 bUNoaWxkcmVuLCAxKSwgSW50U2l6ZShtX251bUNoaWxkcmVuLCAxKSk7CisKKyAgICAgICAgV2Vi VHJhbnNmb3JtYXRpb25NYXRyaXggaWRlbnRpdHlNYXRyaXg7CisgICAgICAgIHNldExheWVyUHJv cGVydGllc0ZvclRlc3RpbmcobV9wYXJlbnQuZ2V0KCksIDAsIGlkZW50aXR5TWF0cml4LCBGbG9h dFBvaW50KDAsIDApLCBGbG9hdFBvaW50KDAsIDApLCBJbnRTaXplKG1fbnVtQ2hpbGRyZW4sIDEp LCB0cnVlKTsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX251bUNoaWxkcmVuOyBpKysp CisgICAgICAgICAgICBzZXRMYXllclByb3BlcnRpZXNGb3JUZXN0aW5nKG1fY2hpbGRyZW5baV0u Z2V0KCksIG1fcGFyZW50LmdldCgpLCBpZGVudGl0eU1hdHJpeCwgRmxvYXRQb2ludCgwLCAwKSwg RmxvYXRQb2ludChpLCAwKSwgSW50U2l6ZSgxLCAxKSwgZmFsc2UpOworCisgICAgICAgIHBvc3RT ZXROZWVkc0NvbW1pdFRvTWFpblRocmVhZCgpOworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBj b21taXRDb21wbGV0ZU9uQ0NUaHJlYWQoQ0NMYXllclRyZWVIb3N0SW1wbCogaW1wbCkKKyAgICB7 CisgICAgICAgIGVuZFRlc3QoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCkK KyAgICB7CisgICAgICAgIG1fcGFyZW50LT5zZXROZWVkc0Rpc3BsYXkoKTsKKyAgICAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBtX251bUNoaWxkcmVuOyBpKyspCisgICAgICAgICAgICBtX2NoaWxk cmVuW2ldLT5zZXROZWVkc0Rpc3BsYXkoKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYWZ0 ZXJUZXN0KCkKKyAgICB7CisgICAgfQorCitwcml2YXRlOgorICAgIE1vY2tDb250ZW50TGF5ZXJE ZWxlZ2F0ZSBtX2RlbGVnYXRlOworICAgIFJlZlB0cjxDb250ZW50TGF5ZXJDaHJvbWl1bVdpdGhV cGRhdGVUcmFja2luZz4gbV9wYXJlbnQ7CisgICAgaW50IG1fbnVtQ2hpbGRyZW47CisgICAgVmVj dG9yPFJlZlB0cjxDb250ZW50TGF5ZXJDaHJvbWl1bVdpdGhVcGRhdGVUcmFja2luZz4gPiBtX2No aWxkcmVuOworfTsKKworVEVTVF9GKENDTGF5ZXJUcmVlSG9zdFRlc3RMb3N0Q29udGV4dFdoaWxl VXBkYXRpbmdSZXNvdXJjZXMsIHJ1bk11bHRpVGhyZWFkKQoreworICAgIHJ1blRlc3QodHJ1ZSk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlCg==