164438 2016-11-04 17:00:25 -0700 Rename unscaledUnobscuredVisibleContentSize and unscaledVisibleContentSizeIncludingObscuredArea for attempted clarity 2016-11-04 18:00:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1248373 0 simon.fraser 2016-11-04 17:00:25 -0700 Rename unscaledUnobscuredVisibleContentSize and unscaledVisibleContentSizeIncludingObscuredArea for attempted clarity 1248385 1 293964 simon.fraser 2016-11-04 17:15:48 -0700 Created attachment 293964 Patch 1248386 2 293964 thorton 2016-11-04 17:17:41 -0700 Comment on attachment 293964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=293964&action=review > Source/WebCore/platform/ScrollView.h:425 > + // Size available for view contents, excluding areas covered by translucent UI. Not affected by zooming. Not specifically "translucent UI". 1248393 3 simon.fraser 2016-11-04 18:00:43 -0700 https://trac.webkit.org/changeset/208411 293964 2016-11-04 17:15:48 -0700 2016-11-04 17:17:41 -0700 Patch bug-164438-20161104171145.patch text/plain 11858 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTExYjcyOGYxZjE5Zjky ODYxMGQ4YTVjYThiZTUwM2Q1NzEyZWFlZi4uNjA0ODhiM2M4ZGI1MWZmYzkyMWRjY2IwZDA2MWYx ZjZkYWZlZjc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDE2LTExLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSB1bnNj YWxlZFVub2JzY3VyZWRWaXNpYmxlQ29udGVudFNpemUgYW5kIHVuc2NhbGVkVmlzaWJsZUNvbnRl bnRTaXplSW5jbHVkaW5nT2JzY3VyZWRBcmVhIGZvciBhdHRlbXB0ZWQgY2xhcml0eQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0NDM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgdW5zY2FsZWRVbm9ic2N1 cmVkVmlzaWJsZUNvbnRlbnRTaXplKCkgYW5kIHVuc2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5j bHVkaW5nT2JzY3VyZWRBcmVhKCkgd2VyZSBhbiBlbmRsZXNzIHNvdXJjZQorICAgICAgICBvZiBj b25mdXNpb24uCisgICAgICAgIAorICAgICAgICBGdW5jdGlvbnMgd2l0aCAiVmlzaWJsZUNvbnRl bnQiIGluIHRoZSBuYW1lIGFyZSB1c3VhbGx5IGV4cGVjdGVkIHRvIHJldHVybiBkb2N1bWVudCBj b29yZGluYXRlcyAoYWZmZWN0ZWQgYnkgem9vbWluZyksCisgICAgICAgIHNvIHVuc2NhbGVkVW5v YnNjdXJlZFZpc2libGVDb250ZW50U2l6ZSBjYXVzZWQgY29nbml0aXZlIGRpc3NvbmFuY2UgYmVj YXVzZSBvZiAidW5zY2FsZWQiIHZzICJ2aXNpYmxlQ29udGVudCIsIGFuZAorICAgICAgICAidW5v YnNjdXJlZCIgdnMgInZpc2libGUiLgorICAgICAgICAKKyAgICAgICAgU28gcmVuYW1lOgorICAg ICAgICAgICAgdW5zY2FsZWRVbm9ic2N1cmVkVmlzaWJsZUNvbnRlbnRTaXplIC0+IHNpemVGb3JV bm9ic2N1cmVkQ29udGVudAorICAgICAgICAgICAgdW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemVJ bmNsdWRpbmdPYnNjdXJlZEFyZWEgLT4gc2l6ZUZvclZpc2libGVDb250ZW50CisgICAgICAgIAor ICAgICAgICBzaXplRm9yVW5vYnNjdXJlZENvbnRlbnQoKSBjYW4gYWxzbyBiZSBwcml2YXRlIHRv IFNjcm9sbFZpZXcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUpOgorICAgICAgICAq IHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6 dW5vYnNjdXJlZENvbnRlbnRSZWN0SW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6c2l6ZUZvclZpc2libGVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZp ZXc6OnNpemVGb3JVbm9ic2N1cmVkQ29udGVudCk6IERvbid0IGNvbXB1dGUgdW5zY2FsZWRWaXNp YmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNjdXJlZEFyZWEKKyAgICAgICAgYmVmb3JlIHRlc3Rp bmcgd2hldGhlciB3ZSBoYXZlIGEgcGxhdGZvcm0gd2lkZ2V0LgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsVmlldzo6bGF5b3V0U2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp1 bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZUluY2x1ZGluZ09ic2N1cmVkQXJlYSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp1bnNjYWxlZFVub2JzY3VyZWRWaXNpYmxl Q29udGVudFNpemUpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNhbGN1bGF0ZUJhY2tncm91bmRJbWFnZUdl b21ldHJ5KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQZW5kaW5nTGF5 ZXJDaGFuZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJh bWVWaWV3RGlkQ2hhbmdlU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBv c2l0b3I6OnVwZGF0ZVJvb3RMYXllclBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6ZW5zdXJlUm9vdExheWVyKToKKworMjAxNi0xMS0wNCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBMYXlvdXQgdmlld3Bv cnQgd3Jvbmcgd2l0aCBSVEwgZG9jdW1lbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ0MzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IDk1MWI1ZDU1NGY1MTY4Zjc3YWI1NmFhNTM5MDI1 NzI0Y2RmNTY0MDguLjVmY2EzMTBkMDBhYzIxZGM3YjYxYmUwYTlmZTA1NWM4YjdmN2FhZDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKQEAgLTMy Miw4ICszMjIsOCBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnVwZGF0ZSgpCiAgICAgICAgIHJl dHVybjsKIAogICAgIEZyYW1lVmlldyogb3ZlcmxheVZpZXcgPSBvdmVybGF5UGFnZSgpLT5tYWlu RnJhbWUoKS52aWV3KCk7Ci0gICAgSW50U2l6ZSB2aWV3cG9ydFNpemUgPSB2aWV3LT51bnNjYWxl ZFZpc2libGVDb250ZW50U2l6ZUluY2x1ZGluZ09ic2N1cmVkQXJlYSgpOwotICAgIEludFNpemUg ZnJhbWVWaWV3RnVsbFNpemUgPSB2aWV3LT51bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZUluY2x1 ZGluZ09ic2N1cmVkQXJlYShTY3JvbGxhYmxlQXJlYTo6SW5jbHVkZVNjcm9sbGJhcnMpOworICAg IEludFNpemUgdmlld3BvcnRTaXplID0gdmlldy0+c2l6ZUZvclZpc2libGVDb250ZW50KCk7Cisg ICAgSW50U2l6ZSBmcmFtZVZpZXdGdWxsU2l6ZSA9IHZpZXctPnNpemVGb3JWaXNpYmxlQ29udGVu dChTY3JvbGxhYmxlQXJlYTo6SW5jbHVkZVNjcm9sbGJhcnMpOwogICAgIG92ZXJsYXlWaWV3LT5y ZXNpemUoZnJhbWVWaWV3RnVsbFNpemUpOwogCiAgICAgLy8gQ2xlYXIgY2FudmFzIGFuZCBwYWlu dCB0aGluZ3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IDgzMTA0 ZTM1YzEzMzk5MzE0M2QzYzA4ZmVkZmRmMDJjN2NiNjgxNjcuLmMzOTFkZWIzMWFlMTBlOTM4ZDUx ZTA1YTc0Zjk4Mzg2MmUxYmM1ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu Y3BwCkBAIC0yNDcsMTIgKzI0NywxMiBAQCBJbnRSZWN0IFNjcm9sbFZpZXc6OnVub2JzY3VyZWRD b250ZW50UmVjdChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgcwogCiBJbnRS ZWN0IFNjcm9sbFZpZXc6OnVub2JzY3VyZWRDb250ZW50UmVjdEludGVybmFsKFZpc2libGVDb250 ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyBzY3JvbGxiYXJJbmNsdXNpb24pIGNvbnN0CiB7Ci0g ICAgRmxvYXRTaXplIHZpc2libGVDb250ZW50U2l6ZSA9IHVuc2NhbGVkVW5vYnNjdXJlZFZpc2li bGVDb250ZW50U2l6ZShzY3JvbGxiYXJJbmNsdXNpb24pOworICAgIEZsb2F0U2l6ZSB2aXNpYmxl Q29udGVudFNpemUgPSBzaXplRm9yVW5vYnNjdXJlZENvbnRlbnQoc2Nyb2xsYmFySW5jbHVzaW9u KTsKICAgICB2aXNpYmxlQ29udGVudFNpemUuc2NhbGUoMSAvIHZpc2libGVDb250ZW50U2NhbGVG YWN0b3IoKSk7CiAgICAgcmV0dXJuIEludFJlY3QobV9zY3JvbGxQb3NpdGlvbiwgZXhwYW5kZWRJ bnRTaXplKHZpc2libGVDb250ZW50U2l6ZSkpOwogfQogCi1JbnRTaXplIFNjcm9sbFZpZXc6OnVu c2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5jbHVkaW5nT2JzY3VyZWRBcmVhKFZpc2libGVDb250 ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyBzY3JvbGxiYXJJbmNsdXNpb24pIGNvbnN0CitJbnRT aXplIFNjcm9sbFZpZXc6OnNpemVGb3JWaXNpYmxlQ29udGVudChWaXNpYmxlQ29udGVudFJlY3RJ bmNsdWRlc1Njcm9sbGJhcnMgc2Nyb2xsYmFySW5jbHVzaW9uKSBjb25zdAogewogICAgIGlmIChw bGF0Zm9ybVdpZGdldCgpKQogICAgICAgICByZXR1cm4gcGxhdGZvcm1WaXNpYmxlQ29udGVudFNp emVJbmNsdWRpbmdPYnNjdXJlZEFyZWEoc2Nyb2xsYmFySW5jbHVzaW9uID09IEluY2x1ZGVTY3Jv bGxiYXJzKTsKQEAgLTI2OSwxMyArMjY5LDEzIEBAIEludFNpemUgU2Nyb2xsVmlldzo6dW5zY2Fs ZWRWaXNpYmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNjdXJlZEFyZWEoVmlzaWJsZUNvbnRlCiAg ICAgcmV0dXJuIEludFNpemUod2lkdGgoKSAtIHNjcm9sbGJhclNwYWNlLndpZHRoKCksIGhlaWdo dCgpIC0gc2Nyb2xsYmFyU3BhY2UuaGVpZ2h0KCkpLmV4cGFuZGVkVG8oSW50U2l6ZSgpKTsKIH0K ICAgICAKLUludFNpemUgU2Nyb2xsVmlldzo6dW5zY2FsZWRVbm9ic2N1cmVkVmlzaWJsZUNvbnRl bnRTaXplKFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyBzY3JvbGxiYXJJbmNs dXNpb24pIGNvbnN0CitJbnRTaXplIFNjcm9sbFZpZXc6OnNpemVGb3JVbm9ic2N1cmVkQ29udGVu dChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgc2Nyb2xsYmFySW5jbHVzaW9u KSBjb25zdAogewotICAgIEludFNpemUgdmlzaWJsZUNvbnRlbnRTaXplID0gdW5zY2FsZWRWaXNp YmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNjdXJlZEFyZWEoc2Nyb2xsYmFySW5jbHVzaW9uKTsK LQogICAgIGlmIChwbGF0Zm9ybVdpZGdldCgpKQogICAgICAgICByZXR1cm4gcGxhdGZvcm1WaXNp YmxlQ29udGVudFNpemUoc2Nyb2xsYmFySW5jbHVzaW9uID09IEluY2x1ZGVTY3JvbGxiYXJzKTsK IAorICAgIEludFNpemUgdmlzaWJsZUNvbnRlbnRTaXplID0gc2l6ZUZvclZpc2libGVDb250ZW50 KHNjcm9sbGJhckluY2x1c2lvbik7CisKICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCiAg ICAgaWYgKG1fdXNlRml4ZWRMYXlvdXQgJiYgIW1fZml4ZWRWaXNpYmxlQ29udGVudFJlY3QuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gdmlzaWJsZUNvbnRlbnRTaXplOwpAQCAtMzEyLDcgKzMx Miw3IEBAIEludFJlY3QgU2Nyb2xsVmlldzo6dmlzaWJsZUNvbnRlbnRSZWN0SW50ZXJuYWwoVmlz aWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiCiAKIEludFNpemUgU2Nyb2xsVmlldzo6bGF5 b3V0U2l6ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZml4ZWRMYXlvdXRTaXplLmlzRW1wdHko KSB8fCAhbV91c2VGaXhlZExheW91dCA/IHVuc2NhbGVkVW5vYnNjdXJlZFZpc2libGVDb250ZW50 U2l6ZShFeGNsdWRlU2Nyb2xsYmFycykgOiBtX2ZpeGVkTGF5b3V0U2l6ZTsKKyAgICByZXR1cm4g bV9maXhlZExheW91dFNpemUuaXNFbXB0eSgpIHx8ICFtX3VzZUZpeGVkTGF5b3V0ID8gc2l6ZUZv clVub2JzY3VyZWRDb250ZW50KCkgOiBtX2ZpeGVkTGF5b3V0U2l6ZTsKIH0KIAogSW50U2l6ZSBT Y3JvbGxWaWV3OjpmaXhlZExheW91dFNpemUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5oCmluZGV4IGUyNjUwNGZkMWQzN2ZlMTdlNjg5Njg2OTJlOWEyNTVhNmNlNjRlNWEu LmUxOWQ5MmFiNzAxYTA3NjVjYTBkNjJkYzA2MGJlYjNhNTY3Y2M0ZjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTE5OSwxMyArMTk5LDkgQEAgcHVibGljOgogCiAgICAg dmlydHVhbCBib29sIGluUHJvZ3JhbW1hdGljU2Nyb2xsKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KIAotICAgIC8vIHZpc2libGVDb250ZW50UmVjdCgpLnNpemUoKSBpcyBjb21wdXRlZCBmcm9t IHVuc2NhbGVkVW5vYnNjdXJlZFZpc2libGVDb250ZW50U2l6ZSgpIGRpdmlkZWQgYnkgdGhlIHZh bHVlIG9mIHZpc2libGVDb250ZW50U2NhbGVGYWN0b3IuCi0gICAgLy8gdmlzaWJsZUNvbnRlbnRT Y2FsZUZhY3RvciBpcyB1c3VhbGx5IDEsIGV4Y2VwdCB3aGVuIHRoZSBzZXR0aW5nIGRlbGVnYXRl c1BhZ2VTY2FsaW5nIGlzIHRydWUgYW5kIHRoZQotICAgIC8vIFNjcm9sbFZpZXcgaXMgdGhlIG1h aW4gZnJhbWU7IGluIHRoYXQgY2FzZSwgdmlzaWJsZUNvbnRlbnRTY2FsZUZhY3RvciBpcyBlcXVh bCB0byB0aGUgcGFnZSdzIHBhZ2VTY2FsZUZhY3Rvci4KLSAgICAvLyBQb3J0cyB0aGF0IGRvbid0 IHVzZSBwYWdlU2NhbGVGYWN0b3IgY2FuIHRyZWF0IHVuc2NhbGVkVW5vYnNjdXJlZFZpc2libGVD b250ZW50U2l6ZSBhbmQgdmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpIGFzIGVxdWl2YWxlbnQu Ci0gICAgLy8gdW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNjdXJlZEFyZWEo KSBpbmNsdWRlcyBhcmVhcyBpbiB0aGUgY29udGVudCB0aGF0IG1pZ2h0IGJlIG9ic2N1cmVkIGJ5 IFVJIGVsZW1lbnRzLgotICAgIEludFNpemUgdW5zY2FsZWRVbm9ic2N1cmVkVmlzaWJsZUNvbnRl bnRTaXplKFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyA9IEV4Y2x1ZGVTY3Jv bGxiYXJzKSBjb25zdDsKLSAgICBJbnRTaXplIHVuc2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5j bHVkaW5nT2JzY3VyZWRBcmVhKFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyA9 IEV4Y2x1ZGVTY3JvbGxiYXJzKSBjb25zdDsKKyAgICAvLyBTaXplIGF2YWlsYWJsZSBmb3Igdmll dyBjb250ZW50cywgcG9zc2libHkgaW5jbHVkaW5nIGFyZWFzIGNvdmVyZWQgYnkgdHJhbnNsdWNl bnQgVUkuIE5vdCBhZmZlY3RlZCBieSB6b29taW5nLgorICAgIEludFNpemUgc2l6ZUZvclZpc2li bGVDb250ZW50KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyA9IEV4Y2x1ZGVT Y3JvbGxiYXJzKSBjb25zdDsKKyAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMuIEl0J3Mgb25seSB1 c2VkIGZvciB0aGUgaW5jb3JyZWN0bHkgYmVoYXZpbmcgU2Nyb2xsVmlldzo6dW5vYnNjdXJlZENv bnRlbnRSZWN0SW50ZXJuYWwoKS4KICAgICB2aXJ0dWFsIGZsb2F0IHZpc2libGVDb250ZW50U2Nh bGVGYWN0b3IoKSBjb25zdCB7IHJldHVybiAxOyB9CiAKICAgICAvLyBGdW5jdGlvbnMgZm9yIGdl dHRpbmcvc2V0dGluZyB0aGUgc2l6ZSB3ZWJraXQgc2hvdWxkIHVzZSB0byBsYXlvdXQgdGhlIGNv bnRlbnRzLiBCeSBkZWZhdWx0IHRoaXMgaXMgdGhlIHNhbWUgYXMgdGhlIHZpc2libGUKQEAgLTIx Myw2ICsyMDksNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgSW50U2l6ZSBsYXlvdXRT aXplKCkgY29uc3Q7CiAgICAgaW50IGxheW91dFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGF5b3V0 U2l6ZSgpLndpZHRoKCk7IH0KICAgICBpbnQgbGF5b3V0SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4g bGF5b3V0U2l6ZSgpLmhlaWdodCgpOyB9CisKICAgICBXRUJDT1JFX0VYUE9SVCBJbnRTaXplIGZp eGVkTGF5b3V0U2l6ZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0Rml4ZWRM YXlvdXRTaXplKGNvbnN0IEludFNpemUmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHVzZUZp eGVkTGF5b3V0KCkgY29uc3Q7CkBAIC00MjUsNiArNDIyLDkgQEAgcHJvdGVjdGVkOgogI2VuZGlm CiAKIHByaXZhdGU6CisgICAgLy8gU2l6ZSBhdmFpbGFibGUgZm9yIHZpZXcgY29udGVudHMsIGV4 Y2x1ZGluZyBhcmVhcyBjb3ZlcmVkIGJ5IHRyYW5zbHVjZW50IFVJLiBOb3QgYWZmZWN0ZWQgYnkg em9vbWluZy4KKyAgICBJbnRTaXplIHNpemVGb3JVbm9ic2N1cmVkQ29udGVudChWaXNpYmxlQ29u dGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgPSBFeGNsdWRlU2Nyb2xsYmFycykgY29uc3Q7CisK ICAgICBJbnRSZWN0IHZpc2libGVDb250ZW50UmVjdEludGVybmFsKFZpc2libGVDb250ZW50UmVj dEluY2x1ZGVzU2Nyb2xsYmFycywgVmlzaWJsZUNvbnRlbnRSZWN0QmVoYXZpb3IpIGNvbnN0IG92 ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JUIEludFJlY3QgdW5vYnNjdXJlZENvbnRlbnRSZWN0 SW50ZXJuYWwoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzID0gRXhjbHVkZVNj cm9sbGJhcnMpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCBlYjhkMzc2NDJmMzViNDZhNzQ5MzhiYzc0Mzg1Y2Y5 MWMxZjU3YmUyLi4xMzNiZDc5YzM5NDdiOGJlYmNiMWQxNzRiOTQ0MzVmMjZhMmFlNzZjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAK QEAgLTExMjAsNyArMTEyMCw3IEBAIEJhY2tncm91bmRJbWFnZUdlb21ldHJ5IFJlbmRlckJveE1v ZGVsT2JqZWN0OjpjYWxjdWxhdGVCYWNrZ3JvdW5kSW1hZ2VHZW9tZXRyeShjCiAgICAgICAgICAg ICAgICAgLy8gZG93biB0aGUgZnJhbWVWaWV3IHRvIHRvIGZpdCBpbiB0aGUgY3VycmVudCB2aWV3 cG9ydC4KICAgICAgICAgICAgICAgICB2aWV3cG9ydFJlY3Quc2V0U2l6ZShmcmFtZVZpZXcuZml4 ZWRMYXlvdXRTaXplKCkpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgdmll d3BvcnRSZWN0LnNldFNpemUoZnJhbWVWaWV3LnVuc2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5j bHVkaW5nT2JzY3VyZWRBcmVhKCkpOworICAgICAgICAgICAgICAgIHZpZXdwb3J0UmVjdC5zZXRT aXplKGZyYW1lVmlldy5zaXplRm9yVmlzaWJsZUNvbnRlbnQoKSk7CiAKICAgICAgICAgICAgIGlm IChmaXhlZEJhY2tncm91bmRQYWludHNJbkxvY2FsQ29vcmRpbmF0ZXMoKSkgewogICAgICAgICAg ICAgICAgIGlmICghdXNlRml4ZWRMYXlvdXQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOGI0ZmUzMzMxNTAxNDkxNGY4 NGY5ODA4ZGQ1MzEwNTQwZmVhNjA3Ni4uM2NhNDA0OTk4NzE1N2VmMDI0NWE3YmFiMDIxNWM2NTAy MzllNTA3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKQEAgLTQ1OCw3ICs0NTgsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKGJvb2wgaXNGbHVzaFJvb3QpCiAgICAgICAg IHJvb3RMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlKGV4cG9zZWRSZWN0LCBmcmFtZVZpZXcu dmlld3BvcnRJc1N0YWJsZSgpKTsKICNlbHNlCiAgICAgICAgIC8vIEhhdmluZyBhIG1fY2xpcExh eWVyIGluZGljYXRlcyB0aGF0IHdlJ3JlIGRvaW5nIHNjcm9sbGluZyB2aWEgR3JhcGhpY3NMYXll cnMuCi0gICAgICAgIEZsb2F0UmVjdCB2aXNpYmxlUmVjdCA9IG1fY2xpcExheWVyID8gRmxvYXRS ZWN0KHsgMCwgMCB9LCBmcmFtZVZpZXcudW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemVJbmNsdWRp bmdPYnNjdXJlZEFyZWEoKSkgOiBmcmFtZVZpZXcudmlzaWJsZUNvbnRlbnRSZWN0KCk7CisgICAg ICAgIEZsb2F0UmVjdCB2aXNpYmxlUmVjdCA9IG1fY2xpcExheWVyID8gRmxvYXRSZWN0KHsgMCwg MCB9LCBmcmFtZVZpZXcuc2l6ZUZvclZpc2libGVDb250ZW50KCkpIDogZnJhbWVWaWV3LnZpc2li bGVDb250ZW50UmVjdCgpOwogCiAgICAgICAgIGlmIChmcmFtZVZpZXcudmlld0V4cG9zZWRSZWN0 KCkpCiAgICAgICAgICAgICB2aXNpYmxlUmVjdC5pbnRlcnNlY3QoZnJhbWVWaWV3LnZpZXdFeHBv c2VkUmVjdCgpLnZhbHVlKCkpOwpAQCAtMTcxNyw3ICsxNzE3LDcgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZENoYW5nZVNpemUoKQogewogICAgIGlmIChtX2NsaXBM YXllcikgewogICAgICAgICBjb25zdCBGcmFtZVZpZXcmIGZyYW1lVmlldyA9IG1fcmVuZGVyVmll dy5mcmFtZVZpZXcoKTsKLSAgICAgICAgbV9jbGlwTGF5ZXItPnNldFNpemUoZnJhbWVWaWV3LnVu c2NhbGVkVmlzaWJsZUNvbnRlbnRTaXplSW5jbHVkaW5nT2JzY3VyZWRBcmVhKCkpOworICAgICAg ICBtX2NsaXBMYXllci0+c2V0U2l6ZShmcmFtZVZpZXcuc2l6ZUZvclZpc2libGVDb250ZW50KCkp OwogICAgICAgICBtX2NsaXBMYXllci0+c2V0UG9zaXRpb24ocG9zaXRpb25Gb3JDbGlwTGF5ZXIo KSk7CiAKICAgICAgICAgZnJhbWVWaWV3RGlkU2Nyb2xsKCk7CkBAIC0yMTI0LDcgKzIxMjQsNyBA QCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlUm9vdExheWVyUG9zaXRpb24oKQog ICAgICAgICBtX3Jvb3RDb250ZW50TGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgp KTsKICAgICB9CiAgICAgaWYgKG1fY2xpcExheWVyKSB7Ci0gICAgICAgIG1fY2xpcExheWVyLT5z ZXRTaXplKG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS51bnNjYWxlZFZpc2libGVDb250ZW50U2l6 ZUluY2x1ZGluZ09ic2N1cmVkQXJlYSgpKTsKKyAgICAgICAgbV9jbGlwTGF5ZXItPnNldFNpemUo bV9yZW5kZXJWaWV3LmZyYW1lVmlldygpLnNpemVGb3JWaXNpYmxlQ29udGVudCgpKTsKICAgICAg ICAgbV9jbGlwTGF5ZXItPnNldFBvc2l0aW9uKHBvc2l0aW9uRm9yQ2xpcExheWVyKCkpOwogICAg IH0KIApAQCAtMzQ0Myw3ICszNDQzLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVu c3VyZVJvb3RMYXllcigpCiAgICAgICAgICAgICBtX2NsaXBMYXllci0+YWRkQ2hpbGQobV9zY3Jv bGxMYXllci5nZXQoKSk7CiAgICAgICAgICAgICBtX3Njcm9sbExheWVyLT5hZGRDaGlsZChtX3Jv b3RDb250ZW50TGF5ZXIuZ2V0KCkpOwogCi0gICAgICAgICAgICBtX2NsaXBMYXllci0+c2V0U2l6 ZShtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkudW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemVJbmNs dWRpbmdPYnNjdXJlZEFyZWEoKSk7CisgICAgICAgICAgICBtX2NsaXBMYXllci0+c2V0U2l6ZSht X3JlbmRlclZpZXcuZnJhbWVWaWV3KCkuc2l6ZUZvclZpc2libGVDb250ZW50KCkpOwogICAgICAg ICAgICAgbV9jbGlwTGF5ZXItPnNldFBvc2l0aW9uKHBvc2l0aW9uRm9yQ2xpcExheWVyKCkpOwog ICAgICAgICAgICAgbV9jbGlwTGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsK IAo=