132787 2014-05-10 15:26:44 -0700 Headers and footers are not positioned correctly with topContentInset 2014-05-11 14:05:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin cmarcelo commit-queue esprehn+autocc glenn jamesr kondapallykalyan luiz sam simon.fraser thorton tonikitoo oldest_to_newest 1008313 0 bdakin 2014-05-10 15:26:44 -0700 Headers and footers are not positioned correctly with topContentInset <rdar://problem/16641115> 1008315 1 231238 bdakin 2014-05-10 15:34:46 -0700 Created attachment 231238 Patch 1008326 2 231238 thorton 2014-05-10 15:44:23 -0700 Comment on attachment 231238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231238&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:225 > return 0; nullptr these while you're here! 1008330 3 231238 sam 2014-05-10 16:04:46 -0700 Comment on attachment 231238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231238&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:224 > + return renderView->compositor().headerLayer(); LOL. 1008450 4 bdakin 2014-05-11 14:05:19 -0700 Thanks, Tim! http://trac.webkit.org/changeset/168602 231238 2014-05-10 15:34:46 -0700 2014-05-10 16:04:46 -0700 Patch for-review.txt text/plain 13656 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDE0LTA1LTEwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBIZWFkZXJzIGFuZCBmb290ZXJzIGFy ZSBub3QgcG9zaXRpb25lZCBjb3JyZWN0bHkgd2l0aCB0b3BDb250ZW50SW5zZXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjc4NworICAgICAgICAt YW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjY0MTExNT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIZWFkZXJzIGFu ZCBmb290ZXJzIG5lZWQgdG8gdGFrZSB0aGUgaW5zZXQgaW50byBhY2NvdW50LCBhbmQgdGhleSBh bHNvIG5lZWQgdG8gCisgICAgICAgIGZhY3RvciBpbiB0aGUgZmFjdCB0aGF0IHRoZSByb290IGxh eWVyIG1vdmVzIGFyb3VuZCBub3cgdG9vLgorCisgICAgICAgIFRoZSBleGlzdGluZyB5UG9zaXRp b25Gb3JSb290Q29udGVudExheWVyKCkgaXMgYWN0dWFsbHkgdGhlIHJpZ2h0IGNhbGN1bGF0aW9u IGZvciAKKyAgICAgICAgdGhlIGhlYWRlciBsYXllci4gVGhlIHJvb3QgY29udGVudCBsYXllciB3 YW50cyB0aGF0IHZhbHVlLCBidXQgcHVzaGVkIGRvd24gYnkgdGhlIAorICAgICAgICBoZWFkZXIg aGVpZ2h0LiBOb3cgdGhlcmUgYXJlIHN0YXRpYyBmdW5jdGlvbnMgZm9yIGJvdGggb2YgdGhlbSBh bmQgdGhlIGZvb3RlciB0byAKKyAgICAgICAgYXZvaWQgZHVwbGljYXRlZCBjb2RlIGluIHRoZSB0 aHJlZSBzcG90cyB3aGVyZSB3ZSBuZWVkIHRoaXMgaW5mb3JtYXRpb24uCisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp5UG9zaXRpb25G b3JIZWFkZXJMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnlQb3NpdGlvbkZv clJvb3RDb250ZW50TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp5UG9zaXRp b25Gb3JGb290ZXJMYXllcik6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKworICAgICAg ICBVc2UgdGhlIHN0YXRpYyBmdW5jdGlvbnMgdG8gY29tcHV0ZSB0aGUgbGF5ZXIgcG9zaXRpb25z LgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlU2Ny b2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKToKKworICAgICAgICBIb3cgZGlkIGhlYWRlcnMg ZXZlciB3b3JrIHdpdGggdGhpcyBidWc/PyBJIGRvbuKAmXQga25vdy4gV2UgbmVlZCB0byByZXR1 cm4gdGhhdCAKKyAgICAgICAgbGF5ZXIuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0 b3I6OmhlYWRlckxheWVyRm9yRnJhbWVWaWV3KToKKworICAgICAgICBVc2UgdGhlIHN0YXRpYyBm dW5jdGlvbnMgdG8gY29tcHV0ZSB0aGUgbGF5ZXIgcG9zaXRpb25zLgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTY3JvbGxMYXllclBv c2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlUm9vdExheWVy UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRh dGVMYXllckZvckhlYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVyKToKKwogMjAxNC0wNS0xMCAgRGFyaW4gQWRsZXIgIDxk YXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE2Njg1Myk6IGZhc3QvcHJl bG9hZGVyL2RvY3VtZW50LXdyaXRlLmh0bWwgaXMgdmVyeSBmbGFreQpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTY4NTM4KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjE4LDEyICsxNjE4LDExIEBAIGZs b2F0IEZyYW1lVmlldzo6eVBvc2l0aW9uRm9ySW5zZXRDbGlwTGEKICAgICByZXR1cm4gdG9wQ29u dGVudEluc2V0IC0gc2Nyb2xsWTsKIH0KIAotZmxvYXQgRnJhbWVWaWV3Ojp5UG9zaXRpb25Gb3JS b290Q29udGVudExheWVyKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBmbG9hdCB0 b3BDb250ZW50SW5zZXQpCitmbG9hdCBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvckhlYWRlckxheWVy KGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBmbG9hdCB0b3BDb250ZW50SW5zZXQp CiB7CiAgICAgaWYgKCF0b3BDb250ZW50SW5zZXQpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAg Ly8gVGhlIHJvb3RDb250ZW50TGF5ZXIgc2hvdWxkIG5vdCBtb3ZlIGZvciBuZWdhdGl2ZSBzY3Jv bGwgdmFsdWVzLgogICAgIGZsb2F0IHNjcm9sbFkgPSBzdGQ6Om1heDxmbG9hdD4oMCwgc2Nyb2xs UG9zaXRpb24ueSgpKTsKIAogICAgIGlmIChzY3JvbGxZID49IHRvcENvbnRlbnRJbnNldCkKQEAg LTE2MzEsNyArMTYzMCwxNyBAQCBmbG9hdCBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvclJvb3RDb250 ZW50CiAKICAgICByZXR1cm4gc2Nyb2xsWTsKIH0KLSAgICAKKworZmxvYXQgRnJhbWVWaWV3Ojp5 UG9zaXRpb25Gb3JSb290Q29udGVudExheWVyKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0 aW9uLCBmbG9hdCB0b3BDb250ZW50SW5zZXQsIGZsb2F0IGhlYWRlckhlaWdodCkKK3sKKyAgICBy ZXR1cm4geVBvc2l0aW9uRm9ySGVhZGVyTGF5ZXIoc2Nyb2xsUG9zaXRpb24sIHRvcENvbnRlbnRJ bnNldCkgKyBoZWFkZXJIZWlnaHQ7Cit9CisKK2Zsb2F0IEZyYW1lVmlldzo6eVBvc2l0aW9uRm9y Rm9vdGVyTGF5ZXIoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGZsb2F0IHRvcENv bnRlbnRJbnNldCwgZmxvYXQgdG90YWxDb250ZW50c0hlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0 KQoreworICAgIHJldHVybiB5UG9zaXRpb25Gb3JIZWFkZXJMYXllcihzY3JvbGxQb3NpdGlvbiwg dG9wQ29udGVudEluc2V0KSArIHRvdGFsQ29udGVudHNIZWlnaHQgLSBmb290ZXJIZWlnaHQ7Cit9 CisKICNpZiBQTEFURk9STShJT1MpCiBMYXlvdXRSZWN0IEZyYW1lVmlldzo6cmVjdEZvclZpZXdw b3J0Q29uc3RyYWluZWRPYmplY3RzKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVDb250ZW50UmVj dCwgY29uc3QgTGF5b3V0U2l6ZSYgdG90YWxDb250ZW50c1NpemUsIGZsb2F0IGZyYW1lU2NhbGVG YWN0b3IsIGJvb2wgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSwgU2Nyb2xsQmVo YXZpb3JGb3JGaXhlZEVsZW1lbnRzIHNjcm9sbEJlaGF2aW9yKQogewpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCShyZXZpc2lvbiAxNjg1MzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzUsMTAgKzI3NSwxMiBAQCBwdWJsaWM6CiAg ICAgLy8gU3RhdGljIGZ1bmN0aW9uIGNhbiBiZSBjYWxsZWQgZnJvbSBhbm90aGVyIHRocmVhZC4K ICAgICBzdGF0aWMgTGF5b3V0U2l6ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKGNvbnN0 IExheW91dFJlY3QmIHZpc2libGVDb250ZW50UmVjdCwgY29uc3QgTGF5b3V0U2l6ZSYgdG90YWxD b250ZW50c1NpemUsIGNvbnN0IExheW91dFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgTGF5 b3V0UG9pbnQmIHNjcm9sbE9yaWdpbiwgZmxvYXQgZnJhbWVTY2FsZUZhY3RvciwgYm9vbCBmaXhl ZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lLCBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxl bWVudHMsIGludCBoZWFkZXJIZWlnaHQsIGludCBmb290ZXJIZWlnaHQpOwogCi0gICAgLy8gVGhl c2UgbGF5ZXJzIGFyZSBwb3NpdGlvbmVkIGRpZmZlcmVudGx5IHdoZW4gdGhlcmUgaXMgYSB0b3BD b250ZW50SW5zZXQuIFRoZXNlIHZhbHVlIG5lZWQgdG8gYmUgY29tcHV0ZWQKKyAgICAvLyBUaGVz ZSBsYXllcnMgYXJlIHBvc2l0aW9uZWQgZGlmZmVyZW50bHkgd2hlbiB0aGVyZSBpcyBhIHRvcENv bnRlbnRJbnNldCwgYSBoZWFkZXIsIG9yIGEgZm9vdGVyLiBUaGVzZSB2YWx1ZSBuZWVkIHRvIGJl IGNvbXB1dGVkCiAgICAgLy8gb24gYm90aCB0aGUgbWFpbiB0aHJlYWQgYW5kIHRoZSBzY3JvbGxp bmcgdGhyZWFkLgogICAgIHN0YXRpYyBmbG9hdCB5UG9zaXRpb25Gb3JJbnNldENsaXBMYXllcihj b25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgZmxvYXQgdG9wQ29udGVudEluc2V0KTsK LSAgICBzdGF0aWMgZmxvYXQgeVBvc2l0aW9uRm9yUm9vdENvbnRlbnRMYXllcihjb25zdCBGbG9h dFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgZmxvYXQgdG9wQ29udGVudEluc2V0KTsKKyAgICBzdGF0 aWMgZmxvYXQgeVBvc2l0aW9uRm9yUm9vdENvbnRlbnRMYXllcihjb25zdCBGbG9hdFBvaW50JiBz Y3JvbGxQb3NpdGlvbiwgZmxvYXQgdG9wQ29udGVudEluc2V0LCBmbG9hdCBoZWFkZXJIZWlnaHQp OworICAgIHN0YXRpYyBmbG9hdCB5UG9zaXRpb25Gb3JIZWFkZXJMYXllcihjb25zdCBGbG9hdFBv aW50JiBzY3JvbGxQb3NpdGlvbiwgZmxvYXQgdG9wQ29udGVudEluc2V0KTsKKyAgICBzdGF0aWMg ZmxvYXQgeVBvc2l0aW9uRm9yRm9vdGVyTGF5ZXIoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9z aXRpb24sIGZsb2F0IHRvcENvbnRlbnRJbnNldCwgZmxvYXQgdG90YWxDb250ZW50c0hlaWdodCwg ZmxvYXQgZm9vdGVySGVpZ2h0KTsKIAogI2lmIFBMQVRGT1JNKElPUykKICAgICBMYXlvdXRSZWN0 IHZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzUmVjdCgpIGNvbnN0OwpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvci5jcHAJKHJldmlzaW9uIDE2ODUzOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MjMsNyArMjIzLDEwIEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlU2MK ICAgICAgICAgICAgIGZsb2F0IHRvcENvbnRlbnRJbnNldCA9IGZyYW1lVmlldy0+dG9wQ29udGVu dEluc2V0KCk7CiAgICAgICAgICAgICBGbG9hdFBvaW50IHBvc2l0aW9uRm9ySW5zZXRDbGlwTGF5 ZXIgPSBGbG9hdFBvaW50KDAsIEZyYW1lVmlldzo6eVBvc2l0aW9uRm9ySW5zZXRDbGlwTGF5ZXIo c2Nyb2xsUG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCkpOwogICAgICAgICAgICAgRmxvYXRQb2lu dCBwb3NpdGlvbkZvckNvbnRlbnRzTGF5ZXIgPSBGbG9hdFBvaW50KHNjcm9sbGVkQ29udGVudHNM YXllci0+cG9zaXRpb24oKS54KCksCi0gICAgICAgICAgICAgICAgRnJhbWVWaWV3Ojp5UG9zaXRp b25Gb3JSb290Q29udGVudExheWVyKHNjcm9sbFBvc2l0aW9uLCB0b3BDb250ZW50SW5zZXQpKTsK KyAgICAgICAgICAgICAgICBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvclJvb3RDb250ZW50TGF5ZXIo c2Nyb2xsUG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCwgZnJhbWVWaWV3LT5oZWFkZXJIZWlnaHQo KSkpOworICAgICAgICAgICAgRmxvYXRQb2ludCBwb3NpdGlvbkZvckhlYWRlckxheWVyID0gRmxv YXRQb2ludChzY3JvbGxPZmZzZXRGb3JGaXhlZC53aWR0aCgpLCBGcmFtZVZpZXc6OnlQb3NpdGlv bkZvckhlYWRlckxheWVyKHNjcm9sbFBvc2l0aW9uLCB0b3BDb250ZW50SW5zZXQpKTsKKyAgICAg ICAgICAgIEZsb2F0UG9pbnQgcG9zaXRpb25Gb3JGb290ZXJMYXllciA9IEZsb2F0UG9pbnQoc2Ny b2xsT2Zmc2V0Rm9yRml4ZWQud2lkdGgoKSwKKyAgICAgICAgICAgICAgICBGcmFtZVZpZXc6OnlQ b3NpdGlvbkZvckZvb3RlckxheWVyKHNjcm9sbFBvc2l0aW9uLCB0b3BDb250ZW50SW5zZXQsIGZy YW1lVmlldy0+dG90YWxDb250ZW50c1NpemUoKS5oZWlnaHQoKSwgZnJhbWVWaWV3LT5mb290ZXJI ZWlnaHQoKSkpOwogCiAgICAgICAgICAgICBpZiAocHJvZ3JhbW1hdGljU2Nyb2xsIHx8IHNjcm9s bGluZ0xheWVyUG9zaXRpb25BY3Rpb24gPT0gU2V0U2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbikgewog ICAgICAgICAgICAgICAgIHNjcm9sbExheWVyLT5zZXRQb3NpdGlvbigtZnJhbWVWaWV3LT5zY3Jv bGxQb3NpdGlvbigpKTsKQEAgLTIzNCw5ICsyMzcsOSBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnVwZGF0ZVNjCiAgICAgICAgICAgICAgICAgaWYgKHNjcm9sbGVkQ29udGVudHNM YXllcikKICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZWRDb250ZW50c0xheWVyLT5zZXRQb3Np dGlvbihwb3NpdGlvbkZvckNvbnRlbnRzTGF5ZXIpOwogICAgICAgICAgICAgICAgIGlmIChoZWFk ZXJMYXllcikKLSAgICAgICAgICAgICAgICAgICAgaGVhZGVyTGF5ZXItPnNldFBvc2l0aW9uKEZs b2F0UG9pbnQoc2Nyb2xsT2Zmc2V0Rm9yRml4ZWQud2lkdGgoKSwgMCkpOworICAgICAgICAgICAg ICAgICAgICBoZWFkZXJMYXllci0+c2V0UG9zaXRpb24ocG9zaXRpb25Gb3JIZWFkZXJMYXllcik7 CiAgICAgICAgICAgICAgICAgaWYgKGZvb3RlckxheWVyKQotICAgICAgICAgICAgICAgICAgICBm b290ZXJMYXllci0+c2V0UG9zaXRpb24oRmxvYXRQb2ludChzY3JvbGxPZmZzZXRGb3JGaXhlZC53 aWR0aCgpLCBmcmFtZVZpZXctPnRvdGFsQ29udGVudHNTaXplKCkuaGVpZ2h0KCkgLSBmcmFtZVZp ZXctPmZvb3RlckhlaWdodCgpKSk7CisgICAgICAgICAgICAgICAgICAgIGZvb3RlckxheWVyLT5z ZXRQb3NpdGlvbihwb3NpdGlvbkZvckZvb3RlckxheWVyKTsKICAgICAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICAgICAgc2Nyb2xsTGF5ZXItPnN5bmNQb3NpdGlvbigtZnJhbWVWaWV3LT5z Y3JvbGxQb3NpdGlvbigpKTsKICAgICAgICAgICAgICAgICBpZiAoY291bnRlclNjcm9sbGluZ0xh eWVyKQpAQCAtMjQ2LDkgKzI0OSw5IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6 dXBkYXRlU2MKICAgICAgICAgICAgICAgICBpZiAoc2Nyb2xsZWRDb250ZW50c0xheWVyKQogICAg ICAgICAgICAgICAgICAgICBzY3JvbGxlZENvbnRlbnRzTGF5ZXItPnN5bmNQb3NpdGlvbihwb3Np dGlvbkZvckNvbnRlbnRzTGF5ZXIpOwogICAgICAgICAgICAgICAgIGlmIChoZWFkZXJMYXllcikK LSAgICAgICAgICAgICAgICAgICAgaGVhZGVyTGF5ZXItPnN5bmNQb3NpdGlvbihGbG9hdFBvaW50 KHNjcm9sbE9mZnNldEZvckZpeGVkLndpZHRoKCksIDApKTsKKyAgICAgICAgICAgICAgICAgICAg aGVhZGVyTGF5ZXItPnN5bmNQb3NpdGlvbihwb3NpdGlvbkZvckhlYWRlckxheWVyKTsKICAgICAg ICAgICAgICAgICBpZiAoZm9vdGVyTGF5ZXIpCi0gICAgICAgICAgICAgICAgICAgIGZvb3Rlckxh eWVyLT5zeW5jUG9zaXRpb24oRmxvYXRQb2ludChzY3JvbGxPZmZzZXRGb3JGaXhlZC53aWR0aCgp LCBmcmFtZVZpZXctPnRvdGFsQ29udGVudHNTaXplKCkuaGVpZ2h0KCkgLSBmcmFtZVZpZXctPmZv b3RlckhlaWdodCgpKSk7CisgICAgICAgICAgICAgICAgICAgIGZvb3RlckxheWVyLT5zeW5jUG9z aXRpb24ocG9zaXRpb25Gb3JGb290ZXJMYXllcik7CiAKICAgICAgICAgICAgICAgICBMYXlvdXRS ZWN0IHZpZXdwb3J0UmVjdCA9IGZyYW1lVmlldy0+dmlld3BvcnRDb25zdHJhaW5lZFZpc2libGVD b250ZW50UmVjdCgpOwogICAgICAgICAgICAgICAgIHN5bmNDaGlsZFBvc2l0aW9ucyh2aWV3cG9y dFJlY3QpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29v cmRpbmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAkocmV2aXNpb24gMTY4NTM4KQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMjEsNyArMjIxLDcgQEAgR3JhcGhpY3NMYXllciogU2Nyb2xsaW5nQ29vcmRpbmF0 b3I6OmhlYQogewogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKICAgICBpZiAoUmVuZGVyVmll dyogcmVuZGVyVmlldyA9IGZyYW1lVmlldy0+ZnJhbWUoKS5jb250ZW50UmVuZGVyZXIoKSkKLSAg ICAgICAgcmVuZGVyVmlldy0+Y29tcG9zaXRvcigpLmhlYWRlckxheWVyKCk7CisgICAgICAgIHJl dHVybiByZW5kZXJWaWV3LT5jb21wb3NpdG9yKCkuaGVhZGVyTGF5ZXIoKTsKICAgICByZXR1cm4g MDsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGZyYW1lVmlldyk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tCShyZXZpc2lvbiAxNjg1MzgpCisrKyBTb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTM1OSw3ICszNTksNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlTWFjOjpzZXRTCiAgICAgaWYgKG1faW5zZXRDbGlwTGF5ZXIgJiYgbV9zY3JvbGxl ZENvbnRlbnRzTGF5ZXIgJiYgdG9wQ29udGVudEluc2V0KSB7CiAgICAgICAgIG1faW5zZXRDbGlw TGF5ZXIuZ2V0KCkucG9zaXRpb24gPSBGbG9hdFBvaW50KDAsIEZyYW1lVmlldzo6eVBvc2l0aW9u Rm9ySW5zZXRDbGlwTGF5ZXIocG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCkpOwogICAgICAgICBt X3Njcm9sbGVkQ29udGVudHNMYXllci5nZXQoKS5wb3NpdGlvbiA9IEZsb2F0UG9pbnQobV9zY3Jv bGxlZENvbnRlbnRzTGF5ZXIuZ2V0KCkucG9zaXRpb24ueCwKLSAgICAgICAgICAgIEZyYW1lVmll dzo6eVBvc2l0aW9uRm9yUm9vdENvbnRlbnRMYXllcihwb3NpdGlvbiwgdG9wQ29udGVudEluc2V0 KSk7CisgICAgICAgICAgICBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvclJvb3RDb250ZW50TGF5ZXIo cG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCwgaGVhZGVySGVpZ2h0KCkpKTsKICAgICB9CiAKICAg ICBpZiAobV9oZWFkZXJMYXllciB8fCBtX2Zvb3RlckxheWVyKSB7CkBAIC0zNzEsMTAgKzM3MSwx MSBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTCiAgICAgICAgICAg ICBob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVyID0gRnJhbWVWaWV3OjpzY3JvbGxPZmZz ZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qodmlld3BvcnRSZWN0KSwgdG90 YWxDb250ZW50c1NpemUoKSwgZmxvb3JlZEludFBvaW50KHNjcm9sbE9mZnNldCksIHNjcm9sbE9y aWdpbigpLCAxLCBmYWxzZSwgYmVoYXZpb3JGb3JGaXhlZCwgaGVhZGVySGVpZ2h0KCksIGZvb3Rl ckhlaWdodCgpKS53aWR0aCgpOwogCiAgICAgICAgIGlmIChtX2hlYWRlckxheWVyKQotICAgICAg ICAgICAgbV9oZWFkZXJMYXllci5nZXQoKS5wb3NpdGlvbiA9IEZsb2F0UG9pbnQoaG9yaXpvbnRh bFNjcm9sbE9mZnNldEZvckJhbm5lciwgMCk7CisgICAgICAgICAgICBtX2hlYWRlckxheWVyLmdl dCgpLnBvc2l0aW9uID0gRmxvYXRQb2ludChob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVy LCBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvckhlYWRlckxheWVyKHBvc2l0aW9uLCB0b3BDb250ZW50 SW5zZXQpKTsKIAogICAgICAgICBpZiAobV9mb290ZXJMYXllcikKLSAgICAgICAgICAgIG1fZm9v dGVyTGF5ZXIuZ2V0KCkucG9zaXRpb24gPSBGbG9hdFBvaW50KGhvcml6b250YWxTY3JvbGxPZmZz ZXRGb3JCYW5uZXIsIHRvdGFsQ29udGVudHNTaXplKCkuaGVpZ2h0KCkgLSBmb290ZXJIZWlnaHQo KSk7CisgICAgICAgICAgICBtX2Zvb3RlckxheWVyLmdldCgpLnBvc2l0aW9uID0gRmxvYXRQb2lu dChob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVyLAorICAgICAgICAgICAgICAgIEZyYW1l Vmlldzo6eVBvc2l0aW9uRm9yRm9vdGVyTGF5ZXIocG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCwg dG90YWxDb250ZW50c1NpemUoKS5oZWlnaHQoKSwgZm9vdGVySGVpZ2h0KCkpKTsKICAgICB9CiAK ICAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbGJhclBhaW50ZXIgfHwgbV9ob3Jpem9udGFsU2Nyb2xs YmFyUGFpbnRlcikgewpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHJldmlzaW9uIDE2ODUzOCkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xOTUzLDggKzE5NTMsOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlUm9v dExhCiAgICAgaWYgKG1fcm9vdENvbnRlbnRMYXllcikgewogICAgICAgICBjb25zdCBJbnRSZWN0 JiBkb2N1bWVudFJlY3QgPSBtX3JlbmRlclZpZXcuZG9jdW1lbnRSZWN0KCk7CiAgICAgICAgIG1f cm9vdENvbnRlbnRMYXllci0+c2V0U2l6ZShkb2N1bWVudFJlY3Quc2l6ZSgpKTsgICAgICAgIAot ICAgICAgICBtX3Jvb3RDb250ZW50TGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoZG9jdW1l bnRSZWN0LngoKSwgZG9jdW1lbnRSZWN0LnkoKSArIG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5o ZWFkZXJIZWlnaHQoKQotICAgICAgICAgICAgKyBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvclJvb3RD b250ZW50TGF5ZXIobV9yZW5kZXJWaWV3LmZyYW1lVmlldygpLnNjcm9sbFBvc2l0aW9uKCksIG1f cmVuZGVyVmlldy5mcmFtZVZpZXcoKS50b3BDb250ZW50SW5zZXQoKSkpKTsKKyAgICAgICAgbV9y b290Q29udGVudExheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KGRvY3VtZW50UmVjdC54KCks IGRvY3VtZW50UmVjdC55KCkKKyAgICAgICAgICAgICsgRnJhbWVWaWV3Ojp5UG9zaXRpb25Gb3JS b290Q29udGVudExheWVyKG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5zY3JvbGxQb3NpdGlvbigp LCBtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkudG9wQ29udGVudEluc2V0KCksIG1fcmVuZGVyVmll dy5mcmFtZVZpZXcoKS5oZWFkZXJIZWlnaHQoKSkpKTsKICAgICAgICAgbV9yb290Q29udGVudExh eWVyLT5zZXRBbmNob3JQb2ludChGbG9hdFBvaW50M0QoKSk7CiAgICAgfQogICAgIGlmIChtX2Ns aXBMYXllcikgewpAQCAtMjk2Niw3ICsyOTY2LDggQEAgR3JhcGhpY3NMYXllciogUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cAogICAgICAgICBtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkuYWRkUGFp bnRQZW5kaW5nTWlsZXN0b25lcyhEaWRGaXJzdEZsdXNoRm9ySGVhZGVyTGF5ZXIpOwogICAgIH0K IAotICAgIG1fbGF5ZXJGb3JIZWFkZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSk7CisgICAg bV9sYXllckZvckhlYWRlci0+c2V0UG9zaXRpb24oRmxvYXRQb2ludCgwLAorICAgICAgICBGcmFt ZVZpZXc6OnlQb3NpdGlvbkZvckhlYWRlckxheWVyKG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5z Y3JvbGxQb3NpdGlvbigpLCBtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkudG9wQ29udGVudEluc2V0 KCkpKSk7CiAgICAgbV9sYXllckZvckhlYWRlci0+c2V0QW5jaG9yUG9pbnQoRmxvYXRQb2ludDNE KCkpOwogICAgIG1fbGF5ZXJGb3JIZWFkZXItPnNldFNpemUoRmxvYXRTaXplKG1fcmVuZGVyVmll dy5mcmFtZVZpZXcoKS52aXNpYmxlV2lkdGgoKSwgbV9yZW5kZXJWaWV3LmZyYW1lVmlldygpLmhl YWRlckhlaWdodCgpKSk7CiAKQEAgLTMwMDUsNyArMzAwNiw5IEBAIEdyYXBoaWNzTGF5ZXIqIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6dXAKICAgICAgICAgbV9zY3JvbGxMYXllci0+YWRkQ2hpbGRC ZWxvdyhtX2xheWVyRm9yRm9vdGVyLmdldCgpLCBtX3Jvb3RDb250ZW50TGF5ZXIuZ2V0KCkpOwog ICAgIH0KIAotICAgIG1fbGF5ZXJGb3JGb290ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoMCwg bV9yb290Q29udGVudExheWVyLT5zaXplKCkuaGVpZ2h0KCkgKyBtX3JlbmRlclZpZXcuZnJhbWVW aWV3KCkuaGVhZGVySGVpZ2h0KCkpKTsKKyAgICBmbG9hdCB0b3RhbENvbnRlbnRIZWlnaHQgPSBt X3Jvb3RDb250ZW50TGF5ZXItPnNpemUoKS5oZWlnaHQoKSArIG1fcmVuZGVyVmlldy5mcmFtZVZp ZXcoKS5oZWFkZXJIZWlnaHQoKSArIG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS5mb290ZXJIZWln aHQoKTsKKyAgICBtX2xheWVyRm9yRm9vdGVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KDAsIEZy YW1lVmlldzo6eVBvc2l0aW9uRm9yRm9vdGVyTGF5ZXIobV9yZW5kZXJWaWV3LmZyYW1lVmlldygp LnNjcm9sbFBvc2l0aW9uKCksCisgICAgICAgIG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS50b3BD b250ZW50SW5zZXQoKSwgdG90YWxDb250ZW50SGVpZ2h0LCBtX3JlbmRlclZpZXcuZnJhbWVWaWV3 KCkuZm9vdGVySGVpZ2h0KCkpKSk7CiAgICAgbV9sYXllckZvckZvb3Rlci0+c2V0QW5jaG9yUG9p bnQoRmxvYXRQb2ludDNEKCkpOwogICAgIG1fbGF5ZXJGb3JGb290ZXItPnNldFNpemUoRmxvYXRT aXplKG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKS52aXNpYmxlV2lkdGgoKSwgbV9yZW5kZXJWaWV3 LmZyYW1lVmlldygpLmZvb3RlckhlaWdodCgpKSk7CiAK