71407 2011-11-02 14:28:48 -0700 [Mac] Add API to get rendered text image without having to select it 2011-11-02 14:46:37 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz oldest_to_newest 494909 0 mitz 2011-11-02 14:28:48 -0700 Add API to get rendered text image without having to select it 494912 1 mitz 2011-11-02 14:29:37 -0700 <rdar://problem/10336700> 494914 2 113379 mitz 2011-11-02 14:33:49 -0700 Created attachment 113379 Add -[DOMRange renderedImageForcingBlackText:] 494931 3 mitz 2011-11-02 14:46:37 -0700 Committed r99099. http://trac.webkit.org/changeset/99099 113379 2011-11-02 14:33:49 -0700 2011-11-02 14:42:37 -0700 Add -[DOMRange renderedImageForcingBlackText:] bug-71407-20111102143348.patch text/plain 15718 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDk2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMTEtMDIgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTAzMzY3 MDA+IEFkZCBBUEkgdG8gZ2V0IHJlbmRlcmVkIHRleHQgaW1hZ2Ugd2l0aG91dCBoYXZpbmcgdG8g c2VsZWN0IGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03MTQwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1JlbmRlcmVkSW1hZ2VGcm9tRE9NUmFuZ2Uu bW0KKworICAgICAgICAqIGJpbmRpbmdzL29iamMvRE9NLm1tOgorICAgICAgICAoLVtET01SYW5n ZSByZW5kZXJlZEltYWdlRm9yY2luZ0JsYWNrVGV4dDpdKTogQWRkZWQuCisgICAgICAgICogYmlu ZGluZ3Mvb2JqYy9ET01Qcml2YXRlLmg6CisgICAgICAgICogcGFnZS9GcmFtZS5oOgorICAgICAg ICAqIHBhZ2UvbWFjL0ZyYW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnJhbmdl SW1hZ2UpOiBBZGRlZC4gU2V0cyB0aGUgc2VsZWN0aW9uIGluIHRoZSBSZW5kZXJWaWV3IChvbmx5 KSBiYXNlZCBvbiB0aGUKKyAgICAgICAgZ2l2ZW4gcmFuZ2UgYW5kIGdldHMgYSBzZWxlY3Rpb24t b25seSByZW5kZXJpbmcgb2YgdGhlIHZpZXcsIHRoZW4gcmVzdG9yZXMgdGhlIHNlbGVjdGlvbi4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24pOiBTa2lwIGFsbCBpbnZhbGlkYXRpb24gaWYgdGhlIHJl cGFpbnQgYmVoYXZpb3IgaXMgUmVwYWludE5vdGhpbmcuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJWaWV3OjpnZXRTZWxlY3Rpb24pOiBBZGRlZCB0aGlzIGdldHRlci4KKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVmlldy5oOgorCiAyMDExLTExLTAyICBUb20gU2VwZXogIDx0c2VwZXpAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFhTU0F1ZGl0b3IgaXMgc2lsZW50CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9vYmpjL0RPTS5tbQkocmV2aXNpb24gOTkwNjgpCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9vYmpjL0RPTS5tbQkod29ya2luZyBjb3B5KQpAQCAtNDAzLDYgKzQwMywxNiBA QCAtIChOU1JlY3QpYm91bmRpbmdCb3gKICAgICByZXR1cm4gY29yZShzZWxmKS0+Ym91bmRpbmdC b3goKTsKIH0KIAorLSAoTlNJbWFnZSAqKXJlbmRlcmVkSW1hZ2VGb3JjaW5nQmxhY2tUZXh0OihC T09MKWZvcmNlQmxhY2tUZXh0Cit7CisgICAgV2ViQ29yZTo6UmFuZ2UqIHJhbmdlID0gY29yZShz ZWxmKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSByYW5nZS0+b3duZXJEb2N1bWVudCgp LT5mcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBy ZXR1cm4gZnJhbWUtPnJhbmdlSW1hZ2UocmFuZ2UsIGZvcmNlQmxhY2tUZXh0KTsKK30KKwogLSAo TlNBcnJheSAqKXRleHRSZWN0cwogewogICAgIC8vIEZJWE1FOiBUaGUgY2FsbCB0byB1cGRhdGVM YXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMgc2hvdWxkIGJlIG1vdmVkIGludG8gV2ViQ29y ZTo6UmFuZ2UuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTVByaXZhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTVByaXZhdGUu aAkocmV2aXNpb24gOTkwNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTVBy aXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBAaW50ZXJmYWNlIERPTVJh bmdlIChXZWJQcml2YXRlKQogCiBAaW50ZXJmYWNlIERPTVJhbmdlIChET01SYW5nZUV4dGVuc2lv bnMpCiAtIChOU1JlY3QpYm91bmRpbmdCb3g7CistIChOU0ltYWdlICopcmVuZGVyZWRJbWFnZUZv cmNpbmdCbGFja1RleHQ6KEJPT0wpZm9yY2VCbGFja1RleHQ7CiAtIChOU0FycmF5ICopbGluZUJv eFJlY3RzOyAvLyBEZXByZWNhdGVkLiBVc2UgdGV4dFJlY3RzIGluc3RlYWQuCiAtIChOU0FycmF5 ICopdGV4dFJlY3RzOwogQGVuZApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAkocmV2aXNpb24gOTkwNjgp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTE5Niw2 ICsxOTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIAogI2lmIFBMQVRGT1JNKE1B QykKICAgICAgICAgTlNJbWFnZSogc2VsZWN0aW9uSW1hZ2UoYm9vbCBmb3JjZUJsYWNrVGV4dCA9 IGZhbHNlKSBjb25zdDsKKyAgICAgICAgTlNJbWFnZSogcmFuZ2VJbWFnZShSYW5nZSosIGJvb2wg Zm9yY2VCbGFja1RleHQgPSBmYWxzZSkgY29uc3Q7CiAgICAgICAgIE5TSW1hZ2UqIHNuYXBzaG90 RHJhZ0ltYWdlKE5vZGUqLCBOU1JlY3QqIGltYWdlUmVjdCwgTlNSZWN0KiBlbGVtZW50UmVjdCkg Y29uc3Q7CiAgICAgICAgIE5TSW1hZ2UqIGltYWdlRnJvbVJlY3QoTlNSZWN0KSBjb25zdDsKICNl bmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRnJhbWVNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRnJhbWVNYWMubW0JKHJldmlzaW9uIDk5MDY4 KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRnJhbWVNYWMubW0JKHdvcmtpbmcgY29weSkK QEAgLTQ4LDYgKzQ4LDcgQEAKICNpbXBvcnQgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2ltcG9y dCAiUmVndWxhckV4cHJlc3Npb24uaCIKICNpbXBvcnQgIlJlbmRlclRhYmxlQ2VsbC5oIgorI2lt cG9ydCAiUmVuZGVyVmlldy5oIgogI2ltcG9ydCAiU2Nyb2xsYmFyLmgiCiAjaW1wb3J0ICJTaW1w bGVGb250RGF0YS5oIgogI2ltcG9ydCAidmlzaWJsZV91bml0cy5oIgpAQCAtMTA0LDYgKzEwNSw0 OCBAQCBOU0ltYWdlKiBGcmFtZTo6c2VsZWN0aW9uSW1hZ2UoYm9vbCBmb3JjCiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KIAorTlNJbWFnZSAqRnJhbWU6OnJhbmdlSW1hZ2UoUmFuZ2UqIHJhbmdlLCBi b29sIGZvcmNlQmxhY2tUZXh0KSBjb25zdAoreworICAgIG1fdmlldy0+c2V0UGFpbnRCZWhhdmlv cihQYWludEJlaGF2aW9yU2VsZWN0aW9uT25seSB8IChmb3JjZUJsYWNrVGV4dCA/IFBhaW50QmVo YXZpb3JGb3JjZUJsYWNrVGV4dCA6IDApKTsKKyAgICBtX2RvYy0+dXBkYXRlTGF5b3V0KCk7Cisg ICAgUmVuZGVyVmlldyogdmlldyA9IGNvbnRlbnRSZW5kZXJlcigpOworICAgIGlmICghdmlldykK KyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIFZpc2libGVTZWxlY3Rpb24gdmlzaWJsZVNlbGVj dGlvbihyYW5nZSk7CisKKyAgICBpZiAoIXZpc2libGVTZWxlY3Rpb24uaXNSYW5nZSgpKQorICAg ICAgICByZXR1cm4gbmlsOworCisgICAgUG9zaXRpb24gc3RhcnQgPSB2aXNpYmxlU2VsZWN0aW9u LnN0YXJ0KCk7CisgICAgUG9zaXRpb24gY2FuZGlkYXRlID0gc3RhcnQuZG93bnN0cmVhbSgpOwor ICAgIGlmIChjYW5kaWRhdGUuaXNDYW5kaWRhdGUoKSkKKyAgICAgICAgc3RhcnQgPSBjYW5kaWRh dGU7CisgICAgUG9zaXRpb24gZW5kID0gdmlzaWJsZVNlbGVjdGlvbi5lbmQoKTsKKyAgICBjYW5k aWRhdGUgPSBlbmQudXBzdHJlYW0oKTsKKyAgICBpZiAoY2FuZGlkYXRlLmlzQ2FuZGlkYXRlKCkp CisgICAgICAgIGVuZCA9IGNhbmRpZGF0ZTsKKworICAgIGlmIChzdGFydC5pc051bGwoKSB8fCBl bmQuaXNOdWxsKCkgfHwgdmlzaWJsZVNlbGVjdGlvbi52aXNpYmxlU3RhcnQoKSA9PSB2aXNpYmxl U2VsZWN0aW9uLnZpc2libGVFbmQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIFJlbmRl ck9iamVjdCogc2F2ZWRTdGFydFJlbmRlcmVyOworICAgIGludCBzYXZlZFN0YXJ0T2Zmc2V0Owor ICAgIFJlbmRlck9iamVjdCogc2F2ZWRFbmRSZW5kZXJlcjsKKyAgICBpbnQgc2F2ZWRFbmRPZmZz ZXQ7CisgICAgdmlldy0+Z2V0U2VsZWN0aW9uKHNhdmVkU3RhcnRSZW5kZXJlciwgc2F2ZWRTdGFy dE9mZnNldCwgc2F2ZWRFbmRSZW5kZXJlciwgc2F2ZWRFbmRPZmZzZXQpOworCisgICAgUmVuZGVy T2JqZWN0KiBzdGFydFJlbmRlcmVyID0gc3RhcnQuZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIo KTsKKyAgICBSZW5kZXJPYmplY3QqIGVuZFJlbmRlcmVyID0gZW5kLmRlcHJlY2F0ZWROb2RlKCkt PnJlbmRlcmVyKCk7CisKKyAgICB2aWV3LT5zZXRTZWxlY3Rpb24oc3RhcnRSZW5kZXJlciwgc3Rh cnQuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSwgZW5kUmVuZGVyZXIsIGVuZC5kZXByZWNhdGVk RWRpdGluZ09mZnNldCgpLCBSZW5kZXJWaWV3OjpSZXBhaW50Tm90aGluZyk7CisgICAgTlNJbWFn ZSogcmVzdWx0ID0gaW1hZ2VGcm9tUmVjdCh2aWV3LT5zZWxlY3Rpb25Cb3VuZHMoKSk7CisgICAg dmlldy0+c2V0U2VsZWN0aW9uKHNhdmVkU3RhcnRSZW5kZXJlciwgc2F2ZWRTdGFydE9mZnNldCwg c2F2ZWRFbmRSZW5kZXJlciwgc2F2ZWRFbmRPZmZzZXQsIFJlbmRlclZpZXc6OlJlcGFpbnROb3Ro aW5nKTsKKworICAgIG1fdmlldy0+c2V0UGFpbnRCZWhhdmlvcihQYWludEJlaGF2aW9yTm9ybWFs KTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBOU0ltYWdlKiBGcmFtZTo6c25hcHNob3REcmFn SW1hZ2UoTm9kZSogbm9kZSwgTlNSZWN0KiBpbWFnZVJlY3QsIE5TUmVjdCogZWxlbWVudFJlY3Qp IGNvbnN0CiB7CiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZpc2lvbiA5 OTA2OCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDg4LDcgKzQ4OCw4IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9u KFJlbmRlck9iamUKICAgICAgICAgbyA9IG8tPm5leHRJblByZU9yZGVyKCk7CiAgICAgfQogCi0g ICAgbV9sYXllci0+Y2xlYXJCbG9ja1NlbGVjdGlvbkdhcHNCb3VuZHMoKTsKKyAgICBpZiAoYmxv Y2tSZXBhaW50TW9kZSAhPSBSZXBhaW50Tm90aGluZykKKyAgICAgICAgbV9sYXllci0+Y2xlYXJC bG9ja1NlbGVjdGlvbkdhcHNCb3VuZHMoKTsKIAogICAgIC8vIE5vdyB0aGF0IHRoZSBzZWxlY3Rp b24gc3RhdGUgaGFzIGJlZW4gdXBkYXRlZCBmb3IgdGhlIG5ldyBvYmplY3RzLCB3YWxrIHRoZW0g YWdhaW4gYW5kCiAgICAgLy8gcHV0IHRoZW0gaW4gdGhlIG5ldyBvYmplY3RzIGxpc3QuCkBAIC01 MDksNyArNTEwLDcgQEAgdm9pZCBSZW5kZXJWaWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZQog ICAgICAgICBvID0gby0+bmV4dEluUHJlT3JkZXIoKTsKICAgICB9CiAKLSAgICBpZiAoIW1fZnJh bWVWaWV3KSB7CisgICAgaWYgKCFtX2ZyYW1lVmlldyB8fCBibG9ja1JlcGFpbnRNb2RlID09IFJl cGFpbnROb3RoaW5nKSB7CiAgICAgICAgIC8vIFdlIGJ1aWx0IHRoZSBtYXBzLCBidXQgd2UgYXJl bid0IGdvaW5nIHRvIHVzZSB0aGVtLgogICAgICAgICAvLyBXZSBuZWVkIHRvIGRlbGV0ZSB0aGUg dmFsdWVzLCBvdGhlcndpc2UgdGhleSdsbCBhbGwgbGVhayEKICAgICAgICAgZGVsZXRlQWxsVmFs dWVzKG9sZFNlbGVjdGVkT2JqZWN0cyk7CkBAIC01NzUsNiArNTc2LDE0IEBAIHZvaWQgUmVuZGVy Vmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamUKICAgICBtX2ZyYW1lVmlldy0+ZW5kRGVmZXJy ZWRSZXBhaW50cygpOwogfQogCit2b2lkIFJlbmRlclZpZXc6OmdldFNlbGVjdGlvbihSZW5kZXJP YmplY3QqJiBzdGFydFJlbmRlcmVyLCBpbnQmIHN0YXJ0T2Zmc2V0LCBSZW5kZXJPYmplY3QqJiBl bmRSZW5kZXJlciwgaW50JiBlbmRPZmZzZXQpIGNvbnN0Cit7CisgICAgc3RhcnRSZW5kZXJlciA9 IG1fc2VsZWN0aW9uU3RhcnQ7CisgICAgc3RhcnRPZmZzZXQgPSBtX3NlbGVjdGlvblN0YXJ0UG9z OworICAgIGVuZFJlbmRlcmVyID0gbV9zZWxlY3Rpb25FbmQ7CisgICAgZW5kT2Zmc2V0ID0gbV9z ZWxlY3Rpb25FbmRQb3M7Cit9CisKIHZvaWQgUmVuZGVyVmlldzo6Y2xlYXJTZWxlY3Rpb24oKQog ewogICAgIG1fbGF5ZXItPnJlcGFpbnRCbG9ja1NlbGVjdGlvbkdhcHMoKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAkocmV2aXNpb24gOTkwNjgpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC03Niw4ICs3 Niw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvJiwgY29uc3Qg TGF5b3V0UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRCb3hEZWNvcmF0aW9ucyhQYWlu dEluZm8mLCBjb25zdCBJbnRQb2ludCYpOwogCi0gICAgZW51bSBTZWxlY3Rpb25SZXBhaW50TW9k ZSB7IFJlcGFpbnROZXdYT1JPbGQsIFJlcGFpbnROZXdNaW51c09sZCB9OworICAgIGVudW0gU2Vs ZWN0aW9uUmVwYWludE1vZGUgeyBSZXBhaW50TmV3WE9ST2xkLCBSZXBhaW50TmV3TWludXNPbGQs IFJlcGFpbnROb3RoaW5nIH07CiAgICAgdm9pZCBzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBz dGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0 aW9uUmVwYWludE1vZGUgPSBSZXBhaW50TmV3WE9ST2xkKTsKKyAgICB2b2lkIGdldFNlbGVjdGlv bihSZW5kZXJPYmplY3QqJiBzdGFydFJlbmRlcmVyLCBpbnQmIHN0YXJ0T2Zmc2V0LCBSZW5kZXJP YmplY3QqJiBlbmRSZW5kZXJlciwgaW50JiBlbmRPZmZzZXQpIGNvbnN0OwogICAgIHZvaWQgY2xl YXJTZWxlY3Rpb24oKTsKICAgICBSZW5kZXJPYmplY3QqIHNlbGVjdGlvblN0YXJ0KCkgY29uc3Qg eyByZXR1cm4gbV9zZWxlY3Rpb25TdGFydDsgfQogICAgIFJlbmRlck9iamVjdCogc2VsZWN0aW9u RW5kKCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3Rpb25FbmQ7IH0KSW5kZXg6IFRvb2xzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDk2KQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTEt MDIgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAgICAgICA8cmRhcjovL3By b2JsZW0vMTAzMzY3MDA+IEFkZCBBUEkgdG8gZ2V0IHJlbmRlcmVkIHRleHQgaW1hZ2Ugd2l0aG91 dCBoYXZpbmcgdG8gc2VsZWN0IGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MTQwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvUmVuZGVyZWRJ bWFnZUZyb21ET01SYW5nZS5tbTogQWRkZWQuCisgICAgICAgICgtW1JlbmRlcmVkSW1hZ2VGcm9t RE9NUmFuZ2VGcmFtZUxvYWREZWxlZ2F0ZSB3ZWJWaWV3OmRpZEZpbmlzaExvYWRGb3JGcmFtZTpd KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDExLTExLTAyICBUb20gU2Vw ZXogIDx0c2VwZXpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFhTU0F1ZGl0b3IgaXMgc2lsZW50 CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gOTkwNjgpCisrKyBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29y a2luZyBjb3B5KQpAQCAtMjQsNiArMjQsNyBAQAogCQkzM0RDODkxNDE0MTk1NzlGMDA3NDdFRjcg LyogTG9hZENhbmNlbGVkTm9TZXJ2ZXJSZWRpcmVjdENhbGxiYWNrX0J1bmRsZS5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzM0RDODkxMzE0MTk1NzlG MDA3NDdFRjcgLyogTG9hZENhbmNlbGVkTm9TZXJ2ZXJSZWRpcmVjdENhbGxiYWNrX0J1bmRsZS5j cHAgKi87IH07CiAJCTMzRTc5RTA2MTM3QjVGRDkwMEUzMkQ5OSAvKiBtb3VzZS1tb3ZlLWxpc3Rl bmVyLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMzNFNzlFMDUxMzdCNUZDRTAwRTMyRDk5IC8qIG1vdXNlLW1vdmUtbGlzdGVuZXIuaHRt bCAqLzsgfTsKIAkJMzcyMDBCOTIxM0ExNjIzMDAwN0E0RkFEIC8qIFZlY3RvclJldmVyc2UuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzcyMDBCOTEx M0ExNjIzMDAwN0E0RkFEIC8qIFZlY3RvclJldmVyc2UuY3BwICovOyB9OworCQkzNzIyQzg2OTE0 NjFFMDNFMDBDNDVEMDAgLyogUmVuZGVyZWRJbWFnZUZyb21ET01SYW5nZS5tbSBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3MjJDODY4MTQ2MUUwM0UwMEM0 NUQwMCAvKiBSZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlLm1tICovOyB9OwogCQkzNzk5QUQzQTE0 MTIwQTQzMDA1RUIwQzYgLyogU3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzNzk5QUQz OTE0MTIwQTQzMDA1RUIwQzYgLyogU3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJp bmcubW0gKi87IH07CiAJCTM3REM2NzhEMTQwRDdDNTAwMEFCQ0NEQiAvKiBET01SYW5nZU9mU3Ry aW5nLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzdE QzY3OEIxNDBEN0M1MDAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcubW0gKi87IH07CiAJCTM3 REM2NzkxMTQwRDdENzYwMEFCQ0NEQiAvKiBET01SYW5nZU9mU3RyaW5nLmh0bWwgaW4gQ29weSBS ZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzdEQzY3OEYxNDBE N0QzQTAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcuaHRtbCAqLzsgfTsKQEAgLTE2MCw2ICsx NjEsNyBAQAogCQkzM0RDODkxMzE0MTk1NzlGMDA3NDdFRjcgLyogTG9hZENhbmNlbGVkTm9TZXJ2 ZXJSZWRpcmVjdENhbGxiYWNrX0J1bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBMb2FkQ2FuY2VsZWROb1NlcnZlclJlZGlyZWN0Q2FsbGJhY2tfQnVuZGxlLmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzNFNzlFMDUxMzdCNUZDRTAwRTMyRDk5 IC8qIG1vdXNlLW1vdmUtbGlzdGVuZXIuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9 ICJtb3VzZS1tb3ZlLWxpc3RlbmVyLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkzNzIwMEI5MTEzQTE2MjMwMDA3QTRGQUQgLyogVmVjdG9yUmV2ZXJzZS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBWZWN0b3JSZXZlcnNlLmNwcDsgcGF0aCA9IFdU Ri9WZWN0b3JSZXZlcnNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMzcyMkM4 NjgxNDYxRTAzRTAwQzQ1RDAwIC8qIFJlbmRlcmVkSW1hZ2VGcm9tRE9NUmFuZ2UubW0gKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBSZW5kZXJlZEltYWdlRnJvbURPTVJh bmdlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzNzk5QUQzOTE0MTIwQTQzMDA1 RUIwQzYgLyogU3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcubW0gKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBTdHJpbmdCeUV2YWx1YXRpbmdKYXZh U2NyaXB0RnJvbVN0cmluZy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzdEQzY3 OEIxNDBEN0M1MDAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBET01SYW5nZU9mU3RyaW5nLm1tOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkzN0RDNjc4RjE0MEQ3RDNBMDBBQkNDREIgLyogRE9NUmFuZ2VP ZlN0cmluZy5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gRE9NUmFuZ2VPZlN0cmlu Zy5odG1sOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDc1LDYgKzQ3Nyw3IEBACiAJ CQkJMzdEQzY3OEIxNDBEN0M1MDAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcubW0gKi8sCiAJ CQkJQzA3RTZDQUUxM0ZENjc2NTAwMzhCMjJCIC8qIER5bmFtaWNEZXZpY2VTY2FsZUZhY3Rvci5t bSAqLywKIAkJCQk5MzlCQTkxNjE0MTAzNDEyMDAxQTAxQkQgLyogRGV2aWNlU2NhbGVGYWN0b3JP bkJhY2subW0gKi8sCisJCQkJMzcyMkM4NjgxNDYxRTAzRTAwQzQ1RDAwIC8qIFJlbmRlcmVkSW1h Z2VGcm9tRE9NUmFuZ2UubW0gKi8sCiAJCQkJMzc5OUFEMzkxNDEyMEE0MzAwNUVCMEM2IC8qIFN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nLm1tICovLAogCQkJKTsKIAkJCXBh dGggPSBtYWM7CkBAIC02NTYsNiArNjU5LDcgQEAKIAkJCQlCQzNDNEM3MjE0NTc1QjZBMDAyNUZC NjIgLyogV0tCcm93c2luZ0NvbnRleHRMb2FkRGVsZWdhdGVUZXN0Lm1tIGluIFNvdXJjZXMgKi8s CiAJCQkJQkMzQzRDN0YxNDU4N0FBNjAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBU ZXN0Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQzBDNUQzQkUxNDU5OEI2RjAwQTgwMkE2IC8qIEdl dEJhY2tpbmdTY2FsZUZhY3Rvci5tbSBpbiBTb3VyY2VzICovLAorCQkJCTM3MjJDODY5MTQ2MUUw M0UwMEM0NUQwMCAvKiBSZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlLm1tIGluIFNvdXJjZXMgKi8s CiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07 CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9SZW5kZXJlZEltYWdlRnJvbURP TVJhbmdlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1Jl bmRlcmVkSW1hZ2VGcm9tRE9NUmFuZ2UubW0JKHJldmlzaW9uIDApCisrKyBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL21hYy9SZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlLm1tCShyZXZpc2lvbiAw KQpAQCAtMCwwICsxLDcwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICog YXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu IElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisjaW1w b3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgorI2ltcG9ydCA8V2ViS2l0L1dlYkRvY3VtZW50UHJp dmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L0RPTVByaXZhdGUuaD4KKyNpbXBvcnQgPHd0Zi9SZXRh aW5QdHIuaD4KKworQGludGVyZmFjZSBSZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlRnJhbWVMb2Fk RGVsZWdhdGUgOiBOU09iamVjdCB7Cit9CitAZW5kCisKK3N0YXRpYyBib29sIGRpZEZpbmlzaExv YWQ7CisKK0BpbXBsZW1lbnRhdGlvbiBSZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlRnJhbWVMb2Fk RGVsZWdhdGUKKworLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopc2VuZGVyIGRpZEZpbmlzaExv YWRGb3JGcmFtZTooV2ViRnJhbWUgKilmcmFtZQoreworICAgIGRpZEZpbmlzaExvYWQgPSB0cnVl OworfQorCitAZW5kCisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworVEVTVChXZWJLaXQx LCBSZW5kZXJlZEltYWdlRnJvbURPTVJhbmdlKQoreworICAgIFJldGFpblB0cjxXZWJWaWV3PiB3 ZWJWaWV3KEFkb3B0TlMsIFtbV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0 KDAsIDAsIDEyMCwgMjAwKSBmcmFtZU5hbWU6bmlsIGdyb3VwTmFtZTpuaWxdKTsKKyAgICBSZXRh aW5QdHI8UmVuZGVyZWRJbWFnZUZyb21ET01SYW5nZUZyYW1lTG9hZERlbGVnYXRlPiBmcmFtZUxv YWREZWxlZ2F0ZShBZG9wdE5TLCBbUmVuZGVyZWRJbWFnZUZyb21ET01SYW5nZUZyYW1lTG9hZERl bGVnYXRlIG5ld10pOworCisgICAgd2ViVmlldy5nZXQoKS5mcmFtZUxvYWREZWxlZ2F0ZSA9IGZy YW1lTG9hZERlbGVnYXRlLmdldCgpOworICAgIFt3ZWJWaWV3LmdldCgpLm1haW5GcmFtZSBsb2Fk SFRNTFN0cmluZzpAIjxkaXYgc3R5bGU9XCJ3aWR0aDogMTAwcHg7XCI+TG9yZW0gPHNwYW4gaWQ9 XCJ0YXJnZXRcIj5pcHN1bSBkb2xvcjwvc3Bhbj4gc2l0IGFtZXQ8L2Rpdj4iIGJhc2VVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJhYm91dDpibGFuayJdXTsKKworICAgIFV0aWw6OnJ1bigmZGlk RmluaXNoTG9hZCk7CisKKyAgICBET01Eb2N1bWVudCAqZG9jdW1lbnQgPSB3ZWJWaWV3LmdldCgp Lm1haW5GcmFtZURvY3VtZW50OworICAgIERPTVJhbmdlICpyYW5nZSA9IFtkb2N1bWVudCBjcmVh dGVSYW5nZV07CisgICAgW3JhbmdlIHNlbGVjdE5vZGU6W2RvY3VtZW50IGdldEVsZW1lbnRCeUlk OkAidGFyZ2V0Il1dOworICAgIE5TSW1hZ2UgKmFjdHVhbEltYWdlID0gW3JhbmdlIHJlbmRlcmVk SW1hZ2VGb3JjaW5nQmxhY2tUZXh0OllFU107CisKKyAgICBbd2ViVmlldy5nZXQoKSBzZXRTZWxl Y3RlZERPTVJhbmdlOnJhbmdlIGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFt XTsKKyAgICBpZCA8V2ViRG9jdW1lbnRWaWV3PiBkb2N1bWVudFZpZXcgPSB3ZWJWaWV3LmdldCgp Lm1haW5GcmFtZS5mcmFtZVZpZXcuZG9jdW1lbnRWaWV3OworICAgIE5TSW1hZ2UgKmV4cGVjdGVk SW1hZ2UgPSBbKGlkIDxXZWJEb2N1bWVudFNlbGVjdGlvbj4pZG9jdW1lbnRWaWV3IHNlbGVjdGlv bkltYWdlRm9yY2luZ0JsYWNrVGV4dDpZRVNdOworICAgIEVYUEVDVF9UUlVFKFthY3R1YWxJbWFn ZS5USUZGUmVwcmVzZW50YXRpb24gaXNFcXVhbDpleHBlY3RlZEltYWdlLlRJRkZSZXByZXNlbnRh dGlvbl0pOworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==