114743 2013-04-17 07:50:38 -0700 BasicShapeFunctions should use RenderStyle instead of StyleResolver 2013-04-17 16:27:46 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 krit webkit-unassigned commit-queue esprehn+autocc macpherson menard oldest_to_newest 877172 0 krit 2013-04-17 07:50:38 -0700 BasicShapeFunctions should use RenderStyle instead of StyleResolver 877175 1 198510 krit 2013-04-17 07:57:43 -0700 Created attachment 198510 Patch 877176 2 commit-queue 2013-04-17 07:58:47 -0700 Attachment 198510 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/css/BasicShapeFunctions.cpp', u'Source/WebCore/css/BasicShapeFunctions.h', u'Source/WebCore/css/DeprecatedStyleBuilder.cpp']" exit_code: 1 Source/WebCore/css/BasicShapeFunctions.h:43: The parameter name "style" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 877183 3 198510 koivisto 2013-04-17 08:15:20 -0700 Comment on attachment 198510 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=198510&action=review >> Source/WebCore/css/BasicShapeFunctions.h:43 >> +PassRefPtr<BasicShape> basicShapeForValue(RenderStyle* style, RenderStyle* rootElementStyle, const CSSBasicShape*); > > The parameter name "style" adds no information, so it should be removed. [readability/parameter_name] [5] These should be const. I would put the main input (the shape) first. 877513 4 198616 krit 2013-04-17 15:07:48 -0700 Created attachment 198616 Patch fo landing 877529 5 198616 commit-queue 2013-04-17 15:36:29 -0700 Comment on attachment 198616 Patch fo landing Rejecting attachment 198616 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 198616, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: differ, using rebase: :040000 040000 acb0cf64aa1f0ec42b9dcae7d83d4f7e7d338ed1 21f93620f0f7e280e26e43b9489291f5ec959909 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.appspot.com/results/61388 877562 6 198616 commit-queue 2013-04-17 16:27:44 -0700 Comment on attachment 198616 Patch fo landing Clearing flags on attachment: 198616 Committed r148645: <http://trac.webkit.org/changeset/148645> 877563 7 commit-queue 2013-04-17 16:27:46 -0700 All reviewed patches have been landed. Closing bug. 198510 2013-04-17 07:57:43 -0700 2013-04-17 15:07:48 -0700 Patch basicShapeRefactor.patch text/plain 8919 krit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMmRhNjgwLi5hOGU0ZWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDQtMTcgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KKworICAgICAg ICBCYXNpY1NoYXBlRnVuY3Rpb25zIHNob3VsZCB1c2UgUmVuZGVyU3R5bGUgaW5zdGVhZCBvZiBT dHlsZVJlc29sdmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTQ3NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBCYXNpY1NoYXBlRnVuY3Rpb25zIGRvZXMgaW5jbHVkZSBSZW5kZXJTdHlsZSBpbnN0ZWFk IG9mIFN0eWxlUmVzb2x2ZXIgbm93LgorICAgICAgICBUaGlzIGlzIGEgc2ltcGxlIHJlZmFjdG9y aW5nIHBhdGNoLCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0 aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0VG9MZW5ndGgpOiBVc2Ugc3R5bGUg YW5kIHJvb3RFbGVtZW50U3R5bGUgZGlyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpiYXNpY1No YXBlRm9yVmFsdWUpOiBEaXR0by4KKyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5o OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXBQYXRoOjphcHBseVZh bHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlFeGNsdXNpb25TaGFwZTo6YXBw bHlWYWx1ZSk6CisKIDIwMTMtMDQtMTYgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXg7IGFkZCBuZXcgSlNBdWRpb0J1ZmZlci5j cHAgZmlsZSB0byBtb3JlIGJ1aWxkIHN5c3RlbXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNT aGFwZUZ1bmN0aW9ucy5jcHAKaW5kZXggM2E4Zjc5NS4uMTA3NGVhNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcApAQCAtMzQsNyArMzQsNyBAQAogI2luY2x1 ZGUgIkNTU0Jhc2ljU2hhcGVzLmgiCiAjaW5jbHVkZSAiQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5n cy5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlUG9vbC5oIgotI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIu aCIKKyNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAg LTEwMCwxMiArMTAwLDEyIEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yQmFzaWNTaGFw ZShjb25zdCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlKQogICAgIHJldHVybiBjc3NWYWx1ZVBvb2wo KS5jcmVhdGVWYWx1ZTxQYXNzUmVmUHRyPENTU0Jhc2ljU2hhcGU+ID4oYmFzaWNTaGFwZVZhbHVl LnJlbGVhc2UoKSk7CiB9CiAKLXN0YXRpYyBMZW5ndGggY29udmVydFRvTGVuZ3RoKGNvbnN0IFN0 eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ByaW1pdGl2ZVZhbHVlKiB2YWx1ZSkKK3N0 YXRpYyBMZW5ndGggY29udmVydFRvTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5 bGUqIHJvb3RFbGVtZW50U3R5bGUsIENTU1ByaW1pdGl2ZVZhbHVlKiB2YWx1ZSkKIHsKLSAgICBy ZXR1cm4gdmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEludGVnZXJDb252ZXJzaW9uIHwgRml4 ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50Q29udmVyc2lvbiB8IFZpZXdwb3J0UGVyY2VudGFn ZUNvbnZlcnNpb24+KHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIHN0eWxlUmVzb2x2ZXItPnJvb3RF bGVtZW50U3R5bGUoKSwgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKTsK KyAgICByZXR1cm4gdmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEludGVnZXJDb252ZXJzaW9u IHwgRml4ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50Q29udmVyc2lvbiB8IFZpZXdwb3J0UGVy Y2VudGFnZUNvbnZlcnNpb24+KHN0eWxlLCByb290RWxlbWVudFN0eWxlLCBzdHlsZS0+ZWZmZWN0 aXZlWm9vbSgpKTsKIH0KIAotUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9yVmFs dWUoY29uc3QgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwgY29uc3QgQ1NTQmFzaWNTaGFw ZSogYmFzaWNTaGFwZVZhbHVlKQorUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9y VmFsdWUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdEVsZW1lbnRTdHlsZSwg Y29uc3QgQ1NTQmFzaWNTaGFwZSogYmFzaWNTaGFwZVZhbHVlKQogewogICAgIFJlZlB0cjxCYXNp Y1NoYXBlPiBiYXNpY1NoYXBlOwogCkBAIC0xMTQsMTQgKzExNCwxNCBAQCBQYXNzUmVmUHRyPEJh c2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJl c29sdmVyLCBjbwogICAgICAgICBjb25zdCBDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlKiByZWN0VmFs dWUgPSBzdGF0aWNfY2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlICo+KGJhc2ljU2hh cGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlUmVjdGFuZ2xlPiByZWN0ID0gQmFz aWNTaGFwZVJlY3RhbmdsZTo6Y3JlYXRlKCk7CiAKLSAgICAgICAgcmVjdC0+c2V0WChjb252ZXJ0 VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgcmVjdFZhbHVlLT54KCkpKTsKLSAgICAgICAgcmVjdC0+ c2V0WShjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgcmVjdFZhbHVlLT55KCkpKTsKLSAg ICAgICAgcmVjdC0+c2V0V2lkdGgoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIHJlY3RW YWx1ZS0+d2lkdGgoKSkpOwotICAgICAgICByZWN0LT5zZXRIZWlnaHQoY29udmVydFRvTGVuZ3Ro KHN0eWxlUmVzb2x2ZXIsIHJlY3RWYWx1ZS0+aGVpZ2h0KCkpKTsKKyAgICAgICAgcmVjdC0+c2V0 WChjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RFbGVtZW50U3R5bGUsIHJlY3RWYWx1ZS0+eCgp KSk7CisgICAgICAgIHJlY3QtPnNldFkoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVu dFN0eWxlLCByZWN0VmFsdWUtPnkoKSkpOworICAgICAgICByZWN0LT5zZXRXaWR0aChjb252ZXJ0 VG9MZW5ndGgoc3R5bGUsIHJvb3RFbGVtZW50U3R5bGUsIHJlY3RWYWx1ZS0+d2lkdGgoKSkpOwor ICAgICAgICByZWN0LT5zZXRIZWlnaHQoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVu dFN0eWxlLCByZWN0VmFsdWUtPmhlaWdodCgpKSk7CiAgICAgICAgIGlmIChyZWN0VmFsdWUtPnJh ZGl1c1goKSkgewotICAgICAgICAgICAgcmVjdC0+c2V0Q29ybmVyUmFkaXVzWChjb252ZXJ0VG9M ZW5ndGgoc3R5bGVSZXNvbHZlciwgcmVjdFZhbHVlLT5yYWRpdXNYKCkpKTsKKyAgICAgICAgICAg IHJlY3QtPnNldENvcm5lclJhZGl1c1goY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVu dFN0eWxlLCByZWN0VmFsdWUtPnJhZGl1c1goKSkpOwogICAgICAgICAgICAgaWYgKHJlY3RWYWx1 ZS0+cmFkaXVzWSgpKQotICAgICAgICAgICAgICAgIHJlY3QtPnNldENvcm5lclJhZGl1c1koY29u dmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIHJlY3RWYWx1ZS0+cmFkaXVzWSgpKSk7CisgICAg ICAgICAgICAgICAgcmVjdC0+c2V0Q29ybmVyUmFkaXVzWShjb252ZXJ0VG9MZW5ndGgoc3R5bGUs IHJvb3RFbGVtZW50U3R5bGUsIHJlY3RWYWx1ZS0+cmFkaXVzWSgpKSk7CiAgICAgICAgIH0KICAg ICAgICAgYmFzaWNTaGFwZSA9IHJlY3QucmVsZWFzZSgpOwogICAgICAgICBicmVhazsKQEAgLTEz MCw5ICsxMzAsOSBAQCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShj b25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBjbwogICAgICAgICBjb25zdCBDU1NC YXNpY1NoYXBlQ2lyY2xlKiBjaXJjbGVWYWx1ZSA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2lj U2hhcGVDaXJjbGUgKj4oYmFzaWNTaGFwZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hh cGVDaXJjbGU+IGNpcmNsZSA9IEJhc2ljU2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCi0gICAgICAg IGNpcmNsZS0+c2V0Q2VudGVyWChjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgY2lyY2xl VmFsdWUtPmNlbnRlclgoKSkpOwotICAgICAgICBjaXJjbGUtPnNldENlbnRlclkoY29udmVydFRv TGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGNpcmNsZVZhbHVlLT5jZW50ZXJZKCkpKTsKLSAgICAgICAg Y2lyY2xlLT5zZXRSYWRpdXMoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGNpcmNsZVZh bHVlLT5yYWRpdXMoKSkpOworICAgICAgICBjaXJjbGUtPnNldENlbnRlclgoY29udmVydFRvTGVu Z3RoKHN0eWxlLCByb290RWxlbWVudFN0eWxlLCBjaXJjbGVWYWx1ZS0+Y2VudGVyWCgpKSk7Cisg ICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWShjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RFbGVt ZW50U3R5bGUsIGNpcmNsZVZhbHVlLT5jZW50ZXJZKCkpKTsKKyAgICAgICAgY2lyY2xlLT5zZXRS YWRpdXMoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVudFN0eWxlLCBjaXJjbGVWYWx1 ZS0+cmFkaXVzKCkpKTsKIAogICAgICAgICBiYXNpY1NoYXBlID0gY2lyY2xlLnJlbGVhc2UoKTsK ICAgICAgICAgYnJlYWs7CkBAIC0xNDEsMTAgKzE0MSwxMCBAQCBQYXNzUmVmUHRyPEJhc2ljU2hh cGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVy LCBjbwogICAgICAgICBjb25zdCBDU1NCYXNpY1NoYXBlRWxsaXBzZSogZWxsaXBzZVZhbHVlID0g c3RhdGljX2Nhc3Q8Y29uc3QgQ1NTQmFzaWNTaGFwZUVsbGlwc2UgKj4oYmFzaWNTaGFwZVZhbHVl KTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVFbGxpcHNlPiBlbGxpcHNlID0gQmFzaWNTaGFw ZUVsbGlwc2U6OmNyZWF0ZSgpOwogCi0gICAgICAgIGVsbGlwc2UtPnNldENlbnRlclgoY29udmVy dFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGVsbGlwc2VWYWx1ZS0+Y2VudGVyWCgpKSk7Ci0gICAg ICAgIGVsbGlwc2UtPnNldENlbnRlclkoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGVs bGlwc2VWYWx1ZS0+Y2VudGVyWSgpKSk7Ci0gICAgICAgIGVsbGlwc2UtPnNldFJhZGl1c1goY29u dmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGVsbGlwc2VWYWx1ZS0+cmFkaXVzWCgpKSk7Ci0g ICAgICAgIGVsbGlwc2UtPnNldFJhZGl1c1koY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIs IGVsbGlwc2VWYWx1ZS0+cmFkaXVzWSgpKSk7CisgICAgICAgIGVsbGlwc2UtPnNldENlbnRlclgo Y29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVudFN0eWxlLCBlbGxpcHNlVmFsdWUtPmNl bnRlclgoKSkpOworICAgICAgICBlbGxpcHNlLT5zZXRDZW50ZXJZKGNvbnZlcnRUb0xlbmd0aChz dHlsZSwgcm9vdEVsZW1lbnRTdHlsZSwgZWxsaXBzZVZhbHVlLT5jZW50ZXJZKCkpKTsKKyAgICAg ICAgZWxsaXBzZS0+c2V0UmFkaXVzWChjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RFbGVtZW50 U3R5bGUsIGVsbGlwc2VWYWx1ZS0+cmFkaXVzWCgpKSk7CisgICAgICAgIGVsbGlwc2UtPnNldFJh ZGl1c1koY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290RWxlbWVudFN0eWxlLCBlbGxpcHNlVmFs dWUtPnJhZGl1c1koKSkpOwogCiAgICAgICAgIGJhc2ljU2hhcGUgPSBlbGxpcHNlLnJlbGVhc2Uo KTsKICAgICAgICAgYnJlYWs7CkBAIC0xNTYsNyArMTU2LDcgQEAgUGFzc1JlZlB0cjxCYXNpY1No YXBlPiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZl ciwgY28KICAgICAgICAgcG9seWdvbi0+c2V0V2luZFJ1bGUocG9seWdvblZhbHVlLT53aW5kUnVs ZSgpKTsKICAgICAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gPiYg dmFsdWVzID0gcG9seWdvblZhbHVlLT52YWx1ZXMoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IHZhbHVlcy5zaXplKCk7IGkgKz0gMikKLSAgICAgICAgICAgIHBvbHlnb24tPmFw cGVuZFBvaW50KGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCB2YWx1ZXMuYXQoaSkuZ2V0 KCkpLCBjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgdmFsdWVzLmF0KGkgKyAxKS5nZXQo KSkpOworICAgICAgICAgICAgcG9seWdvbi0+YXBwZW5kUG9pbnQoY29udmVydFRvTGVuZ3RoKHN0 eWxlLCByb290RWxlbWVudFN0eWxlLCB2YWx1ZXMuYXQoaSkuZ2V0KCkpLCBjb252ZXJ0VG9MZW5n dGgoc3R5bGUsIHJvb3RFbGVtZW50U3R5bGUsIHZhbHVlcy5hdChpICsgMSkuZ2V0KCkpKTsKIAog ICAgICAgICBiYXNpY1NoYXBlID0gcG9seWdvbi5yZWxlYXNlKCk7CiAgICAgICAgIGJyZWFrOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuaCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmgKaW5kZXggZDM2MDdlOS4uYjcy NjlhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5oCkBAIC0zNywx MCArMzcsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQmFzaWNTaGFwZTsKIGNsYXNz IENTU0Jhc2ljU2hhcGU7CiBjbGFzcyBDU1NWYWx1ZTsKLWNsYXNzIFN0eWxlUmVzb2x2ZXI7Citj bGFzcyBSZW5kZXJTdHlsZTsKIAogUGFzc1JlZlB0cjxDU1NWYWx1ZT4gdmFsdWVGb3JCYXNpY1No YXBlKGNvbnN0IEJhc2ljU2hhcGUqKTsKLVBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFw ZUZvclZhbHVlKGNvbnN0IFN0eWxlUmVzb2x2ZXIqLCBjb25zdCBDU1NCYXNpY1NoYXBlKik7CitQ YXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShSZW5kZXJTdHlsZSogc3R5 bGUsIFJlbmRlclN0eWxlKiByb290RWxlbWVudFN0eWxlLCBjb25zdCBDU1NCYXNpY1NoYXBlKik7 CiAKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRT dHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIuY3BwCmluZGV4IGZiNjliYzUuLjI4MDc2N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv RGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTE5MjYsNyArMTkyNiw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5v bmUpCiAgICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgMCk7 CiAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNTaGFwZSgpKSB7Ci0gICAg ICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgU2hhcGVDbGlwUGF0 aE9wZXJhdGlvbjo6Y3JlYXRlKGJhc2ljU2hhcGVGb3JWYWx1ZShzdHlsZVJlc29sdmVyLCBwcmlt aXRpdmVWYWx1ZS0+Z2V0U2hhcGVWYWx1ZSgpKSkpOworICAgICAgICAgICAgICAgIHNldFZhbHVl KHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlQ2xpcFBhdGhPcGVyYXRpb246OmNyZWF0ZShi YXNpY1NoYXBlRm9yVmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgc3R5bGVSZXNvbHZlci0+ cm9vdEVsZW1lbnRTdHlsZSgpLCBwcmltaXRpdmVWYWx1ZS0+Z2V0U2hhcGVWYWx1ZSgpKSkpOwog ICAgICAgICAgICAgfQogI2lmIEVOQUJMRShTVkcpCiAgICAgICAgICAgICBlbHNlIGlmIChwcmlt aXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfVVJJ KSB7CkBAIC0xOTYwLDcgKzE5NjAsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBlbHNlIGlmIChw cmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU91dHNpZGVTaGFwZSkKICAgICAg ICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBFeGNsdXNpb25TaGFw ZVZhbHVlOjpjcmVhdGVPdXRzaWRlVmFsdWUoKSk7CiAgICAgICAgICAgICBlbHNlIGlmIChwcmlt aXRpdmVWYWx1ZS0+aXNTaGFwZSgpKSB7Ci0gICAgICAgICAgICAgICAgUmVmUHRyPEV4Y2x1c2lv blNoYXBlVmFsdWU+IHNoYXBlID0gRXhjbHVzaW9uU2hhcGVWYWx1ZTo6Y3JlYXRlU2hhcGVWYWx1 ZShiYXNpY1NoYXBlRm9yVmFsdWUoc3R5bGVSZXNvbHZlciwgcHJpbWl0aXZlVmFsdWUtPmdldFNo YXBlVmFsdWUoKSkpOworICAgICAgICAgICAgICAgIFJlZlB0cjxFeGNsdXNpb25TaGFwZVZhbHVl PiBzaGFwZSA9IEV4Y2x1c2lvblNoYXBlVmFsdWU6OmNyZWF0ZVNoYXBlVmFsdWUoYmFzaWNTaGFw ZUZvclZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIHN0eWxlUmVzb2x2ZXItPnJvb3RFbGVt ZW50U3R5bGUoKSwgcHJpbWl0aXZlVmFsdWUtPmdldFNoYXBlVmFsdWUoKSkpOwogICAgICAgICAg ICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIHNoYXBlLnJlbGVhc2UoKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K 198616 2013-04-17 15:07:48 -0700 2013-04-17 16:27:44 -0700 Patch fo landing basicShapeRefactor.patch text/plain 8829 krit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMzViOGI0Li5hYThjNGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDQtMTcgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KKworICAgICAg ICBCYXNpY1NoYXBlRnVuY3Rpb25zIHNob3VsZCB1c2UgUmVuZGVyU3R5bGUgaW5zdGVhZCBvZiBT dHlsZVJlc29sdmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTQ3NDMKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBCYXNpY1NoYXBlRnVuY3Rpb25zIGRvZXMgaW5jbHVkZSBSZW5kZXJTdHlsZSBpbnN0ZWFk IG9mIFN0eWxlUmVzb2x2ZXIgbm93LgorICAgICAgICBUaGlzIGlzIGEgc2ltcGxlIHJlZmFjdG9y aW5nIHBhdGNoLCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0 aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0VG9MZW5ndGgpOiBVc2Ugc3R5bGUg YW5kIHJvb3RFbGVtZW50U3R5bGUgZGlyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpiYXNpY1No YXBlRm9yVmFsdWUpOiBEaXR0by4KKyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5o OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXBQYXRoOjphcHBseVZh bHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlFeGNsdXNpb25TaGFwZTo6YXBw bHlWYWx1ZSk6CisKIDIwMTMtMDQtMTcgIFNlcmdpbyBDb3JyZWlhICA8c2VyZ2lvLmNvcnJlaWFA b3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIGdlbmVyYXRlLWlu c3BlY3Rvci1wcm90b2NvbC12ZXJzaW9uIHdvcmsgd2l0aCBweXRob24zIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNv cmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCmluZGV4IDNhOGY3OTUuLjllOWEwZmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKQEAgLTM0LDcgKzM0 LDcgQEAKICNpbmNsdWRlICJDU1NCYXNpY1NoYXBlcy5oIgogI2luY2x1ZGUgIkNTU1ByaW1pdGl2 ZVZhbHVlTWFwcGluZ3MuaCIKICNpbmNsdWRlICJDU1NWYWx1ZVBvb2wuaCIKLSNpbmNsdWRlICJT dHlsZVJlc29sdmVyLmgiCisjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCkBAIC0xMDAsMTIgKzEwMCwxMiBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1 ZUZvckJhc2ljU2hhcGUoY29uc3QgQmFzaWNTaGFwZSogYmFzaWNTaGFwZSkKICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWU8UGFzc1JlZlB0cjxDU1NCYXNpY1NoYXBlPiA+KGJh c2ljU2hhcGVWYWx1ZS5yZWxlYXNlKCkpOwogfQogCi1zdGF0aWMgTGVuZ3RoIGNvbnZlcnRUb0xl bmd0aChjb25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBDU1NQcmltaXRpdmVWYWx1 ZSogdmFsdWUpCitzdGF0aWMgTGVuZ3RoIGNvbnZlcnRUb0xlbmd0aChjb25zdCBSZW5kZXJTdHls ZSogc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiByb290U3R5bGUsIENTU1ByaW1pdGl2ZVZhbHVl KiB2YWx1ZSkKIHsKLSAgICByZXR1cm4gdmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEludGVn ZXJDb252ZXJzaW9uIHwgRml4ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50Q29udmVyc2lvbiB8 IFZpZXdwb3J0UGVyY2VudGFnZUNvbnZlcnNpb24+KHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIHN0 eWxlUmVzb2x2ZXItPnJvb3RFbGVtZW50U3R5bGUoKSwgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+ ZWZmZWN0aXZlWm9vbSgpKTsKKyAgICByZXR1cm4gdmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhl ZEludGVnZXJDb252ZXJzaW9uIHwgRml4ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50Q29udmVy c2lvbiB8IFZpZXdwb3J0UGVyY2VudGFnZUNvbnZlcnNpb24+KHN0eWxlLCByb290U3R5bGUsIHN0 eWxlLT5lZmZlY3RpdmVab29tKCkpOwogfQogCi1QYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2lj U2hhcGVGb3JWYWx1ZShjb25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBjb25zdCBD U1NCYXNpY1NoYXBlKiBiYXNpY1NoYXBlVmFsdWUpCitQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJh c2ljU2hhcGVGb3JWYWx1ZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IFJlbmRlclN0 eWxlKiByb290U3R5bGUsIGNvbnN0IENTU0Jhc2ljU2hhcGUqIGJhc2ljU2hhcGVWYWx1ZSkKIHsK ICAgICBSZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZTsKIApAQCAtMTE0LDE0ICsxMTQsMTQg QEAgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgU3R5bGVS ZXNvbHZlciogc3R5bGVSZXNvbHZlciwgY28KICAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVJl Y3RhbmdsZSogcmVjdFZhbHVlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQ1NTQmFzaWNTaGFwZVJlY3Rh bmdsZSAqPihiYXNpY1NoYXBlVmFsdWUpOwogICAgICAgICBSZWZQdHI8QmFzaWNTaGFwZVJlY3Rh bmdsZT4gcmVjdCA9IEJhc2ljU2hhcGVSZWN0YW5nbGU6OmNyZWF0ZSgpOwogCi0gICAgICAgIHJl Y3QtPnNldFgoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIHJlY3RWYWx1ZS0+eCgpKSk7 Ci0gICAgICAgIHJlY3QtPnNldFkoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIHJlY3RW YWx1ZS0+eSgpKSk7Ci0gICAgICAgIHJlY3QtPnNldFdpZHRoKGNvbnZlcnRUb0xlbmd0aChzdHls ZVJlc29sdmVyLCByZWN0VmFsdWUtPndpZHRoKCkpKTsKLSAgICAgICAgcmVjdC0+c2V0SGVpZ2h0 KGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCByZWN0VmFsdWUtPmhlaWdodCgpKSk7Cisg ICAgICAgIHJlY3QtPnNldFgoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHJlY3RW YWx1ZS0+eCgpKSk7CisgICAgICAgIHJlY3QtPnNldFkoY29udmVydFRvTGVuZ3RoKHN0eWxlLCBy b290U3R5bGUsIHJlY3RWYWx1ZS0+eSgpKSk7CisgICAgICAgIHJlY3QtPnNldFdpZHRoKGNvbnZl cnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFsdWUtPndpZHRoKCkpKTsKKyAgICAg ICAgcmVjdC0+c2V0SGVpZ2h0KGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0 VmFsdWUtPmhlaWdodCgpKSk7CiAgICAgICAgIGlmIChyZWN0VmFsdWUtPnJhZGl1c1goKSkgewot ICAgICAgICAgICAgcmVjdC0+c2V0Q29ybmVyUmFkaXVzWChjb252ZXJ0VG9MZW5ndGgoc3R5bGVS ZXNvbHZlciwgcmVjdFZhbHVlLT5yYWRpdXNYKCkpKTsKKyAgICAgICAgICAgIHJlY3QtPnNldENv cm5lclJhZGl1c1goY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHJlY3RWYWx1ZS0+ cmFkaXVzWCgpKSk7CiAgICAgICAgICAgICBpZiAocmVjdFZhbHVlLT5yYWRpdXNZKCkpCi0gICAg ICAgICAgICAgICAgcmVjdC0+c2V0Q29ybmVyUmFkaXVzWShjb252ZXJ0VG9MZW5ndGgoc3R5bGVS ZXNvbHZlciwgcmVjdFZhbHVlLT5yYWRpdXNZKCkpKTsKKyAgICAgICAgICAgICAgICByZWN0LT5z ZXRDb3JuZXJSYWRpdXNZKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFs dWUtPnJhZGl1c1koKSkpOwogICAgICAgICB9CiAgICAgICAgIGJhc2ljU2hhcGUgPSByZWN0LnJl bGVhc2UoKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMzAsOSArMTMwLDkgQEAgUGFzc1JlZlB0cjxC YXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgU3R5bGVSZXNvbHZlciogc3R5bGVS ZXNvbHZlciwgY28KICAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSogY2lyY2xlVmFs dWUgPSBzdGF0aWNfY2FzdDxjb25zdCBDU1NCYXNpY1NoYXBlQ2lyY2xlICo+KGJhc2ljU2hhcGVW YWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlQ2lyY2xlPiBjaXJjbGUgPSBCYXNpY1No YXBlQ2lyY2xlOjpjcmVhdGUoKTsKIAotICAgICAgICBjaXJjbGUtPnNldENlbnRlclgoY29udmVy dFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGNpcmNsZVZhbHVlLT5jZW50ZXJYKCkpKTsKLSAgICAg ICAgY2lyY2xlLT5zZXRDZW50ZXJZKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCBjaXJj bGVWYWx1ZS0+Y2VudGVyWSgpKSk7Ci0gICAgICAgIGNpcmNsZS0+c2V0UmFkaXVzKGNvbnZlcnRU b0xlbmd0aChzdHlsZVJlc29sdmVyLCBjaXJjbGVWYWx1ZS0+cmFkaXVzKCkpKTsKKyAgICAgICAg Y2lyY2xlLT5zZXRDZW50ZXJYKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCBjaXJj bGVWYWx1ZS0+Y2VudGVyWCgpKSk7CisgICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWShjb252ZXJ0 VG9MZW5ndGgoc3R5bGUsIHJvb3RTdHlsZSwgY2lyY2xlVmFsdWUtPmNlbnRlclkoKSkpOworICAg ICAgICBjaXJjbGUtPnNldFJhZGl1cyhjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RTdHlsZSwg Y2lyY2xlVmFsdWUtPnJhZGl1cygpKSk7CiAKICAgICAgICAgYmFzaWNTaGFwZSA9IGNpcmNsZS5y ZWxlYXNlKCk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTQxLDEwICsxNDEsMTAgQEAgUGFzc1JlZlB0 cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgU3R5bGVSZXNvbHZlciogc3R5 bGVSZXNvbHZlciwgY28KICAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUVsbGlwc2UqIGVsbGlw c2VWYWx1ZSA9IHN0YXRpY19jYXN0PGNvbnN0IENTU0Jhc2ljU2hhcGVFbGxpcHNlICo+KGJhc2lj U2hhcGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlRWxsaXBzZT4gZWxsaXBzZSA9 IEJhc2ljU2hhcGVFbGxpcHNlOjpjcmVhdGUoKTsKIAotICAgICAgICBlbGxpcHNlLT5zZXRDZW50 ZXJYKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCBlbGxpcHNlVmFsdWUtPmNlbnRlclgo KSkpOwotICAgICAgICBlbGxpcHNlLT5zZXRDZW50ZXJZKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJl c29sdmVyLCBlbGxpcHNlVmFsdWUtPmNlbnRlclkoKSkpOwotICAgICAgICBlbGxpcHNlLT5zZXRS YWRpdXNYKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCBlbGxpcHNlVmFsdWUtPnJhZGl1 c1goKSkpOwotICAgICAgICBlbGxpcHNlLT5zZXRSYWRpdXNZKGNvbnZlcnRUb0xlbmd0aChzdHls ZVJlc29sdmVyLCBlbGxpcHNlVmFsdWUtPnJhZGl1c1koKSkpOworICAgICAgICBlbGxpcHNlLT5z ZXRDZW50ZXJYKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCBlbGxpcHNlVmFsdWUt PmNlbnRlclgoKSkpOworICAgICAgICBlbGxpcHNlLT5zZXRDZW50ZXJZKGNvbnZlcnRUb0xlbmd0 aChzdHlsZSwgcm9vdFN0eWxlLCBlbGxpcHNlVmFsdWUtPmNlbnRlclkoKSkpOworICAgICAgICBl bGxpcHNlLT5zZXRSYWRpdXNYKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCBlbGxp cHNlVmFsdWUtPnJhZGl1c1goKSkpOworICAgICAgICBlbGxpcHNlLT5zZXRSYWRpdXNZKGNvbnZl cnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCBlbGxpcHNlVmFsdWUtPnJhZGl1c1koKSkpOwog CiAgICAgICAgIGJhc2ljU2hhcGUgPSBlbGxpcHNlLnJlbGVhc2UoKTsKICAgICAgICAgYnJlYWs7 CkBAIC0xNTYsNyArMTU2LDcgQEAgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBlRm9y VmFsdWUoY29uc3QgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwgY28KICAgICAgICAgcG9s eWdvbi0+c2V0V2luZFJ1bGUocG9seWdvblZhbHVlLT53aW5kUnVsZSgpKTsKICAgICAgICAgY29u c3QgVmVjdG9yPFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gPiYgdmFsdWVzID0gcG9seWdvblZh bHVlLT52YWx1ZXMoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHZhbHVlcy5z aXplKCk7IGkgKz0gMikKLSAgICAgICAgICAgIHBvbHlnb24tPmFwcGVuZFBvaW50KGNvbnZlcnRU b0xlbmd0aChzdHlsZVJlc29sdmVyLCB2YWx1ZXMuYXQoaSkuZ2V0KCkpLCBjb252ZXJ0VG9MZW5n dGgoc3R5bGVSZXNvbHZlciwgdmFsdWVzLmF0KGkgKyAxKS5nZXQoKSkpOworICAgICAgICAgICAg cG9seWdvbi0+YXBwZW5kUG9pbnQoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHZh bHVlcy5hdChpKS5nZXQoKSksIGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCB2YWx1 ZXMuYXQoaSArIDEpLmdldCgpKSk7CiAKICAgICAgICAgYmFzaWNTaGFwZSA9IHBvbHlnb24ucmVs ZWFzZSgpOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9C YXNpY1NoYXBlRnVuY3Rpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0 aW9ucy5oCmluZGV4IGQzNjA3ZTkuLjliYmM3YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2lj U2hhcGVGdW5jdGlvbnMuaApAQCAtMzcsMTAgKzM3LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IGNsYXNzIEJhc2ljU2hhcGU7CiBjbGFzcyBDU1NCYXNpY1NoYXBlOwogY2xhc3MgQ1NTVmFsdWU7 Ci1jbGFzcyBTdHlsZVJlc29sdmVyOworY2xhc3MgUmVuZGVyU3R5bGU7CiAKIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IHZhbHVlRm9yQmFzaWNTaGFwZShjb25zdCBCYXNpY1NoYXBlKik7Ci1QYXNzUmVm UHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBTdHlsZVJlc29sdmVyKiwg Y29uc3QgQ1NTQmFzaWNTaGFwZSopOworUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBiYXNpY1NoYXBl Rm9yVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqLCBjb25zdCBSZW5kZXJTdHlsZSogcm9vdFN0eWxl LCBjb25zdCBDU1NCYXNpY1NoYXBlKik7CiAKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IGZiNjliYzUuLjI4MDc2N2EgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTE5 MjYsNyArMTkyNiw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+ Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5vbmUpCiAgICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5 bGVSZXNvbHZlci0+c3R5bGUoKSwgMCk7CiAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVW YWx1ZS0+aXNTaGFwZSgpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZl ci0+c3R5bGUoKSwgU2hhcGVDbGlwUGF0aE9wZXJhdGlvbjo6Y3JlYXRlKGJhc2ljU2hhcGVGb3JW YWx1ZShzdHlsZVJlc29sdmVyLCBwcmltaXRpdmVWYWx1ZS0+Z2V0U2hhcGVWYWx1ZSgpKSkpOwor ICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlQ2xp cFBhdGhPcGVyYXRpb246OmNyZWF0ZShiYXNpY1NoYXBlRm9yVmFsdWUoc3R5bGVSZXNvbHZlci0+ c3R5bGUoKSwgc3R5bGVSZXNvbHZlci0+cm9vdEVsZW1lbnRTdHlsZSgpLCBwcmltaXRpdmVWYWx1 ZS0+Z2V0U2hhcGVWYWx1ZSgpKSkpOwogICAgICAgICAgICAgfQogI2lmIEVOQUJMRShTVkcpCiAg ICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENT U1ByaW1pdGl2ZVZhbHVlOjpDU1NfVVJJKSB7CkBAIC0xOTYwLDcgKzE5NjAsNyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NW YWx1ZU91dHNpZGVTaGFwZSkKICAgICAgICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVy LT5zdHlsZSgpLCBFeGNsdXNpb25TaGFwZVZhbHVlOjpjcmVhdGVPdXRzaWRlVmFsdWUoKSk7CiAg ICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNTaGFwZSgpKSB7Ci0gICAgICAg ICAgICAgICAgUmVmUHRyPEV4Y2x1c2lvblNoYXBlVmFsdWU+IHNoYXBlID0gRXhjbHVzaW9uU2hh cGVWYWx1ZTo6Y3JlYXRlU2hhcGVWYWx1ZShiYXNpY1NoYXBlRm9yVmFsdWUoc3R5bGVSZXNvbHZl ciwgcHJpbWl0aXZlVmFsdWUtPmdldFNoYXBlVmFsdWUoKSkpOworICAgICAgICAgICAgICAgIFJl ZlB0cjxFeGNsdXNpb25TaGFwZVZhbHVlPiBzaGFwZSA9IEV4Y2x1c2lvblNoYXBlVmFsdWU6OmNy ZWF0ZVNoYXBlVmFsdWUoYmFzaWNTaGFwZUZvclZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCks IHN0eWxlUmVzb2x2ZXItPnJvb3RFbGVtZW50U3R5bGUoKSwgcHJpbWl0aXZlVmFsdWUtPmdldFNo YXBlVmFsdWUoKSkpOwogICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0 eWxlKCksIHNoYXBlLnJlbGVhc2UoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K