125618 2013-12-11 23:55:48 -0800 Remove some unneeded code noticed while looking at StylePendingImage 2013-12-12 00:41:25 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim kondapallykalyan macpherson menard oldest_to_newest 959067 0 darin 2013-12-11 23:55:48 -0800 Remove some unneeded code noticed while looking at StylePendingImage 959070 1 219048 darin 2013-12-11 23:58:02 -0800 Created attachment 219048 Patch 959071 2 commit-queue 2013-12-12 00:00:27 -0800 Attachment 219048 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/css/StyleResolver.cpp', u'Source/WebCore/rendering/RenderImageResource.cpp', u'Source/WebCore/rendering/RenderImageResource.h', u'Source/WebCore/rendering/RenderImageResourceStyleImage.h', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 959075 3 219049 darin 2013-12-12 00:10:21 -0800 Created attachment 219049 Patch 959080 4 219049 kling 2013-12-12 00:20:31 -0800 Comment on attachment 219049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219049&action=review r=me > Source/WebCore/css/StyleResolver.cpp:3881 > + if (CSSImageValue* imageValue = pendingImage->cssImageValue()) auto > Source/WebCore/css/StyleResolver.cpp:3884 > + if (CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGeneratorValue()) { auto > Source/WebCore/css/StyleResolver.cpp:3889 > + if (CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValue()) auto > Source/WebCore/css/StyleResolver.cpp:3893 > + if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue()) auto 959086 5 darin 2013-12-12 00:41:25 -0800 Committed r160478: <http://trac.webkit.org/changeset/160478> 219048 2013-12-11 23:58:02 -0800 2013-12-12 00:10:17 -0800 Patch bug-125618-20131211235805.patch text/plain 6351 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMyNTllYmQ2YzVlOTUx ZjA2OGNkODU0OWFiOTQ5NTc1ZDRjNjVhOS4uZDc2ZWQzYWEwZjE4ZGExMjZmOGFjMmE2M2Q4NDVj ZjhhZWEwZTA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEyLTExICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSB1bm5lZWRl ZCBjb2RlIG5vdGljZWQgd2hpbGUgbG9va2luZyBhdCBTdHlsZVBlbmRpbmdJbWFnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NjE4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZVJlc29sdmVyOjpsb2FkUGVuZGluZ0ltYWdlKTogUmVtb3ZlZCByZWR1bmRhbnQg ZnVuY3Rpb24gY2FsbHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJj ZS5jcHA6IFJlbW92ZWQgdW5uZWVkZWQgbnVsbEltYWdlIGFuZAorICAgICAgICB1c2VzSW1hZ2VD b250YWluZXJTaXplIG1lbWJlciBmdW5jdGlvbnMuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJ bWFnZVJlc291cmNlOjppbWFnZSk6IFVzZSBJbWFnZTo6bnVsbEltYWdlIGRpcmVjdGx5IGluc3Rl YWQgb2YKKyAgICAgICAgdGhyb3VnaCBSZW5kZXJJbWFnZVJlc291cmNlSW1hZ2U6Om51bGxJbWFn ZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmg6IFJlbW92ZWQg dW5uZWVkZWQgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZQorICAgICAgICBhbmQgbnVsbEltYWdlIGZ1 bmN0aW9ucy4gQWxzbyByZW1vdmVkIHVubmVlZGVkIGluY2x1ZGVzLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdlLmg6IFJlbW92ZWQgdW5uZWVkZWQK KyAgICAgICAgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZSBvdmVycmlkZS4gTm9ib2R5IHdhcyBjYWxs aW5nIGl0LgorCiAyMDEzLTEyLTExICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEFkZCB0aGUgQ0ZOZXR3b3JrIGltcGxlbWVudGF0aW9uIG9mIHRoZSBh c3luY2hyb25vdXMgUmVzb3VyY2VIYW5kbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNw cAppbmRleCBjNWJmOGRjZjg4MGQ3ODMyNjAxMTBhYmI0NGE2ZjYzYzM2NGFjZjllLi5mMTU1M2Zh YjdkM2EwZDQ1NDQzZmExYmZjMTkwY2NmNTU0NjQzYmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwCkBAIC0zODc4LDMwICszODc4LDIzIEBAIFBhc3NSZWZQdHI8U3R5bGVJbWFn ZT4gU3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdJbWFnZShTdHlsZVBlbmRpbmdJbWFnZSogcGVu ZGluCiB7CiAgICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGNhY2hlZFJlc291cmNlTG9hZGVyID0g bV9zdGF0ZS5kb2N1bWVudCgpLmNhY2hlZFJlc291cmNlTG9hZGVyKCk7CiAKLSAgICBpZiAocGVu ZGluZ0ltYWdlLT5jc3NJbWFnZVZhbHVlKCkpIHsKLSAgICAgICAgQ1NTSW1hZ2VWYWx1ZSogaW1h Z2VWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VWYWx1ZSgpOworICAgIGlmIChDU1NJbWFn ZVZhbHVlKiBpbWFnZVZhbHVlID0gcGVuZGluZ0ltYWdlLT5jc3NJbWFnZVZhbHVlKCkpCiAgICAg ICAgIHJldHVybiBpbWFnZVZhbHVlLT5jYWNoZWRJbWFnZShjYWNoZWRSZXNvdXJjZUxvYWRlcik7 Ci0gICAgfQogCi0gICAgaWYgKHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VHZW5lcmF0b3JWYWx1ZSgp KSB7Ci0gICAgICAgIENTU0ltYWdlR2VuZXJhdG9yVmFsdWUqIGltYWdlR2VuZXJhdG9yVmFsdWUg PSBwZW5kaW5nSW1hZ2UtPmNzc0ltYWdlR2VuZXJhdG9yVmFsdWUoKTsKKyAgICBpZiAoQ1NTSW1h Z2VHZW5lcmF0b3JWYWx1ZSogaW1hZ2VHZW5lcmF0b3JWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3Nz SW1hZ2VHZW5lcmF0b3JWYWx1ZSgpKSB7CiAgICAgICAgIGltYWdlR2VuZXJhdG9yVmFsdWUtPmxv YWRTdWJpbWFnZXMoY2FjaGVkUmVzb3VyY2VMb2FkZXIpOwogICAgICAgICByZXR1cm4gU3R5bGVH ZW5lcmF0ZWRJbWFnZTo6Y3JlYXRlKGltYWdlR2VuZXJhdG9yVmFsdWUpOwogICAgIH0KIAotICAg IGlmIChwZW5kaW5nSW1hZ2UtPmNzc0N1cnNvckltYWdlVmFsdWUoKSkgewotICAgICAgICBDU1ND dXJzb3JJbWFnZVZhbHVlKiBjdXJzb3JJbWFnZVZhbHVlID0gcGVuZGluZ0ltYWdlLT5jc3NDdXJz b3JJbWFnZVZhbHVlKCk7CisgICAgaWYgKENTU0N1cnNvckltYWdlVmFsdWUqIGN1cnNvckltYWdl VmFsdWUgPSBwZW5kaW5nSW1hZ2UtPmNzc0N1cnNvckltYWdlVmFsdWUoKSkKICAgICAgICAgcmV0 dXJuIGN1cnNvckltYWdlVmFsdWUtPmNhY2hlZEltYWdlKGNhY2hlZFJlc291cmNlTG9hZGVyKTsK LSAgICB9CiAKICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1NFVCkKLSAgICBpZiAocGVuZGluZ0ltYWdl LT5jc3NJbWFnZVNldFZhbHVlKCkpIHsKLSAgICAgICAgQ1NTSW1hZ2VTZXRWYWx1ZSogaW1hZ2VT ZXRWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VTZXRWYWx1ZSgpOworICAgIGlmIChDU1NJ bWFnZVNldFZhbHVlKiBpbWFnZVNldFZhbHVlID0gcGVuZGluZ0ltYWdlLT5jc3NJbWFnZVNldFZh bHVlKCkpCiAgICAgICAgIHJldHVybiBpbWFnZVNldFZhbHVlLT5jYWNoZWRJbWFnZVNldChjYWNo ZWRSZXNvdXJjZUxvYWRlcik7Ci0gICAgfQogI2VuZGlmCiAKLSAgICByZXR1cm4gMDsKKyAgICBy ZXR1cm4gbnVsbHB0cjsKIH0KIAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySW1hZ2VSZXNvdXJjZS5jcHAKaW5kZXggZjQ1OWJlYWQ5YmE1NzZjZGE0ZjI2Zjk2NDljNGRj NWQzMDU4ZDMxZC4uZTZhMWRjNDU5MjY5MGRhYzMzNzQ5N2U1MWM4MmI3ZTc2MDc3ZWVkNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmNwcApA QCAtOTEsNyArOTEsNyBAQCB2b2lkIFJlbmRlckltYWdlUmVzb3VyY2U6OnJlc2V0QW5pbWF0aW9u KCkKIAogUGFzc1JlZlB0cjxJbWFnZT4gUmVuZGVySW1hZ2VSZXNvdXJjZTo6aW1hZ2UoaW50LCBp bnQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5p bWFnZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIpIDogbnVsbEltYWdlKCk7CisgICAgcmV0dXJuIG1f Y2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIp IDogSW1hZ2U6Om51bGxJbWFnZSgpOwogfQogCiBib29sIFJlbmRlckltYWdlUmVzb3VyY2U6OmVy cm9yT2NjdXJyZWQoKSBjb25zdApAQCAtMTA2LDE2ICsxMDYsNiBAQCB2b2lkIFJlbmRlckltYWdl UmVzb3VyY2U6OnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcihjb25zdCBJbnRTaXplJiBpbWFn ZUNvbnRhaQogICAgICAgICBtX2NhY2hlZEltYWdlLT5zZXRDb250YWluZXJTaXplRm9yUmVuZGVy ZXIobV9yZW5kZXJlciwgaW1hZ2VDb250YWluZXJTaXplLCBtX3JlbmRlcmVyLT5zdHlsZSgpLmVm ZmVjdGl2ZVpvb20oKSk7CiB9CiAKLUltYWdlKiBSZW5kZXJJbWFnZVJlc291cmNlOjpudWxsSW1h Z2UoKQotewotICAgIHJldHVybiBJbWFnZTo6bnVsbEltYWdlKCk7Ci19Ci0KLWJvb2wgUmVuZGVy SW1hZ2VSZXNvdXJjZTo6dXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpIGNvbnN0Ci17Ci0gICAgcmV0 dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT51c2VzSW1hZ2VDb250YWluZXJTaXpl KCkgOiBmYWxzZTsKLX0KLQogYm9vbCBSZW5kZXJJbWFnZVJlc291cmNlOjppbWFnZUhhc1JlbGF0 aXZlV2lkdGgoKSBjb25zdAogewogICAgIHJldHVybiBtX2NhY2hlZEltYWdlID8gbV9jYWNoZWRJ bWFnZS0+aW1hZ2VIYXNSZWxhdGl2ZVdpZHRoKCkgOiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5oCmluZGV4IDUzMzliMzJiOTk5NWEyMjMz ZjczZjUxMzcxZGIxYzZmMDc0M2Y1ZmYuLmI3NjMwYjRkYmJmYTUxZDYxYmVkODRiNjhlOTQ3NGJm ZGNiZTZlYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFn ZVJlc291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVz b3VyY2UuaApAQCAtMjcsMTIgKzI3LDEyIEBACiAjZGVmaW5lIFJlbmRlckltYWdlUmVzb3VyY2Vf aAogCiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5kbGUuaCIKLSNpbmNsdWRlICJJbWFnZS5o IgotI2luY2x1ZGUgIkxheW91dFNpemUuaCIKICNpbmNsdWRlICJTdHlsZUltYWdlLmgiCisjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBD YWNoZWRJbWFnZTsKIGNsYXNzIFJlbmRlckVsZW1lbnQ7CiAKIGNsYXNzIFJlbmRlckltYWdlUmVz b3VyY2UgewpAQCAtNTgsNyArNTgsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGVycm9y T2NjdXJyZWQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250YWluZXJTaXplRm9y UmVuZGVyZXIoY29uc3QgSW50U2l6ZSYpOwotICAgIHZpcnR1YWwgYm9vbCB1c2VzSW1hZ2VDb250 YWluZXJTaXplKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGltYWdlSGFzUmVsYXRpdmVXaWR0 aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpbWFnZUhhc1JlbGF0aXZlSGVpZ2h0KCkgY29u c3Q7CiAKQEAgLTY5LDExICs2OCw5IEBAIHB1YmxpYzoKIAogcHJvdGVjdGVkOgogICAgIFJlbmRl ckltYWdlUmVzb3VyY2UoKTsKKwogICAgIFJlbmRlckVsZW1lbnQqIG1fcmVuZGVyZXI7CiAgICAg Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IG1fY2FjaGVkSW1hZ2U7Ci0KLXByaXZh dGU6Ci0gICAgc3RhdGljIEltYWdlKiBudWxsSW1hZ2UoKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFn ZVJlc291cmNlU3R5bGVJbWFnZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklt YWdlUmVzb3VyY2VTdHlsZUltYWdlLmgKaW5kZXggNzM0NzJlOTlhMjhhOWFlNDVkMTA1MTRhNWFj ZjE2MDRlM2FmZWMzNC4uNDBkOTIzYWEzMmEyYzE3MWE1MThiZjYxN2YyZDc3M2Q2M2U5NmMzNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VT dHlsZUltYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVz b3VyY2VTdHlsZUltYWdlLmgKQEAgLTUyLDcgKzUyLDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IGJvb2wgZXJyb3JPY2N1cnJlZCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fc3R5bGVJbWFn ZS0+ZXJyb3JPY2N1cnJlZCgpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGFpbmVyU2l6 ZUZvclJlbmRlcmVyKGNvbnN0IEludFNpemUmKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIGJvb2wg dXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fc3R5bGVJ bWFnZS0+dXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpOyB9CiAgICAgdmlydHVhbCBib29sIGltYWdl SGFzUmVsYXRpdmVXaWR0aCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fc3R5bGVJbWFnZS0+ aW1hZ2VIYXNSZWxhdGl2ZVdpZHRoKCk7IH0KICAgICB2aXJ0dWFsIGJvb2wgaW1hZ2VIYXNSZWxh dGl2ZUhlaWdodCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fc3R5bGVJbWFnZS0+aW1hZ2VI YXNSZWxhdGl2ZUhlaWdodCgpOyB9CiAK 219049 2013-12-12 00:10:21 -0800 2013-12-12 00:20:31 -0800 Patch bug-125618-20131212001025.patch text/plain 6318 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMyNTllYmQ2YzVlOTUx ZjA2OGNkODU0OWFiOTQ5NTc1ZDRjNjVhOS4uNTc1ODE5YzljNzQ0NzQ3NzkxYTgzY2I1ZDdhZDVi ZmM4MTUyYmMwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTEyLTExICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgc29tZSB1bm5lZWRl ZCBjb2RlIG5vdGljZWQgd2hpbGUgbG9va2luZyBhdCBTdHlsZVBlbmRpbmdJbWFnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NjE4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNv bHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpsb2FkUGVuZGluZ0lt YWdlKTogUmVtb3ZlZCByZWR1bmRhbnQgZnVuY3Rpb24gY2FsbHMuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5jcHA6IFJlbW92ZWQgdW5uZWVkZWQgbnVsbEltYWdl IGFuZAorICAgICAgICB1c2VzSW1hZ2VDb250YWluZXJTaXplIG1lbWJlciBmdW5jdGlvbnMuCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZVJlc291cmNlOjppbWFnZSk6IFVzZSBJbWFnZTo6 bnVsbEltYWdlIGRpcmVjdGx5IGluc3RlYWQgb2YKKyAgICAgICAgdGhyb3VnaCBSZW5kZXJJbWFn ZVJlc291cmNlSW1hZ2U6Om51bGxJbWFnZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJ bWFnZVJlc291cmNlLmg6IFJlbW92ZWQgdW5uZWVkZWQgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZQor ICAgICAgICBhbmQgbnVsbEltYWdlIGZ1bmN0aW9ucy4gQWxzbyByZW1vdmVkIHVubmVlZGVkIGlu Y2x1ZGVzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUlt YWdlLmg6IFJlbW92ZWQgdW5uZWVkZWQKKyAgICAgICAgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZSBv dmVycmlkZS4gTm9ib2R5IHdhcyBjYWxsaW5nIGl0LgorCiAyMDEzLTEyLTExICBCZW5qYW1pbiBQ b3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCB0aGUgQ0ZOZXR3b3Jr IGltcGxlbWVudGF0aW9uIG9mIHRoZSBhc3luY2hyb25vdXMgUmVzb3VyY2VIYW5kbGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBjNWJmOGRjZjg4MGQ3ODMyNjAxMTBhYmI0 NGE2ZjYzYzM2NGFjZjllLi5mMTU1M2ZhYjdkM2EwZDQ1NDQzZmExYmZjMTkwY2NmNTU0NjQzYmI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0zODc4LDMwICszODc4LDIz IEBAIFBhc3NSZWZQdHI8U3R5bGVJbWFnZT4gU3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdJbWFn ZShTdHlsZVBlbmRpbmdJbWFnZSogcGVuZGluCiB7CiAgICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIq IGNhY2hlZFJlc291cmNlTG9hZGVyID0gbV9zdGF0ZS5kb2N1bWVudCgpLmNhY2hlZFJlc291cmNl TG9hZGVyKCk7CiAKLSAgICBpZiAocGVuZGluZ0ltYWdlLT5jc3NJbWFnZVZhbHVlKCkpIHsKLSAg ICAgICAgQ1NTSW1hZ2VWYWx1ZSogaW1hZ2VWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VW YWx1ZSgpOworICAgIGlmIChDU1NJbWFnZVZhbHVlKiBpbWFnZVZhbHVlID0gcGVuZGluZ0ltYWdl LT5jc3NJbWFnZVZhbHVlKCkpCiAgICAgICAgIHJldHVybiBpbWFnZVZhbHVlLT5jYWNoZWRJbWFn ZShjYWNoZWRSZXNvdXJjZUxvYWRlcik7Ci0gICAgfQogCi0gICAgaWYgKHBlbmRpbmdJbWFnZS0+ Y3NzSW1hZ2VHZW5lcmF0b3JWYWx1ZSgpKSB7Ci0gICAgICAgIENTU0ltYWdlR2VuZXJhdG9yVmFs dWUqIGltYWdlR2VuZXJhdG9yVmFsdWUgPSBwZW5kaW5nSW1hZ2UtPmNzc0ltYWdlR2VuZXJhdG9y VmFsdWUoKTsKKyAgICBpZiAoQ1NTSW1hZ2VHZW5lcmF0b3JWYWx1ZSogaW1hZ2VHZW5lcmF0b3JW YWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VHZW5lcmF0b3JWYWx1ZSgpKSB7CiAgICAgICAg IGltYWdlR2VuZXJhdG9yVmFsdWUtPmxvYWRTdWJpbWFnZXMoY2FjaGVkUmVzb3VyY2VMb2FkZXIp OwogICAgICAgICByZXR1cm4gU3R5bGVHZW5lcmF0ZWRJbWFnZTo6Y3JlYXRlKGltYWdlR2VuZXJh dG9yVmFsdWUpOwogICAgIH0KIAotICAgIGlmIChwZW5kaW5nSW1hZ2UtPmNzc0N1cnNvckltYWdl VmFsdWUoKSkgewotICAgICAgICBDU1NDdXJzb3JJbWFnZVZhbHVlKiBjdXJzb3JJbWFnZVZhbHVl ID0gcGVuZGluZ0ltYWdlLT5jc3NDdXJzb3JJbWFnZVZhbHVlKCk7CisgICAgaWYgKENTU0N1cnNv ckltYWdlVmFsdWUqIGN1cnNvckltYWdlVmFsdWUgPSBwZW5kaW5nSW1hZ2UtPmNzc0N1cnNvcklt YWdlVmFsdWUoKSkKICAgICAgICAgcmV0dXJuIGN1cnNvckltYWdlVmFsdWUtPmNhY2hlZEltYWdl KGNhY2hlZFJlc291cmNlTG9hZGVyKTsKLSAgICB9CiAKICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1NF VCkKLSAgICBpZiAocGVuZGluZ0ltYWdlLT5jc3NJbWFnZVNldFZhbHVlKCkpIHsKLSAgICAgICAg Q1NTSW1hZ2VTZXRWYWx1ZSogaW1hZ2VTZXRWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VT ZXRWYWx1ZSgpOworICAgIGlmIChDU1NJbWFnZVNldFZhbHVlKiBpbWFnZVNldFZhbHVlID0gcGVu ZGluZ0ltYWdlLT5jc3NJbWFnZVNldFZhbHVlKCkpCiAgICAgICAgIHJldHVybiBpbWFnZVNldFZh bHVlLT5jYWNoZWRJbWFnZVNldChjYWNoZWRSZXNvdXJjZUxvYWRlcik7Ci0gICAgfQogI2VuZGlm CiAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5jcHAKaW5kZXggZjQ1OWJl YWQ5YmE1NzZjZGE0ZjI2Zjk2NDljNGRjNWQzMDU4ZDMxZC4uZTZhMWRjNDU5MjY5MGRhYzMzNzQ5 N2U1MWM4MmI3ZTc2MDc3ZWVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckltYWdlUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbWFnZVJlc291cmNlLmNwcApAQCAtOTEsNyArOTEsNyBAQCB2b2lkIFJlbmRlckltYWdl UmVzb3VyY2U6OnJlc2V0QW5pbWF0aW9uKCkKIAogUGFzc1JlZlB0cjxJbWFnZT4gUmVuZGVySW1h Z2VSZXNvdXJjZTo6aW1hZ2UoaW50LCBpbnQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fY2FjaGVk SW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIpIDogbnVs bEltYWdlKCk7CisgICAgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdlLT5pbWFn ZUZvclJlbmRlcmVyKG1fcmVuZGVyZXIpIDogSW1hZ2U6Om51bGxJbWFnZSgpOwogfQogCiBib29s IFJlbmRlckltYWdlUmVzb3VyY2U6OmVycm9yT2NjdXJyZWQoKSBjb25zdApAQCAtMTA2LDE2ICsx MDYsNiBAQCB2b2lkIFJlbmRlckltYWdlUmVzb3VyY2U6OnNldENvbnRhaW5lclNpemVGb3JSZW5k ZXJlcihjb25zdCBJbnRTaXplJiBpbWFnZUNvbnRhaQogICAgICAgICBtX2NhY2hlZEltYWdlLT5z ZXRDb250YWluZXJTaXplRm9yUmVuZGVyZXIobV9yZW5kZXJlciwgaW1hZ2VDb250YWluZXJTaXpl LCBtX3JlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiB9CiAKLUltYWdlKiBSZW5k ZXJJbWFnZVJlc291cmNlOjpudWxsSW1hZ2UoKQotewotICAgIHJldHVybiBJbWFnZTo6bnVsbElt YWdlKCk7Ci19Ci0KLWJvb2wgUmVuZGVySW1hZ2VSZXNvdXJjZTo6dXNlc0ltYWdlQ29udGFpbmVy U2l6ZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fY2FjaGVkSW1hZ2UgPyBtX2NhY2hlZEltYWdl LT51c2VzSW1hZ2VDb250YWluZXJTaXplKCkgOiBmYWxzZTsKLX0KLQogYm9vbCBSZW5kZXJJbWFn ZVJlc291cmNlOjppbWFnZUhhc1JlbGF0aXZlV2lkdGgoKSBjb25zdAogewogICAgIHJldHVybiBt X2NhY2hlZEltYWdlID8gbV9jYWNoZWRJbWFnZS0+aW1hZ2VIYXNSZWxhdGl2ZVdpZHRoKCkgOiBm YWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJl c291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2VSZXNvdXJjZS5o CmluZGV4IDUzMzliMzJiOTk5NWEyMjMzZjczZjUxMzcxZGIxYzZmMDc0M2Y1ZmYuLmI3NjMwYjRk YmJmYTUxZDYxYmVkODRiNjhlOTQ3NGJmZGNiZTZlYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2UuaApAQCAtMjcsMTIgKzI3LDEyIEBACiAjZGVm aW5lIFJlbmRlckltYWdlUmVzb3VyY2VfaAogCiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5k bGUuaCIKLSNpbmNsdWRlICJJbWFnZS5oIgotI2luY2x1ZGUgIkxheW91dFNpemUuaCIKICNpbmNs dWRlICJTdHlsZUltYWdlLmgiCisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCitjbGFzcyBDYWNoZWRJbWFnZTsKIGNsYXNzIFJlbmRlckVsZW1lbnQ7 CiAKIGNsYXNzIFJlbmRlckltYWdlUmVzb3VyY2UgewpAQCAtNTgsNyArNTgsNiBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBib29sIGVycm9yT2NjdXJyZWQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwg dm9pZCBzZXRDb250YWluZXJTaXplRm9yUmVuZGVyZXIoY29uc3QgSW50U2l6ZSYpOwotICAgIHZp cnR1YWwgYm9vbCB1c2VzSW1hZ2VDb250YWluZXJTaXplKCkgY29uc3Q7CiAgICAgdmlydHVhbCBi b29sIGltYWdlSGFzUmVsYXRpdmVXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpbWFn ZUhhc1JlbGF0aXZlSGVpZ2h0KCkgY29uc3Q7CiAKQEAgLTY5LDExICs2OCw5IEBAIHB1YmxpYzoK IAogcHJvdGVjdGVkOgogICAgIFJlbmRlckltYWdlUmVzb3VyY2UoKTsKKwogICAgIFJlbmRlckVs ZW1lbnQqIG1fcmVuZGVyZXI7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+ IG1fY2FjaGVkSW1hZ2U7Ci0KLXByaXZhdGU6Ci0gICAgc3RhdGljIEltYWdlKiBudWxsSW1hZ2Uo KTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZVJlc291cmNlU3R5bGVJbWFnZS5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdlLmgKaW5kZXggNzM0 NzJlOTlhMjhhOWFlNDVkMTA1MTRhNWFjZjE2MDRlM2FmZWMzNC4uNDBkOTIzYWEzMmEyYzE3MWE1 MThiZjYxN2YyZDc3M2Q2M2U5NmMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdlLmgKQEAgLTUyLDcgKzUyLDYg QEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgZXJyb3JPY2N1cnJlZCgpIGNvbnN0IE9WRVJS SURFIHsgcmV0dXJuIG1fc3R5bGVJbWFnZS0+ZXJyb3JPY2N1cnJlZCgpOyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgc2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKGNvbnN0IEludFNpemUmKSBPVkVS UklERTsKLSAgICB2aXJ0dWFsIGJvb2wgdXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpIGNvbnN0IE9W RVJSSURFIHsgcmV0dXJuIG1fc3R5bGVJbWFnZS0+dXNlc0ltYWdlQ29udGFpbmVyU2l6ZSgpOyB9 CiAgICAgdmlydHVhbCBib29sIGltYWdlSGFzUmVsYXRpdmVXaWR0aCgpIGNvbnN0IE9WRVJSSURF IHsgcmV0dXJuIG1fc3R5bGVJbWFnZS0+aW1hZ2VIYXNSZWxhdGl2ZVdpZHRoKCk7IH0KICAgICB2 aXJ0dWFsIGJvb2wgaW1hZ2VIYXNSZWxhdGl2ZUhlaWdodCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0 dXJuIG1fc3R5bGVJbWFnZS0+aW1hZ2VIYXNSZWxhdGl2ZUhlaWdodCgpOyB9CiAK