91203 2012-07-13 01:40:12 -0700 Make CSS box model background, border and mask be decoded by parallel image decoders. 2012-08-13 05:03:49 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified UNCONFIRMED P2 Normal --- 90935 90375 0 dongseong.hwang webkit-unassigned dglazkov eric gram gustavo peter+ews philn skyul webkit.review.bot xan.lopez oldest_to_newest 668734 0 dongseong.hwang 2012-07-13 01:40:12 -0700 There are two changes. 1. Make RenderBoxModelObject use RetainedModeBitmapImage if the image is an instance of BitmapImage. 2. Originally, the renderer checked if a CSS image was loaded in order to render the entire image. With parallel image decoders, loading done does not always mean the whole image can be rendered. Now if the given image is a BitmapImage, we need to check if decoding is completed in addition to loading done. 668736 1 152189 dongseong.hwang 2012-07-13 01:45:09 -0700 Created attachment 152189 Patch 668751 2 152189 buildbot 2012-07-13 02:08:04 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13240026 668767 3 152189 buildbot 2012-07-13 02:29:25 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass win-ews (win): Output: http://queues.webkit.org/results/13239025 668786 4 152189 webkit.review.bot 2012-07-13 02:49:29 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13236053 668806 5 152189 webkit-ews 2012-07-13 03:12:27 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13207985 668812 6 152189 webkit-ews 2012-07-13 03:17:41 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13241042 668817 7 152189 gyuyoung.kim 2012-07-13 03:33:23 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13239032 668852 8 skyul 2012-07-13 04:19:55 -0700 This patch doesn't build until Bug 90935 is resolved. Can't we disable build bots until dependencies are resolved? 692164 9 152189 peter+ews 2012-08-09 21:05:28 -0700 Comment on attachment 152189 Patch Attachment 152189 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13475104 693210 10 152189 eric 2012-08-12 03:30:13 -0700 Comment on attachment 152189 Patch This breaks all the builds. :( 693545 11 skyul 2012-08-13 05:03:49 -0700 (In reply to comment #10) > (From update of attachment 152189 [details]) > This breaks all the builds. :( Eric, this bug has a dependency on Bug 90935 which has not yet been committed. Can't I disable build bots? 152189 2012-07-13 01:45:09 -0700 2012-08-12 03:30:13 -0700 Patch bug-91203-20120713174503.patch text/plain 19953 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM0MjFiZDc3ZDI5NDY2 YjMyNzBhYzc3ZDY5MDQxZDI3MjJkOTFjZC4uMmRmODQ3ZDMxMzlmYjJkZDJjNGY5YjA5MDAzMDJh OWVhY2IxMTU5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEyLTA3LTEzICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIE1ha2UgQ1NT IGJveCBtb2RlbCBiYWNrZ3JvdW5kLCBib3JkZXIgYW5kIG1hc2sgYmUgZGVjb2RlZCBieSBwYXJh bGxlbCBpbWFnZSBkZWNvZGVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkxMjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBjaGFuZ2VzLgorCisgICAgICAgIDEuIE1ha2UgUmVu ZGVyQm94TW9kZWxPYmplY3QgdXNlIFJldGFpbmVkTW9kZUJpdG1hcEltYWdlIGlmIHRoZSBpbWFn ZSBpcworICAgICAgICBhbiBpbnN0YW5jZSBvZiBCaXRtYXBJbWFnZS4KKworICAgICAgICAyLiBP cmlnaW5hbGx5LCB0aGUgcmVuZGVyZXIgY2hlY2tlZCBpZiBhIENTUyBpbWFnZSB3YXMgbG9hZGVk IGluIG9yZGVyIHRvCisgICAgICAgIHJlbmRlciB0aGUgZW50aXJlIGltYWdlLiBXaXRoIHBhcmFs bGVsIGltYWdlIGRlY29kZXJzLCBsb2FkaW5nIGRvbmUgZG9lcyBub3QgYWx3YXlzCisgICAgICAg IG1lYW4gdGhlIHdob2xlIGltYWdlIGNhbiBiZSByZW5kZXJlZC4gTm93IGlmIHRoZSBnaXZlbiBp bWFnZSBpcyBhIEJpdG1hcEltYWdlLAorICAgICAgICB3ZSBuZWVkIHRvIGNoZWNrIGlmIGRlY29k aW5nIGlzIGNvbXBsZXRlZCBpbiBhZGRpdGlvbiB0byBsb2FkaW5nIGRvbmUuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVu ZGVyaW5nL0lubGluZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0Jv eDo6cGFpbnRCb3hEZWNvcmF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94 OjpwYWludE1hc2spOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQm94OjpkZXRlcm1pbmVCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2Up OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwYWludE1hc2tJbWFnZXMpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZSk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y2FuUmVuZGVyRW50aXJlSW1hZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpjYW5SZW5kZXJFbnRpcmVCb3JkZXJJbWFn ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6Om11c3RSZXBhaW50QmFja2dyb3Vu ZE9yQm9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAg IChSZW5kZXJPYmplY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9GaWxsTGF5ZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RmlsbExheWVyOjpjYW5SZW5kZXJFbnRpcmVJbWFnZSk6Cisg ICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0ZpbGxMYXllci5oOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChGaWxsTGF5ZXIpOgorCiAyMDEyLTA3LTEwICBIdWFuZyBEb25nc3VuZyAgPGx1 eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIEFkZCBwYXJhbGxlbCBpbWFnZSBkZWNv ZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCmluZGV4IGRj NDUwMDFhZmFlMjgzYmM3ZDc1MDhkYTk3YjA3YmVlMmNiZWY5NTEuLmRjNzdmOGMwNDY3NjU3MWM3 MDQ0ZWJjMjIyMzUwZDM1ZTIyYjllZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVGbG93Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAKQEAgLTEyNTAsOCArMTI1MCw4IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6 cGFpbnRCb3hEZWNvcmF0aW9ucyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9p bnQmCiAgICAgICAgICAgICBjb25zdCBOaW5lUGllY2VJbWFnZSYgYm9yZGVySW1hZ2UgPSByZW5k ZXJlcigpLT5zdHlsZSgpLT5ib3JkZXJJbWFnZSgpOwogICAgICAgICAgICAgU3R5bGVJbWFnZSog Ym9yZGVySW1hZ2VTb3VyY2UgPSBib3JkZXJJbWFnZS5pbWFnZSgpOwogICAgICAgICAgICAgYm9v bCBoYXNCb3JkZXJJbWFnZSA9IGJvcmRlckltYWdlU291cmNlICYmIGJvcmRlckltYWdlU291cmNl LT5jYW5SZW5kZXIocmVuZGVyZXIoKSwgc3R5bGVUb1VzZS0+ZWZmZWN0aXZlWm9vbSgpKTsKLSAg ICAgICAgICAgIGlmIChoYXNCb3JkZXJJbWFnZSAmJiAhYm9yZGVySW1hZ2VTb3VyY2UtPmlzTG9h ZGVkKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOyAvLyBEb24ndCBwYWludCBhbnl0aGluZyB3 aGlsZSB3ZSB3YWl0IGZvciB0aGUgaW1hZ2UgdG8gbG9hZC4KKyAgICAgICAgICAgIGlmIChoYXNC b3JkZXJJbWFnZSAmJiAhYm94TW9kZWxPYmplY3QoKS0+Y2FuUmVuZGVyRW50aXJlSW1hZ2UoYm9y ZGVySW1hZ2VTb3VyY2UpKQorICAgICAgICAgICAgICAgIHJldHVybjsgLy8gRG9uJ3QgcGFpbnQg YW55dGhpbmcgdW50aWwgd2UgY2FuIHJlbmRlciB0aGUgaW1hZ2UgZW50aXJlbHkuCiAKICAgICAg ICAgICAgIC8vIFRoZSBzaW1wbGUgY2FzZSBpcyB3aGVyZSB3ZSBlaXRoZXIgaGF2ZSBubyBib3Jk ZXIgaW1hZ2Ugb3Igd2UgYXJlIHRoZSBvbmx5IGJveCBmb3IgdGhpcyBvYmplY3QuICBJbiB0aG9z ZQogICAgICAgICAgICAgLy8gY2FzZXMgb25seSBhIHNpbmdsZSBjYWxsIHRvIGRyYXcgaXMgcmVx dWlyZWQuCkBAIC0xMzI1LDEwICsxMzI1LDEwIEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnRN YXNrKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzCiAg ICAgcGFpbnRGaWxsTGF5ZXJzKHBhaW50SW5mbywgQ29sb3IoKSwgcmVuZGVyZXIoKS0+c3R5bGUo KS0+bWFza0xheWVycygpLCBwYWludFJlY3QsIGNvbXBvc2l0ZU9wKTsKICAgICAKICAgICBib29s IGhhc0JveEltYWdlID0gbWFza0JveEltYWdlICYmIG1hc2tCb3hJbWFnZS0+Y2FuUmVuZGVyKHJl bmRlcmVyKCksIHJlbmRlcmVyKCktPnN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSk7Ci0gICAgaWYg KCFoYXNCb3hJbWFnZSB8fCAhbWFza0JveEltYWdlLT5pc0xvYWRlZCgpKSB7CisgICAgaWYgKCFo YXNCb3hJbWFnZSB8fCAhYm94TW9kZWxPYmplY3QoKS0+Y2FuUmVuZGVyRW50aXJlSW1hZ2UobWFz a0JveEltYWdlKSkgewogICAgICAgICBpZiAocHVzaFRyYW5zcGFyZW5jeUxheWVyKQogICAgICAg ICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmVuZFRyYW5zcGFyZW5jeUxheWVyKCk7Ci0gICAgICAg IHJldHVybjsgLy8gRG9uJ3QgcGFpbnQgYW55dGhpbmcgd2hpbGUgd2Ugd2FpdCBmb3IgdGhlIGlt YWdlIHRvIGxvYWQuCisgICAgICAgIHJldHVybjsgLy8gRG9uJ3QgcGFpbnQgYW55dGhpbmcgdW50 aWwgd2UgY2FuIHJlbmRlciB0aGUgaW1hZ2UgZW50aXJlbHkuCiAgICAgfQogCiAgICAgLy8gVGhl IHNpbXBsZSBjYXNlIGlzIHdoZXJlIHdlIGFyZSB0aGUgb25seSBib3ggZm9yIHRoaXMgb2JqZWN0 LiAgSW4gdGhvc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggN2Mz YmUzZTU0ZWMxNzVlNzAwNTFhMGU0ZDM2YzIyNmQ3NjQxMDNjMS4uZWVjOTkzOWY5MzY3YjQ0MTMx ZmRjOGUyOWQ3Yjc3Mjk1Zjc4YTU5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKQEAgLTc5Nyw3ICs3OTcsNyBAQCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UgUmVuZGVy Qm94OjpkZXRlcm1pbmVCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UoR3JhcGhpY3NDbwogCiAgICAg Y29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKIAotICAgIGlmICghc3R5 bGUtPmhhc0JhY2tncm91bmQoKSB8fCAhc3R5bGUtPmhhc0JvcmRlcigpIHx8ICFzdHlsZS0+aGFz Qm9yZGVyUmFkaXVzKCkgfHwgYm9yZGVySW1hZ2VJc0xvYWRlZEFuZENhbkJlUmVuZGVyZWQoKSkK KyAgICBpZiAoIXN0eWxlLT5oYXNCYWNrZ3JvdW5kKCkgfHwgIXN0eWxlLT5oYXNCb3JkZXIoKSB8 fCAhc3R5bGUtPmhhc0JvcmRlclJhZGl1cygpIHx8IGNhblJlbmRlckVudGlyZUJvcmRlckltYWdl KCkpCiAgICAgICAgIHJldHVybiBCYWNrZ3JvdW5kQmxlZWROb25lOwogCiAgICAgQWZmaW5lVHJh bnNmb3JtIGN0bSA9IGNvbnRleHQtPmdldENUTSgpOwpAQCAtODk5LDI2ICs4OTksMjYgQEAgdm9p ZCBSZW5kZXJCb3g6OnBhaW50TWFza0ltYWdlcyhjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywg Y29uc3QgTGF5b3V0UmVjdCYgcGEKICAgICBib29sIGZsYXR0ZW5Db21wb3NpdGluZ0xheWVycyA9 IHZpZXcoKS0+ZnJhbWVWaWV3KCkgJiYgdmlldygpLT5mcmFtZVZpZXcoKS0+cGFpbnRCZWhhdmlv cigpICYgUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVyczsKICAgICBDb21wb3Np dGVPcGVyYXRvciBjb21wb3NpdGVPcCA9IENvbXBvc2l0ZVNvdXJjZU92ZXI7CiAKLSAgICBib29s IGFsbE1hc2tJbWFnZXNMb2FkZWQgPSB0cnVlOworICAgIGJvb2wgYWxsTWFza0ltYWdlc0NhbkJl UmVuZGVyZWRFbnRpcmVseSA9IHRydWU7CiAgICAgCiAgICAgaWYgKCFjb21wb3NpdGVkTWFzayB8 fCBmbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpIHsKICAgICAgICAgcHVzaFRyYW5zcGFyZW5jeUxh eWVyID0gdHJ1ZTsKICAgICAgICAgU3R5bGVJbWFnZSogbWFza0JveEltYWdlID0gc3R5bGUoKS0+ bWFza0JveEltYWdlKCkuaW1hZ2UoKTsKICAgICAgICAgY29uc3QgRmlsbExheWVyKiBtYXNrTGF5 ZXJzID0gc3R5bGUoKS0+bWFza0xheWVycygpOwogCi0gICAgICAgIC8vIERvbid0IHJlbmRlciBh IG1hc2tlZCBlbGVtZW50IHVudGlsIGFsbCB0aGUgbWFzayBpbWFnZXMgaGF2ZSBsb2FkZWQsIHRv IHByZXZlbnQgYSBmbGFzaCBvZiB1bm1hc2tlZCBjb250ZW50LgorICAgICAgICAvLyBEb24ndCBy ZW5kZXIgYSBtYXNrZWQgZWxlbWVudCB1bnRpbCBhbGwgdGhlIG1hc2sgaW1hZ2VzIGNhbiBiZSBy ZW5kZXJlZCBlbnRpcmVseSwgdG8gcHJldmVudCBhIGZsYXNoIG9mIHVubWFza2VkIGNvbnRlbnQu CiAgICAgICAgIGlmIChtYXNrQm94SW1hZ2UpCi0gICAgICAgICAgICBhbGxNYXNrSW1hZ2VzTG9h ZGVkICY9IG1hc2tCb3hJbWFnZS0+aXNMb2FkZWQoKTsKKyAgICAgICAgICAgIGFsbE1hc2tJbWFn ZXNDYW5CZVJlbmRlcmVkRW50aXJlbHkgJj0gY2FuUmVuZGVyRW50aXJlSW1hZ2UobWFza0JveElt YWdlKTsKIAogICAgICAgICBpZiAobWFza0xheWVycykKLSAgICAgICAgICAgIGFsbE1hc2tJbWFn ZXNMb2FkZWQgJj0gbWFza0xheWVycy0+aW1hZ2VzQXJlTG9hZGVkKCk7CisgICAgICAgICAgICBh bGxNYXNrSW1hZ2VzQ2FuQmVSZW5kZXJlZEVudGlyZWx5ICY9IG1hc2tMYXllcnMtPmNhblJlbmRl ckVudGlyZUltYWdlKHRoaXMpOwogCiAgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5zZXRDb21w b3NpdGVPcGVyYXRpb24oQ29tcG9zaXRlRGVzdGluYXRpb25Jbik7CiAgICAgICAgIHBhaW50SW5m by5jb250ZXh0LT5iZWdpblRyYW5zcGFyZW5jeUxheWVyKDEpOwogICAgICAgICBjb21wb3NpdGVP cCA9IENvbXBvc2l0ZVNvdXJjZU92ZXI7CiAgICAgfQogCi0gICAgaWYgKGFsbE1hc2tJbWFnZXNM b2FkZWQpIHsKKyAgICBpZiAoYWxsTWFza0ltYWdlc0NhbkJlUmVuZGVyZWRFbnRpcmVseSkgewog ICAgICAgICBwYWludEZpbGxMYXllcnMocGFpbnRJbmZvLCBDb2xvcigpLCBzdHlsZSgpLT5tYXNr TGF5ZXJzKCksIHBhaW50UmVjdCwgQmFja2dyb3VuZEJsZWVkTm9uZSwgY29tcG9zaXRlT3ApOwog ICAgICAgICBwYWludE5pbmVQaWVjZUltYWdlKHBhaW50SW5mby5jb250ZXh0LCBwYWludFJlY3Qs IHN0eWxlKCksIHN0eWxlKCktPm1hc2tCb3hJbWFnZSgpLCBjb21wb3NpdGVPcCk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAK aW5kZXggYTM1YTIwNmUyY2ZhYjBhMDgzMjEzOTAwOGNmMTNmNzE1ZGFiYTBiMy4uZDRmY2I2NDQ4 YmM5N2IxODRjMDRmZmY1ZDMzZGE3Nzg5MTU1MzgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAj aW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUmVuZGVyQm94TW9kZWxPYmplY3QuaCIKIAor I2luY2x1ZGUgIkJpdG1hcEltYWdlLmgiCiAjaW5jbHVkZSAiRmlsdGVyT3BlcmF0aW9ucy5oIgog I2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkhUTUxGcmFtZU93bmVyRWxl bWVudC5oIgpAQCAtOTE5LDkgKzkyMCw5IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBh aW50RmlsbExheWVyRXh0ZW5kZWQoY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvCiAgICAg ICAgIGlmICghZ2VvbWV0cnkuZGVzdFJlY3QoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIENv bXBvc2l0ZU9wZXJhdG9yIGNvbXBvc2l0ZU9wID0gb3AgPT0gQ29tcG9zaXRlU291cmNlT3ZlciA/ IGJnTGF5ZXItPmNvbXBvc2l0ZSgpIDogb3A7CiAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIGNs aWVudEZvckJhY2tncm91bmRJbWFnZSA9IGJhY2tncm91bmRPYmplY3QgPyBiYWNrZ3JvdW5kT2Jq ZWN0IDogdGhpczsKLSAgICAgICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBiZ0ltYWdlLT5p bWFnZShjbGllbnRGb3JCYWNrZ3JvdW5kSW1hZ2UsIGdlb21ldHJ5LnRpbGVTaXplKCkpOwotICAg ICAgICAgICAgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGluZyA9IHNob3VsZFBhaW50QXRMb3dRdWFs aXR5KGNvbnRleHQsIGltYWdlLmdldCgpLCBiZ0xheWVyLCBnZW9tZXRyeS50aWxlU2l6ZSgpKTsK LSAgICAgICAgICAgIGNvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBzdHlsZSgp LT5jb2xvclNwYWNlKCksIGdlb21ldHJ5LmRlc3RSZWN0KCksIGdlb21ldHJ5LnJlbGF0aXZlUGhh c2UoKSwgZ2VvbWV0cnkudGlsZVNpemUoKSwgCisgICAgICAgICAgICBJbWFnZSogaW1hZ2UgPSB0 b1JldGFpbmVkTW9kZUJpdG1hcEltYWdlSWZQb3NzaWJsZShiZ0ltYWdlLT5pbWFnZShjbGllbnRG b3JCYWNrZ3JvdW5kSW1hZ2UsIGdlb21ldHJ5LnRpbGVTaXplKCkpLmdldCgpKTsKKyAgICAgICAg ICAgIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxpbmcgPSBzaG91bGRQYWludEF0TG93UXVhbGl0eShj b250ZXh0LCBpbWFnZSwgYmdMYXllciwgZ2VvbWV0cnkudGlsZVNpemUoKSk7CisgICAgICAgICAg ICBjb250ZXh0LT5kcmF3VGlsZWRJbWFnZShpbWFnZSwgc3R5bGUoKS0+Y29sb3JTcGFjZSgpLCBn ZW9tZXRyeS5kZXN0UmVjdCgpLCBnZW9tZXRyeS5yZWxhdGl2ZVBoYXNlKCksIGdlb21ldHJ5LnRp bGVTaXplKCksCiAgICAgICAgICAgICAgICAgY29tcG9zaXRlT3AsIHVzZUxvd1F1YWxpdHlTY2Fs aW5nKTsKICAgICAgICAgfQogICAgIH0KQEAgLTEyMjYsNyArMTIyNyw3IEBAIGJvb2wgUmVuZGVy Qm94TW9kZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UoR3JhcGhpY3NDb250ZXh0KiBncmFw aGljc0NvbnRleHQsCiAgICAgaWYgKCFzdHlsZUltYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBpZiAoIXN0eWxlSW1hZ2UtPmlzTG9hZGVkKCkpCisgICAgaWYgKCFjYW5SZW5kZXJF bnRpcmVJbWFnZShzdHlsZUltYWdlKSkKICAgICAgICAgcmV0dXJuIHRydWU7IC8vIE5ldmVyIHBh aW50IGEgbmluZS1waWVjZSBpbWFnZSBpbmNyZW1lbnRhbGx5LCBidXQgZG9uJ3QgcGFpbnQgdGhl IGZhbGxiYWNrIGJvcmRlcnMgZWl0aGVyLgogCiAgICAgaWYgKCFzdHlsZUltYWdlLT5jYW5SZW5k ZXIodGhpcywgc3R5bGUtPmVmZmVjdGl2ZVpvb20oKSkpCkBAIC0xMjkwLDcgKzEyOTEsNyBAQCBi b29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludE5pbmVQaWVjZUltYWdlKEdyYXBoaWNzQ29u dGV4dCogZ3JhcGhpY3NDb250ZXh0LAogICAgIGJvb2wgZHJhd01pZGRsZSA9IG5pbmVQaWVjZUlt YWdlLmZpbGwoKSAmJiAoaW1hZ2VXaWR0aCAtIGxlZnRTbGljZSAtIHJpZ2h0U2xpY2UpID4gMCAm JiAoYm9yZGVySW1hZ2VSZWN0LndpZHRoKCkgLSBsZWZ0V2lkdGggLSByaWdodFdpZHRoKSA+IDAK ICAgICAgICAgICAgICAgICAgICAgICAmJiAoaW1hZ2VIZWlnaHQgLSB0b3BTbGljZSAtIGJvdHRv bVNsaWNlKSA+IDAgJiYgKGJvcmRlckltYWdlUmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90 dG9tV2lkdGgpID4gMDsKIAotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBzdHlsZUltYWdlLT5p bWFnZSh0aGlzLCBpbWFnZVNpemUpOworICAgIEltYWdlKiBpbWFnZSA9IHRvUmV0YWluZWRNb2Rl Qml0bWFwSW1hZ2VJZlBvc3NpYmxlKHN0eWxlSW1hZ2UtPmltYWdlKHRoaXMsIGltYWdlU2l6ZSku Z2V0KCkpOwogICAgIENvbG9yU3BhY2UgY29sb3JTcGFjZSA9IHN0eWxlLT5jb2xvclNwYWNlKCk7 CiAgICAgCiAgICAgZmxvYXQgZGVzdGluYXRpb25XaWR0aCA9IGJvcmRlckltYWdlUmVjdC53aWR0 aCgpIC0gbGVmdFdpZHRoIC0gcmlnaHRXaWR0aDsKQEAgLTEzMTAsMTkgKzEzMTEsMTkgQEAgYm9v bCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRl eHQqIGdyYXBoaWNzQ29udGV4dCwKICAgICAgICAgLy8gVGhlIHRvcCBsZWZ0IGNvcm5lciByZWN0 IGlzICh0eCwgdHksIGxlZnRXaWR0aCwgdG9wV2lkdGgpCiAgICAgICAgIC8vIFRoZSByZWN0IHRv IHVzZSBmcm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgb2J0YWluZWQgZnJvbSBvdXIgc2xpY2UsIGFu ZCBpcyAoMCwgMCwgbGVmdFNsaWNlLCB0b3BTbGljZSkKICAgICAgICAgaWYgKGRyYXdUb3ApCi0g ICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JT cGFjZSwgSW50UmVjdChib3JkZXJJbWFnZVJlY3QubG9jYXRpb24oKSwgSW50U2l6ZShsZWZ0V2lk dGgsIHRvcFdpZHRoKSksCisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShp bWFnZSwgY29sb3JTcGFjZSwgSW50UmVjdChib3JkZXJJbWFnZVJlY3QubG9jYXRpb24oKSwgSW50 U2l6ZShsZWZ0V2lkdGgsIHRvcFdpZHRoKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBMYXlvdXRSZWN0KDAsIDAsIGxlZnRTbGljZSwgdG9wU2xpY2UpLCBvcCk7CiAK ICAgICAgICAgLy8gVGhlIGJvdHRvbSBsZWZ0IGNvcm5lciByZWN0IGlzICh0eCwgdHkgKyBoIC0g Ym90dG9tV2lkdGgsIGxlZnRXaWR0aCwgYm90dG9tV2lkdGgpCiAgICAgICAgIC8vIFRoZSByZWN0 IHRvIHVzZSBmcm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgKDAsIGltYWdlSGVpZ2h0IC0gYm90dG9t U2xpY2UsIGxlZnRTbGljZSwgYm90b21TbGljZSkKICAgICAgICAgaWYgKGRyYXdCb3R0b20pCi0g ICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JT cGFjZSwgSW50UmVjdChib3JkZXJJbWFnZVJlY3QueCgpLCBib3JkZXJJbWFnZVJlY3QubWF4WSgp IC0gYm90dG9tV2lkdGgsIGxlZnRXaWR0aCwgYm90dG9tV2lkdGgpLAorICAgICAgICAgICAgZ3Jh cGhpY3NDb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UsIGNvbG9yU3BhY2UsIEludFJlY3QoYm9yZGVy SW1hZ2VSZWN0LngoKSwgYm9yZGVySW1hZ2VSZWN0Lm1heFkoKSAtIGJvdHRvbVdpZHRoLCBsZWZ0 V2lkdGgsIGJvdHRvbVdpZHRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIExheW91dFJlY3QoMCwgaW1hZ2VIZWlnaHQgLSBib3R0b21TbGljZSwgbGVmdFNsaWNlLCBi b3R0b21TbGljZSksIG9wKTsKIAogICAgICAgICAvLyBQYWludCB0aGUgbGVmdCBlZGdlLgogICAg ICAgICAvLyBIYXZlIHRvIHNjYWxlIGFuZCB0aWxlIGludG8gdGhlIGJvcmRlciByZWN0LgogICAg ICAgICBpZiAoc291cmNlSGVpZ2h0ID4gMCkKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ ZHJhd1RpbGVkSW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QoYm9yZGVySW1h Z2VSZWN0LngoKSwgYm9yZGVySW1hZ2VSZWN0LnkoKSArIHRvcFdpZHRoLCBsZWZ0V2lkdGgsCisg ICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLCBjb2xvclNw YWNlLCBJbnRSZWN0KGJvcmRlckltYWdlUmVjdC54KCksIGJvcmRlckltYWdlUmVjdC55KCkgKyB0 b3BXaWR0aCwgbGVmdFdpZHRoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkZXN0aW5hdGlvbkhlaWdodCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEludFJlY3QoMCwgdG9wU2xpY2UsIGxlZnRTbGljZSwgc291cmNlSGVp Z2h0KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmxvYXRT aXplKGxlZnRTaWRlU2NhbGUsIGxlZnRTaWRlU2NhbGUpLCBJbWFnZTo6U3RyZXRjaFRpbGUsIChJ bWFnZTo6VGlsZVJ1bGUpdlJ1bGUsIG9wKTsKQEAgLTEzMzMsMTggKzEzMzQsMTggQEAgYm9vbCBS ZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRleHQq IGdyYXBoaWNzQ29udGV4dCwKICAgICAgICAgLy8gVGhlIHRvcCByaWdodCBjb3JuZXIgcmVjdCBp cyAodHggKyB3IC0gcmlnaHRXaWR0aCwgdHksIHJpZ2h0V2lkdGgsIHRvcFdpZHRoKQogICAgICAg ICAvLyBUaGUgcmVjdCB0byB1c2UgZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlzIG9idGFpbmVkIGZy b20gb3VyIHNsaWNlLCBhbmQgaXMgKGltYWdlV2lkdGggLSByaWdodFNsaWNlLCAwLCByaWdodFNs aWNlLCB0b3BTbGljZSkKICAgICAgICAgaWYgKGRyYXdUb3ApCi0gICAgICAgICAgICBncmFwaGlj c0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwgSW50UmVjdChib3Jk ZXJJbWFnZVJlY3QubWF4WCgpIC0gcmlnaHRXaWR0aCwgYm9yZGVySW1hZ2VSZWN0LnkoKSwgcmln aHRXaWR0aCwgdG9wV2lkdGgpLAorICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1h Z2UoaW1hZ2UsIGNvbG9yU3BhY2UsIEludFJlY3QoYm9yZGVySW1hZ2VSZWN0Lm1heFgoKSAtIHJp Z2h0V2lkdGgsIGJvcmRlckltYWdlUmVjdC55KCksIHJpZ2h0V2lkdGgsIHRvcFdpZHRoKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIExheW91dFJlY3QoaW1hZ2VXaWR0 aCAtIHJpZ2h0U2xpY2UsIDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNlKSwgb3ApOwogCiAgICAgICAg IC8vIFRoZSBib3R0b20gcmlnaHQgY29ybmVyIHJlY3QgaXMgKHR4ICsgdyAtIHJpZ2h0V2lkdGgs IHR5ICsgaCAtIGJvdHRvbVdpZHRoLCByaWdodFdpZHRoLCBib3R0b21XaWR0aCkKICAgICAgICAg Ly8gVGhlIHJlY3QgdG8gdXNlIGZyb20gd2l0aGluIHRoZSBpbWFnZSBpcyAoaW1hZ2VXaWR0aCAt IHJpZ2h0U2xpY2UsIGltYWdlSGVpZ2h0IC0gYm90dG9tU2xpY2UsIHJpZ2h0U2xpY2UsIGJvdHRv bVNsaWNlKQogICAgICAgICBpZiAoZHJhd0JvdHRvbSkKLSAgICAgICAgICAgIGdyYXBoaWNzQ29u dGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KGJvcmRlcklt YWdlUmVjdC5tYXhYKCkgLSByaWdodFdpZHRoLCBib3JkZXJJbWFnZVJlY3QubWF4WSgpIC0gYm90 dG9tV2lkdGgsIHJpZ2h0V2lkdGgsIGJvdHRvbVdpZHRoKSwKKyAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLCBjb2xvclNwYWNlLCBJbnRSZWN0KGJvcmRlckltYWdl UmVjdC5tYXhYKCkgLSByaWdodFdpZHRoLCBib3JkZXJJbWFnZVJlY3QubWF4WSgpIC0gYm90dG9t V2lkdGgsIHJpZ2h0V2lkdGgsIGJvdHRvbVdpZHRoKSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIExheW91dFJlY3QoaW1hZ2VXaWR0aCAtIHJpZ2h0U2xpY2UsIGltYWdl SGVpZ2h0IC0gYm90dG9tU2xpY2UsIHJpZ2h0U2xpY2UsIGJvdHRvbVNsaWNlKSwgb3ApOwogCiAg ICAgICAgIC8vIFBhaW50IHRoZSByaWdodCBlZGdlLgogICAgICAgICBpZiAoc291cmNlSGVpZ2h0 ID4gMCkKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1RpbGVkSW1hZ2UoaW1hZ2Uu Z2V0KCksIGNvbG9yU3BhY2UsIEludFJlY3QoYm9yZGVySW1hZ2VSZWN0Lm1heFgoKSAtIHJpZ2h0 V2lkdGgsIGJvcmRlckltYWdlUmVjdC55KCkgKyB0b3BXaWR0aCwgcmlnaHRXaWR0aCwKKyAgICAg ICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1RpbGVkSW1hZ2UoaW1hZ2UsIGNvbG9yU3BhY2Us IEludFJlY3QoYm9yZGVySW1hZ2VSZWN0Lm1heFgoKSAtIHJpZ2h0V2lkdGgsIGJvcmRlckltYWdl UmVjdC55KCkgKyB0b3BXaWR0aCwgcmlnaHRXaWR0aCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGVzdGluYXRpb25IZWlnaHQpLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJbnRSZWN0KGltYWdlV2lkdGggLSByaWdodFNs aWNlLCB0b3BTbGljZSwgcmlnaHRTbGljZSwgc291cmNlSGVpZ2h0KSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmxvYXRTaXplKHJpZ2h0U2lkZVNjYWxlLCBy aWdodFNpZGVTY2FsZSksCkBAIC0xMzUzLDEzICsxMzU0LDEzIEBAIGJvb2wgUmVuZGVyQm94TW9k ZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0Nv bnRleHQsCiAKICAgICAvLyBQYWludCB0aGUgdG9wIGVkZ2UuCiAgICAgaWYgKGRyYXdUb3AgJiYg c291cmNlV2lkdGggPiAwKQotICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdl KGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRSZWN0KGJvcmRlckltYWdlUmVjdC54KCkgKyBs ZWZ0V2lkdGgsIGJvcmRlckltYWdlUmVjdC55KCksIGRlc3RpbmF0aW9uV2lkdGgsIHRvcFdpZHRo KSwKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3VGlsZWRJbWFnZShpbWFnZSwgY29sb3JT cGFjZSwgSW50UmVjdChib3JkZXJJbWFnZVJlY3QueCgpICsgbGVmdFdpZHRoLCBib3JkZXJJbWFn ZVJlY3QueSgpLCBkZXN0aW5hdGlvbldpZHRoLCB0b3BXaWR0aCksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgSW50UmVjdChsZWZ0U2xpY2UsIDAsIHNvdXJjZVdpZHRo LCB0b3BTbGljZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmxv YXRTaXplKHRvcFNpZGVTY2FsZSwgdG9wU2lkZVNjYWxlKSwgKEltYWdlOjpUaWxlUnVsZSloUnVs ZSwgSW1hZ2U6OlN0cmV0Y2hUaWxlLCBvcCk7CiAKICAgICAvLyBQYWludCB0aGUgYm90dG9tIGVk Z2UuCiAgICAgaWYgKGRyYXdCb3R0b20gJiYgc291cmNlV2lkdGggPiAwKQotICAgICAgICBncmFw aGljc0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBJbnRS ZWN0KGJvcmRlckltYWdlUmVjdC54KCkgKyBsZWZ0V2lkdGgsIGJvcmRlckltYWdlUmVjdC5tYXhZ KCkgLSBib3R0b21XaWR0aCwKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3VGlsZWRJbWFn ZShpbWFnZSwgY29sb3JTcGFjZSwgSW50UmVjdChib3JkZXJJbWFnZVJlY3QueCgpICsgbGVmdFdp ZHRoLCBib3JkZXJJbWFnZVJlY3QubWF4WSgpIC0gYm90dG9tV2lkdGgsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVzdGluYXRpb25XaWR0aCwgYm90dG9tV2lkdGgp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEludFJlY3QobGVmdFNs aWNlLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCBzb3VyY2VXaWR0aCwgYm90dG9tU2xpY2Up LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZsb2F0U2l6ZShib3R0 b21TaWRlU2NhbGUsIGJvdHRvbVNpZGVTY2FsZSksCkBAIC0xMzg3LDcgKzEzODgsNyBAQCBib29s IFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludE5pbmVQaWVjZUltYWdlKEdyYXBoaWNzQ29udGV4 dCogZ3JhcGhpY3NDb250ZXh0LAogICAgICAgICBpZiAodlJ1bGUgPT0gU3RyZXRjaEltYWdlUnVs ZSkKICAgICAgICAgICAgIG1pZGRsZVNjYWxlRmFjdG9yLnNldEhlaWdodChkZXN0aW5hdGlvbkhl aWdodCAvIHNvdXJjZUhlaWdodCk7CiAgICAgICAgIAotICAgICAgICBncmFwaGljc0NvbnRleHQt PmRyYXdUaWxlZEltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLAorICAgICAgICBncmFwaGlj c0NvbnRleHQtPmRyYXdUaWxlZEltYWdlKGltYWdlLCBjb2xvclNwYWNlLAogICAgICAgICAgICAg SW50UmVjdChib3JkZXJJbWFnZVJlY3QueCgpICsgbGVmdFdpZHRoLCBib3JkZXJJbWFnZVJlY3Qu eSgpICsgdG9wV2lkdGgsIGRlc3RpbmF0aW9uV2lkdGgsIGRlc3RpbmF0aW9uSGVpZ2h0KSwKICAg ICAgICAgICAgIEludFJlY3QobGVmdFNsaWNlLCB0b3BTbGljZSwgc291cmNlV2lkdGgsIHNvdXJj ZUhlaWdodCksCiAgICAgICAgICAgICBtaWRkbGVTY2FsZUZhY3RvciwgKEltYWdlOjpUaWxlUnVs ZSloUnVsZSwgKEltYWdlOjpUaWxlUnVsZSl2UnVsZSwgb3ApOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCBkZWI2NjA3OWM3ZjllOTkwOTBiMGVmZGQ2MDUy NDRjYTI3MmM0MDVjLi40MDg1YzU0MmMxOTM5YjQzOWZjYTYxMGRjZDhmNjYyOGUyODY2ZDc0IDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMjgsNiArMjgs NyBAQAogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogCiAjaW5jbHVkZSAiQVhPYmplY3RDYWNo ZS5oIgorI2luY2x1ZGUgIkJpdG1hcEltYWdlLmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5j bHVkZSAiQ29udGVudERhdGEuaCIKICNpbmNsdWRlICJDdXJzb3JMaXN0LmgiCkBAIC04MTIsMTIg KzgxMywyNyBAQCBzdGF0aWMgYm9vbCBtdXN0UmVwYWludEZpbGxMYXllcnMoY29uc3QgUmVuZGVy T2JqZWN0KiByZW5kZXJlciwgY29uc3QgRmlsbExheWVyKgogICAgIHJldHVybiBmYWxzZTsKIH0K IAotYm9vbCBSZW5kZXJPYmplY3Q6OmJvcmRlckltYWdlSXNMb2FkZWRBbmRDYW5CZVJlbmRlcmVk KCkgY29uc3QKKy8vIFdpdGggcGFyYWxsZWwgaW1hZ2UgZGVjb2RlcnMsIGxvYWRpbmcgZG9uZSBk b2VzIG5vdCBhbHdheXMgbWVhbiB0aGUgd2hvbGUgaW1hZ2UgY2FuIGJlIHJlbmRlcmVkLgorLy8g SWYgdGhlIGdpdmVuIGltYWdlIGlzIGEgQml0bWFwSW1hZ2UsIHdlIG5lZWQgdG8gY2hlY2sgaWYg ZGVjb2RpbmcgaXMgY29tcGxldGVkIGluIGFkZGl0aW9uIHRvIGxvYWRpbmcgZG9uZS4KK2Jvb2wg UmVuZGVyT2JqZWN0OjpjYW5SZW5kZXJFbnRpcmVJbWFnZShTdHlsZUltYWdlKiBzdHlsZUltYWdl KSBjb25zdAoreworICAgIGlmIChzdHlsZUltYWdlICYmICFzdHlsZUltYWdlLT5pc0xvYWRlZCgp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoc3R5bGVJbWFnZSAmJiAoc3R5bGVJ bWFnZS0+aXNDYWNoZWRJbWFnZSgpIHx8IHN0eWxlSW1hZ2UtPmlzQ2FjaGVkSW1hZ2VTZXQoKSkp IHsKKyAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IHN0eWxlSW1hZ2UtPmltYWdlKGNvbnN0 X2Nhc3Q8UmVuZGVyT2JqZWN0Kj4odGhpcyksIEludFNpemUoKSk7CisgICAgICAgIGlmIChpbWFn ZS5nZXQoKSAmJiBpbWFnZS0+aXNCaXRtYXBJbWFnZSgpICYmICF0b1JldGFpbmVkTW9kZUJpdG1h cEltYWdlKGltYWdlLmdldCgpKS0+Y3VycmVudEZyYW1lSXNDb21wbGV0ZSgpKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKworYm9vbCBSZW5k ZXJPYmplY3Q6OmNhblJlbmRlckVudGlyZUJvcmRlckltYWdlKCkgY29uc3QKIHsKICAgICBBU1NF UlQoc3R5bGUoKS0+aGFzQm9yZGVyKCkpOwogCiAgICAgU3R5bGVJbWFnZSogYm9yZGVySW1hZ2Ug PSBzdHlsZSgpLT5ib3JkZXJJbWFnZSgpLmltYWdlKCk7Ci0gICAgcmV0dXJuIGJvcmRlckltYWdl ICYmIGJvcmRlckltYWdlLT5jYW5SZW5kZXIodGhpcywgc3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgp KSAmJiBib3JkZXJJbWFnZS0+aXNMb2FkZWQoKTsKKyAgICByZXR1cm4gYm9yZGVySW1hZ2UgJiYg Ym9yZGVySW1hZ2UtPmNhblJlbmRlcih0aGlzLCBzdHlsZSgpLT5lZmZlY3RpdmVab29tKCkpICYm IGNhblJlbmRlckVudGlyZUltYWdlKGJvcmRlckltYWdlKTsKIH0KIAogYm9vbCBSZW5kZXJPYmpl Y3Q6Om11c3RSZXBhaW50QmFja2dyb3VuZE9yQm9yZGVyKCkgY29uc3QKQEAgLTgzMyw3ICs4NDks NyBAQCBib29sIFJlbmRlck9iamVjdDo6bXVzdFJlcGFpbnRCYWNrZ3JvdW5kT3JCb3JkZXIoKSBj b25zdAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgCiAgICAgLy8gT3VyIGZpbGwgbGF5ZXJz IGFyZSBvay4gIExldCdzIGNoZWNrIGJvcmRlci4KLSAgICBpZiAoc3R5bGUoKS0+aGFzQm9yZGVy KCkgJiYgYm9yZGVySW1hZ2VJc0xvYWRlZEFuZENhbkJlUmVuZGVyZWQoKSkKKyAgICBpZiAoc3R5 bGUoKS0+aGFzQm9yZGVyKCkgJiYgY2FuUmVuZGVyRW50aXJlQm9yZGVySW1hZ2UoKSkKICAgICAg ICAgcmV0dXJuIHRydWU7CiAKICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggNjBjNTY5MDljY2I1Y2UwZGU2NjdjZDk3NjdlYjMxZjA3 YjRiMWUyZS4uYjU1NTFkYjI3ZjUyOTg5MjZmNDY2NmFmMWY0NTBhNzQ4NDUxNDc0YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtNTE0LDcgKzUxNCw4IEBAIHB1 YmxpYzoKICAgICBib29sIGhhc0xheWVyKCkgY29uc3QgeyByZXR1cm4gbV9iaXRmaWVsZHMuaGFz TGF5ZXIoKTsgfQogICAgIAogICAgIGJvb2wgaGFzQm94RGVjb3JhdGlvbnMoKSBjb25zdCB7IHJl dHVybiBtX2JpdGZpZWxkcy5wYWludEJhY2tncm91bmQoKTsgfQotICAgIGJvb2wgYm9yZGVySW1h Z2VJc0xvYWRlZEFuZENhbkJlUmVuZGVyZWQoKSBjb25zdDsKKyAgICBib29sIGNhblJlbmRlckVu dGlyZUltYWdlKFN0eWxlSW1hZ2UqKSBjb25zdDsKKyAgICBib29sIGNhblJlbmRlckVudGlyZUJv cmRlckltYWdlKCkgY29uc3Q7CiAgICAgYm9vbCBtdXN0UmVwYWludEJhY2tncm91bmRPckJvcmRl cigpIGNvbnN0OwogICAgIGJvb2wgaGFzQmFja2dyb3VuZCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxl KCktPmhhc0JhY2tncm91bmQoKTsgfQogICAgIGJvb2wgbmVlZHNMYXlvdXQoKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0ZpbGxMYXllci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmNwcAppbmRleCAxOTVhMDVj NWRkMTNhYTQzOTcwZmJkYzdlNmU5MGVlYjA3YzQ0NTUwLi5jNGFiMWNiZTc3NzM3ZTc4NzJlNzU0 NGUzMmY2YzdkMDg0OGNmYTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvRmlsbExheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv RmlsbExheWVyLmNwcApAQCAtMjIsNiArMjIsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2lu Y2x1ZGUgIkZpbGxMYXllci5oIgogCisjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCisKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFNhbWVTaXplQXNGaWxsTGF5ZXIgewpAQCAtMjY5LDEx ICsyNzEsMTEgQEAgYm9vbCBGaWxsTGF5ZXI6OmNvbnRhaW5zSW1hZ2UoU3R5bGVJbWFnZSogcykg Y29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgRmlsbExheWVyOjppbWFnZXNBcmVM b2FkZWQoKSBjb25zdAorYm9vbCBGaWxsTGF5ZXI6OmNhblJlbmRlckVudGlyZUltYWdlKFJlbmRl ck9iamVjdCogcmVuZGVyZXIpIGNvbnN0CiB7CiAgICAgY29uc3QgRmlsbExheWVyKiBjdXJyOwog ICAgIGZvciAoY3VyciA9IHRoaXM7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0KCkpIHsKLSAgICAg ICAgaWYgKGN1cnItPm1faW1hZ2UgJiYgIWN1cnItPm1faW1hZ2UtPmlzTG9hZGVkKCkpCisgICAg ICAgIGlmIChjdXJyLT5tX2ltYWdlICYmICFyZW5kZXJlci0+Y2FuUmVuZGVyRW50aXJlSW1hZ2Uo Y3Vyci0+bV9pbWFnZS5nZXQoKSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmgKaW5kZXggN2YxY2Vi MTQ4MDE3ZmE0OTA1YzQyMjIyN2IyZThlN2M2NGY4ODJmYS4uZTIxMGQ2MzgwZmFmMDgxZjU4MWU2 MmI4NjEzODU2YWFiZWI1NTExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL0ZpbGxMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9G aWxsTGF5ZXIuaApAQCAtMzQsNiArMzQsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2Ns YXNzIFJlbmRlck9iamVjdDsKKwogc3RydWN0IEZpbGxTaXplIHsKICAgICBGaWxsU2l6ZSgpCiAg ICAgICAgIDogdHlwZShTaXplTGVuZ3RoKQpAQCAtMTI4LDcgKzEzMCw3IEBAIHB1YmxpYzoKICAg ICB9CiAKICAgICBib29sIGNvbnRhaW5zSW1hZ2UoU3R5bGVJbWFnZSopIGNvbnN0OwotICAgIGJv b2wgaW1hZ2VzQXJlTG9hZGVkKCkgY29uc3Q7CisgICAgYm9vbCBjYW5SZW5kZXJFbnRpcmVJbWFn ZShSZW5kZXJPYmplY3QqKSBjb25zdDsKIAogICAgIGJvb2wgaGFzSW1hZ2UoKSBjb25zdAogICAg IHsK