110261 2013-02-19 14:07:36 -0800 Clarify isInWindow vs. isVisible path through to RenderLayerCompositor 2013-02-20 13:19:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca eric esprehn+autocc ojan.autocc sam simon.fraser webkit.review.bot oldest_to_newest 836764 0 thorton 2013-02-19 14:07:36 -0800 RenderLayerCompositor currently uses "didMoveOnscreen/willMoveOffscreen" to tell its TiledBacking that it entered/left a window. However, those methods are called when page visibility changes occur as well. Since TiledBacking really wants "is in window", not "is visible", clear up the path that these two properties take. This also means that we don't need didMoveOnscreen/willMoveOffscreen in RenderView or RenderLayerCompositor anymore. The end effect of all of this is that we will stop unparenting TileCaches willy-nilly when the page moves offscreen (when the browser is hidden or occluded or minimized or whatever), and only do that work when the view is actually being removed from the window (or going into the page cache?). <rdar://problem/13196122> 836846 1 189180 thorton 2013-02-19 15:21:39 -0800 Created attachment 189180 patch Still needs a test. 837015 2 thorton 2013-02-19 17:42:17 -0800 Not gonna get a test, the only way to test this is (as far as I can tell) by looking at the tile cache, so we're immediately limited to testing on mac-wk2. Then, the TileCache discards tiles on a 4 second timer, so the test would have to wait for a long time. Not ideal. 837020 3 webkit.review.bot 2013-02-19 17:44:46 -0800 Attachment 189180 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.exp.in', u'Source/WebCore/dom/Document.cpp', u'Source/WebCore/page/FrameView.cpp', u'Source/WebCore/page/FrameView.h', u'Source/WebCore/page/Page.cpp', u'Source/WebCore/page/Page.h', u'Source/WebCore/rendering/RenderLayerCompositor.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.h', u'Source/WebCore/rendering/RenderView.cpp', u'Source/WebCore/rendering/RenderView.h', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/WebView/WebView.mm', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/WebProcess/WebPage/WebPage.cpp']" exit_code: 1 Source/WebCore/page/FrameView.h:156: The parameter name "isInWindow" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/page/Page.h:289: The parameter name "isInWindow" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 837137 4 thorton 2013-02-19 21:57:06 -0800 http://trac.webkit.org/changeset/143428 837689 5 thorton 2013-02-20 13:19:26 -0800 This required one followup change: http://trac.webkit.org/changeset/143490 189180 2013-02-19 15:21:39 -0800 2013-02-19 17:49:36 -0800 patch isinwindow.diff text/plain 14245 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMGNmOWEzLi41ZDMxN2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMg QEAKKzIwMTMtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQ2xhcmlmeSBpc0luV2luZG93IHZzLiBpc1Zpc2libGUgcGF0aCB0aHJvdWdoIHRv IFJlbmRlckxheWVyQ29tcG9zaXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTEwMjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzE5NjEyMj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp3aWxsTW92ZU9mZnNjcmVlbi9kaWRNb3ZlT25zY3JlZW4u CisgICAgICAgIEFkZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNldElzSW5XaW5kb3csIGFuZCBw aXBlIGluLXdpbmRvdyBjaGFuZ2VzIHRocm91Z2ggZnJvbSBQYWdlOjpzZXRJc0luV2luZG93Lgor ICAgICAgICBBZGp1c3QgYSBmZXcgRG9jdW1lbnQgZnVuY3Rpb25zIHRoYXQgcHJldmlvdXNseSBj YWxsZWQgUmVuZGVyVmlldzo6ZGlkTW92ZU9uc2NyZWVuL3dpbGxNb3ZlT2Zmc2NyZWVuIHRvIHVz ZSBzZXRJc0luV2luZG93IGluc3RlYWQsIHNpbmNlIGluLXdpbmRvdyBzdGF0ZSBjaGFuZ2VzIGFy ZSBvY2N1cnJpbmcgd2hlbiBhdHRhY2hpbmcgYW5kIGRldGFjaGluZyBkb2N1bWVudHMuCisKKyAg ICAgICAgKiBXZWJDb3JlLmV4cC5pbjogRXhwb3J0IFBhZ2U6OnNldElzSW5XaW5kb3cuCisgICAg ICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjphdHRh Y2gpOiBVc2Ugc2V0SXNJbldpbmRvdyBpbnN0ZWFkIG9mIGRpZE1vdmVPbnNjcmVlbi4KKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpkb2N1bWVudFdpbGxCZWNvbWVJbmFjdGl2ZSk6IFVzZSBz ZXRJc0luV2luZG93IGluc3RlYWQgb2Ygd2lsbE1vdmVPZmZzY3JlZW4uCisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6ZG9jdW1lbnREaWRSZXN1bWVGcm9tUGFnZUNhY2hlKTogVXNlIHNldElz SW5XaW5kb3cgaW5zdGVhZCBvZiBkaWRNb3ZlT25zY3JlZW4uCisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpkaWRNb3ZlT25zY3JlZW4p OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp3aWxsTW92ZU9mZnNjcmVlbik6CisgICAg ICAgIFJlbmRlclZpZXcgZG9lc24ndCBjYXJlIGFib3V0IG1vdmluZyBvbi9vZmZzY3JlZW4sIGp1 c3QgaW4td2luZG93IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRJc0lu V2luZG93KTogQWRkZWQuIEZvcndhcmQgaXNJbldpbmRvdyBjaGFuZ2VzIHRvIG91ciBSZW5kZXJW aWV3LgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChGcmFtZVZpZXcpOiBB ZGQgc2V0SXNJbldpbmRvdy4KKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6c2V0SXNJbldpbmRvdyk6IEFkZGVkLiBGb3J3YXJkIGlzSW5XaW5kb3cgY2hh bmdlcyB0byB0aGUgUGFnZSdzIEZyYW1lVmlld3MuCisgICAgICAgICogcGFnZS9QYWdlLmg6Cisg ICAgICAgIChQYWdlKTogQWRkIHNldElzSW5XaW5kb3cuCisgICAgICAgIChXZWJDb3JlOjpQYWdl Ojppc0luV2luZG93KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2V0SXNJbldp bmRvdyk6IEFkZGVkLiBSZXBsYWNlIHdpbGxNb3ZlT2Zmc2NyZWVuL2RpZE1vdmVPbnNjcmVlbiB3 aXRoIHNldElzSW5XaW5kb3csCisgICAgICAgIHNpbmNlIHRoYXQncyB0aGUgb25seSBjaGFuZ2Ug d2UgYWN0dWFsbHkgY2FyZSBhYm91dC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmg6CisgICAgICAgIChSZW5kZXJMYXllckNvbXBvc2l0b3IpOiBBZGQgc2V0SXNJ bldpbmRvdy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJWaWV3OjpzZXRJc0luV2luZG93KTogQWRkZWQuIFJlcGxhY2Ugd2lsbE1v dmVPZmZzY3JlZW4vZGlkTW92ZU9uc2NyZWVuIHdpdGggc2V0SXNJbldpbmRvdywKKyAgICAgICAg c2luY2UgdGhhdCdzIHRoZSBvbmx5IGNoYW5nZSBSZW5kZXJMYXllckNvbXBvc2l0b3IgYWN0dWFs bHkgY2FyZXMgYWJvdXQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAg ICAgKFJlbmRlclZpZXcpOiBBZGQgc2V0SXNJbldpbmRvdy4KKwogMjAxMy0wMi0xOCAgSnVsaWVu IENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbQ1NTIEdyaWQg TGF5b3V0XSBSZWZhY3RvciBncmlkIHBvc2l0aW9uIHJlc29sdXRpb24gY29kZSB0byBzdXBwb3J0 IGFuIGludGVybmFsIGdyaWQgcmVwcmVzZW50YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXgg OTQwMmY3MC4uNWVkZTgyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTc3MSw2ICs3NzEsNyBA QCBfX1pON1dlYkNvcmU0UGFnZTExUGFnZUNsaWVudHNEMUV2CiBfX1pON1dlYkNvcmU0UGFnZTEy c2V0R3JvdXBOYW1lRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlNFBhZ2UxMXNldFZpZXdN b2RlRU5TMF84Vmlld01vZGVFCiBfX1pON1dlYkNvcmU0UGFnZTEzcmFuZ2VPZlN0cmluZ0VSS04z V1RGNlN0cmluZ0VQTlNfNVJhbmdlRWoKK19fWk43V2ViQ29yZTRQYWdlMTNzZXRJc0luV2luZG93 RWIKIF9fWk43V2ViQ29yZTRQYWdlMTNzZXRQYWdpbmF0aW9uRVJLTlNfMTBQYWdpbmF0aW9uRQog X19aTjdXZWJDb3JlNFBhZ2UxNHNldE1lZGlhVm9sdW1lRWYKIF9fWk43V2ViQ29yZTRQYWdlMTVh ZGRTY2hlZHVsZVBhaXJFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTJTY2hlZHVsZVBhaXJFRUUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGY2M2U1ZDcuLmQ1YjI1NjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcApAQCAtMjAxNSw3ICsyMDE1LDcgQEAgdm9pZCBEb2N1bWVudDo6YXR0YWNoKCkK ICAgICAvLyBDcmVhdGUgdGhlIHJlbmRlcmluZyB0cmVlCiAgICAgc2V0UmVuZGVyZXIobmV3ICht X3JlbmRlckFyZW5hLmdldCgpKSBSZW5kZXJWaWV3KHRoaXMpKTsKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCi0gICAgcmVuZGVyVmlldygpLT5kaWRNb3ZlT25zY3JlZW4oKTsKKyAg ICByZW5kZXJWaWV3KCktPnNldElzSW5XaW5kb3codHJ1ZSk7CiAjZW5kaWYKIAogICAgIHJlY2Fs Y1N0eWxlKEZvcmNlKTsKQEAgLTQwMzUsNyArNDAzNSw3IEBAIHZvaWQgRG9jdW1lbnQ6OmRvY3Vt ZW50V2lsbEJlY29tZUluYWN0aXZlKCkKIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCiAgICAgaWYgKHJlbmRlcmVyKCkpCi0gICAgICAgIHJlbmRlclZpZXcoKS0+d2lsbE1vdmVP ZmZzY3JlZW4oKTsKKyAgICAgICAgcmVuZGVyVmlldygpLT5zZXRJc0luV2luZG93KGZhbHNlKTsK ICNlbmRpZgogfQogCkBAIC00MDY0LDcgKzQwNjQsNyBAQCB2b2lkIERvY3VtZW50Ojpkb2N1bWVu dERpZFJlc3VtZUZyb21QYWdlQ2FjaGUoKQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQogICAgIGlmIChyZW5kZXJlcigpKQotICAgICAgICByZW5kZXJWaWV3KCktPmRpZE1vdmVP bnNjcmVlbigpOworICAgICAgICByZW5kZXJWaWV3KCktPnNldElzSW5XaW5kb3codHJ1ZSk7CiAj ZW5kaWYKIAogICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9IHZpZXcoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAppbmRleCBkYWNhMDg4Li42MjYxODlmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCkBAIC05NTksMTggKzk1OSwyMCBAQCBib29sIEZyYW1lVmlldzo6aXNTb2Z0 d2FyZVJlbmRlcmFibGUoKSBjb25zdAogCiB2b2lkIEZyYW1lVmlldzo6ZGlkTW92ZU9uc2NyZWVu KCkKIHsKLSAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IHRoaXMtPnJlbmRlclZpZXco KSkKLSAgICAgICAgcmVuZGVyVmlldy0+ZGlkTW92ZU9uc2NyZWVuKCk7CiAgICAgY29udGVudEFy ZWFEaWRTaG93KCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3Ojp3aWxsTW92ZU9mZnNjcmVlbigpCiB7 Ci0gICAgaWYgKFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSB0aGlzLT5yZW5kZXJWaWV3KCkpCi0g ICAgICAgIHJlbmRlclZpZXctPndpbGxNb3ZlT2Zmc2NyZWVuKCk7CiAgICAgY29udGVudEFyZWFE aWRIaWRlKCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpzZXRJc0luV2luZG93KGJvb2wgaXNJbldp bmRvdykKK3sKKyAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IHRoaXMtPnJlbmRlclZp ZXcoKSkKKyAgICAgICAgcmVuZGVyVmlldy0+c2V0SXNJbldpbmRvdyhpc0luV2luZG93KTsKK30K KwogUmVuZGVyT2JqZWN0KiBGcmFtZVZpZXc6OmxheW91dFJvb3QoYm9vbCBvbmx5RHVyaW5nTGF5 b3V0KSBjb25zdAogewogICAgIHJldHVybiBvbmx5RHVyaW5nTGF5b3V0ICYmIGxheW91dFBlbmRp bmcoKSA/IDAgOiBtX2xheW91dFJvb3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAyYmFm ZTYyLi5jNGZjNDllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTE1Myw2ICsxNTMsNyBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGRpZE1vdmVPbnNjcmVlbigpOwogICAgIHZvaWQgd2lsbE1v dmVPZmZzY3JlZW4oKTsKKyAgICB2b2lkIHNldElzSW5XaW5kb3coYm9vbCBpc0luV2luZG93KTsK IAogICAgIHZvaWQgcmVzZXRTY3JvbGxiYXJzKCk7CiAgICAgdm9pZCByZXNldFNjcm9sbGJhcnNB bmRDbGVhckNvbnRlbnRzU2l6ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggZWY5ZTg2OC4uYjhh Y2U2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC04NjMsNiArODYzLDE5IEBAIHZvaWQgUGFnZTo6 d2lsbE1vdmVPZmZzY3JlZW4oKQogICAgIHN1c3BlbmRTY3JpcHRlZEFuaW1hdGlvbnMoKTsKIH0K IAordm9pZCBQYWdlOjpzZXRJc0luV2luZG93KGJvb2wgaXNJbldpbmRvdykKK3sKKyAgICBpZiAo bV9pc0luV2luZG93ID09IGlzSW5XaW5kb3cpCisgICAgICAgIHJldHVybjsKKworICAgIG1faXNJ bldpbmRvdyA9IGlzSW5XaW5kb3c7CisKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1haW5GcmFt ZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoKSkgeworICAg ICAgICBpZiAoRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZS0+dmlldygpKQorICAgICAgICAg ICAgZnJhbWVWaWV3LT5zZXRJc0luV2luZG93KGlzSW5XaW5kb3cpOworICAgIH0KK30KKwogdm9p ZCBQYWdlOjp3aW5kb3dTY3JlZW5EaWRDaGFuZ2UoUGxhdGZvcm1EaXNwbGF5SUQgZGlzcGxheUlE KQogewogICAgIG1fZGlzcGxheUlEID0gZGlzcGxheUlEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCBkODRl Mzk5Li4wZTRhYWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMjg1LDYgKzI4NSwxMCBAQCBwdWJsaWM6 CiAgICAgdm9pZCB3aWxsTW92ZU9mZnNjcmVlbigpOwogICAgIGJvb2wgaXNPbnNjcmVlbigpIGNv bnN0IHsgcmV0dXJuIG1faXNPbnNjcmVlbjsgfQogCisgICAgLy8gTm90aWZpY2F0aW9uIHRoYXQg dGhpcyBQYWdlIHdhcyBtb3ZlZCBpbnRvIG9yIG91dCBvZiBhIG5hdGl2ZSB3aW5kb3cuCisgICAg dm9pZCBzZXRJc0luV2luZG93KGJvb2wgaXNJbldpbmRvdyk7CisgICAgYm9vbCBpc0luV2luZG93 KCkgY29uc3QgeyByZXR1cm4gbV9pc0luV2luZG93OyB9CisKICAgICB2b2lkIHdpbmRvd1NjcmVl bkRpZENoYW5nZShQbGF0Zm9ybURpc3BsYXlJRCk7CiAKICAgICB2b2lkIHN1c3BlbmRTY3JpcHRl ZEFuaW1hdGlvbnMoKTsKQEAgLTQ2Nyw2ICs0NzEsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBt X2lzRWRpdGFibGU7CiAgICAgYm9vbCBtX2lzT25zY3JlZW47CisgICAgYm9vbCBtX2lzSW5XaW5k b3c7CiAKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICBQYWdlVmlzaWJpbGl0 eVN0YXRlIG1fdmlzaWJpbGl0eVN0YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCAwNDM3MzMwLi5lODk2MWQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cApAQCAtMTUwMiwyNyArMTUwMiwyNiBAQCBUaWxlZEJhY2tpbmcqIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6cGFnZVRpbGVkQmFja2luZygpIGNvbnN0CiAgICAgcmV0dXJuIHJlbmRlclZpZXdCYWNr aW5nID8gcmVuZGVyVmlld0JhY2tpbmctPnRpbGVkQmFja2luZygpIDogMDsKIH0KIAotdm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OmRpZE1vdmVPbnNjcmVlbigpCit2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6c2V0SXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiB7CiAgICAgaWYgKFRp bGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gcGFnZVRpbGVkQmFja2luZygpKQotICAgICAgICB0 aWxlZEJhY2tpbmctPnNldElzSW5XaW5kb3codHJ1ZSk7CisgICAgICAgIHRpbGVkQmFja2luZy0+ c2V0SXNJbldpbmRvdyhpc0luV2luZG93KTsKIAotICAgIGlmICghaW5Db21wb3NpdGluZ01vZGUo KSB8fCBtX3Jvb3RMYXllckF0dGFjaG1lbnQgIT0gUm9vdExheWVyVW5hdHRhY2hlZCkKKyAgICBp ZiAoIWluQ29tcG9zaXRpbmdNb2RlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJvb3RMYXll ckF0dGFjaG1lbnQgYXR0YWNobWVudCA9IHNob3VsZFByb3BhZ2F0ZUNvbXBvc2l0aW5nVG9FbmNs b3NpbmdGcmFtZSgpID8gUm9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZSA6IFJvb3RM YXllckF0dGFjaGVkVmlhQ2hyb21lQ2xpZW50OwotICAgIGF0dGFjaFJvb3RMYXllcihhdHRhY2ht ZW50KTsKLX0KLQotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OndpbGxNb3ZlT2Zmc2NyZWVu KCkKLXsKLSAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBwYWdlVGlsZWRCYWNr aW5nKCkpCi0gICAgICAgIHRpbGVkQmFja2luZy0+c2V0SXNJbldpbmRvdyhmYWxzZSk7CisgICAg aWYgKGlzSW5XaW5kb3cpIHsKKyAgICAgICAgaWYgKG1fcm9vdExheWVyQXR0YWNobWVudCAhPSBS b290TGF5ZXJVbmF0dGFjaGVkKQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCFpbkNv bXBvc2l0aW5nTW9kZSgpIHx8IG1fcm9vdExheWVyQXR0YWNobWVudCA9PSBSb290TGF5ZXJVbmF0 dGFjaGVkKQotICAgICAgICByZXR1cm47CisgICAgICAgIFJvb3RMYXllckF0dGFjaG1lbnQgYXR0 YWNobWVudCA9IHNob3VsZFByb3BhZ2F0ZUNvbXBvc2l0aW5nVG9FbmNsb3NpbmdGcmFtZSgpID8g Um9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZSA6IFJvb3RMYXllckF0dGFjaGVkVmlh Q2hyb21lQ2xpZW50OworICAgICAgICBhdHRhY2hSb290TGF5ZXIoYXR0YWNobWVudCk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgaWYgKG1fcm9vdExheWVyQXR0YWNobWVudCA9PSBSb290TGF5ZXJV bmF0dGFjaGVkKQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgZGV0YWNoUm9vdExheWVyKCk7 CisgICAgICAgIGRldGFjaFJvb3RMYXllcigpOworICAgIH0KIH0KIAogdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmNsZWFyQmFja2luZ0ZvckxheWVySW5jbHVkaW5nRGVzY2VuZGFudHMoUmVu ZGVyTGF5ZXIqIGxheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5oCmluZGV4IGNiZTFkOWIuLjZiZjg1NTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTE3MSw4ICsxNzEs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVSb290TGF5ZXJBdHRhY2htZW50KCk7CiAgICAg dm9pZCB1cGRhdGVSb290TGF5ZXJQb3NpdGlvbigpOwogICAgIAotICAgIHZvaWQgZGlkTW92ZU9u c2NyZWVuKCk7Ci0gICAgdm9pZCB3aWxsTW92ZU9mZnNjcmVlbigpOworICAgIHZvaWQgc2V0SXNJ bldpbmRvdyhib29sKTsKIAogICAgIHZvaWQgY2xlYXJCYWNraW5nRm9yQWxsTGF5ZXJzKCk7CiAg ICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggOGNhMjg4ZS4u NzEyYjZhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtMTA3 NywxOSArMTA3NywxMSBAQCBSZW5kZXJMYXllckNvbXBvc2l0b3IqIFJlbmRlclZpZXc6OmNvbXBv c2l0b3IoKQogfQogI2VuZGlmCiAKLXZvaWQgUmVuZGVyVmlldzo6ZGlkTW92ZU9uc2NyZWVuKCkK K3ZvaWQgUmVuZGVyVmlldzo6c2V0SXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiB7CiAjaWYg VVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlmIChtX2NvbXBvc2l0b3IpCi0gICAg ICAgIG1fY29tcG9zaXRvci0+ZGlkTW92ZU9uc2NyZWVuKCk7Ci0jZW5kaWYKLX0KLQotdm9pZCBS ZW5kZXJWaWV3Ojp3aWxsTW92ZU9mZnNjcmVlbigpCi17Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKQotICAgIGlmIChtX2NvbXBvc2l0b3IpCi0gICAgICAgIG1fY29tcG9zaXRvci0+ d2lsbE1vdmVPZmZzY3JlZW4oKTsKKyAgICAgICAgbV9jb21wb3NpdG9yLT5zZXRJc0luV2luZG93 KGlzSW5XaW5kb3cpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmll dy5oCmluZGV4IDg5NzgwNWEuLmQ2YWE0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clZpZXcuaApAQCAtMTgzLDEwICsxODMsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRQcmludFJl Y3QoY29uc3QgSW50UmVjdCYgcikgeyBtX2xlZ2FjeVByaW50aW5nLm1fcHJpbnRSZWN0ID0gcjsg fQogICAgIC8vIEVuZCBkZXByZWNhdGVkIGZ1bmN0aW9ucy4KIAotICAgIC8vIE5vdGlmaWNhdGlv bnMgdGhhdCB0aGlzIHZpZXcgYmVjYW1lIHZpc2libGUgaW4gYSB3aW5kb3csIG9yIHdpbGwgYmUK LSAgICAvLyByZW1vdmVkIGZyb20gdGhlIHdpbmRvdy4KLSAgICB2b2lkIGRpZE1vdmVPbnNjcmVl bigpOwotICAgIHZvaWQgd2lsbE1vdmVPZmZzY3JlZW4oKTsKKyAgICAvLyBOb3RpZmljYXRpb24g dGhhdCB0aGlzIHZpZXcgbW92ZWQgaW50byBvciBvdXQgb2YgYSBuYXRpdmUgd2luZG93LgorICAg IHZvaWQgc2V0SXNJbldpbmRvdyhib29sKTsKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKICAgICBSZW5kZXJMYXllckNvbXBvc2l0b3IqIGNvbXBvc2l0b3IoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwppbmRleCAzNzE2NDY0Li5lZjM2ODg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTMtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQ2xhcmlmeSBpc0luV2luZG93IHZzLiBpc1Zpc2libGUgcGF0aCB0aHJvdWdo IHRvIFJlbmRlckxheWVyQ29tcG9zaXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzE5NjEy Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyB2aWV3V2lsbE1vdmVUb1dpbmRv dzpdKToKKyAgICAgICAgKC1bV2ViVmlldyB2aWV3RGlkTW92ZVRvV2luZG93XSk6CisgICAgICAg IFVzZSBQYWdlOjpzZXRJc0luV2luZG93IGluIGFkZGl0aW9uIHRvIHdpbGxNb3ZlT2Zmc2NyZWVu L2RpZE1vdmVPbnNjcmVlbi4KKwogMjAxMy0wMi0xNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSByZW1vdmUgd2tDYXB0aW9uQXBwZWFyYW5j ZSBmcm9tIFdlYktpdFN5c3RlbUludGVyZmFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCmluZGV4IGZjYzliNGYuLmJiNTA0ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0KQEAgLTM2MTAsNiArMzYxMCw3IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tp bmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sCiAgICAg fSBlbHNlIHsKICAgICAgICAgX3ByaXZhdGUtPnBhZ2UtPnNldENhblN0YXJ0TWVkaWEoZmFsc2Up OwogICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+d2lsbE1vdmVPZmZzY3JlZW4oKTsKKyAgICAgICAg X3ByaXZhdGUtPnBhZ2UtPnNldElzSW5XaW5kb3coZmFsc2UpOwogICAgIH0KICAgICAgICAgCiAg ICAgaWYgKHdpbmRvdyAhPSBbc2VsZiB3aW5kb3ddKSB7CkBAIC0zNjMwLDYgKzM2MzEsNyBAQCBz dGF0aWMgTlNTdHJpbmcgKiBjb25zdCBiYWNraW5nUHJvcGVydHlPbGRTY2FsZUZhY3RvcktleSA9 IEAiTlNCYWNraW5nUHJvcGVydHlPbAogICAgIGlmIChbc2VsZiB3aW5kb3ddKSB7CiAgICAgICAg IF9wcml2YXRlLT5wYWdlLT5zZXRDYW5TdGFydE1lZGlhKHRydWUpOwogICAgICAgICBfcHJpdmF0 ZS0+cGFnZS0+ZGlkTW92ZU9uc2NyZWVuKCk7CisgICAgICAgIF9wcml2YXRlLT5wYWdlLT5zZXRJ c0luV2luZG93KHRydWUpOwogICAgIH0KICAgICAKICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0RGV2 aWNlU2NhbGVGYWN0b3IoW3NlbGYgX2RldmljZVNjYWxlRmFjdG9yXSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NThiMmFkNC4uNDg3NzVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTE5 ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIENsYXJp ZnkgaXNJbldpbmRvdyB2cy4gaXNWaXNpYmxlIHBhdGggdGhyb3VnaCB0byBSZW5kZXJMYXllckNv bXBvc2l0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMDI2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTMxOTYxMjI+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldElzSW5XaW5kb3cpOgor ICAgICAgICBVc2UgUGFnZTo6c2V0SXNJbldpbmRvdyBpbiBhZGRpdGlvbiB0byB3aWxsTW92ZU9m ZnNjcmVlbi9kaWRNb3ZlT25zY3JlZW4uCisKIDIwMTMtMDItMTggIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9yYWdlTWFuYWdlciBtZXNzYWdlIGhh bmRsZXJzIHNob3VsZCB0YWtlIHRoZSBjb25uZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNTA3OGFiZC4uYWU3ZDAzMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTk3Miw3 ICsxOTcyLDcgQEAgdm9pZCBXZWJQYWdlOjpzZXRJc0luV2luZG93KGJvb2wgaXNJbldpbmRvdykK ICAgICAgICAgbV9wYWdlLT5zZXRDYW5TdGFydE1lZGlhKGZhbHNlKTsKICAgICAgICAgbV9wYWdl LT53aWxsTW92ZU9mZnNjcmVlbigpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIERlZmVyIHRo ZSBjYWxsIHRvIFBhZ2U6OnNldENhblN0YXJ0TWVkaWEoKSBzaW5jZSBpdCBlbmRzIHVwIHNlbmRp bmcgYSBzeW5jcmhvbm91cyBtZXNzYWdlcyB0byB0aGUgVUkgcHJvY2VzcworICAgICAgICAvLyBE ZWZlciB0aGUgY2FsbCB0byBQYWdlOjpzZXRDYW5TdGFydE1lZGlhKCkgc2luY2UgaXQgZW5kcyB1 cCBzZW5kaW5nIGEgc3luY2hyb25vdXMgbWVzc2FnZSB0byB0aGUgVUkgcHJvY2VzcwogICAgICAg ICAvLyBpbiBvcmRlciB0byBnZXQgcGx1Zy1pbiBjb25uZWN0aW9ucywgYW5kIHRoZSBVSSBwcm9j ZXNzIHdpbGwgYmUgd2FpdGluZyBmb3IgdGhlIFdlYiBwcm9jZXNzIHRvIHVwZGF0ZSB0aGUgYmFj a2luZwogICAgICAgICAvLyBzdG9yZSBhZnRlciBtb3ZpbmcgdGhlIHZpZXcgaW50byBhIHdpbmRv dywgdW50aWwgaXQgdGltZXMgb3V0IGFuZCBwYWludHMgd2hpdGUuIFNlZSA8cmRhcjovL3Byb2Js ZW0vOTI0Mjc3MT4uCiAgICAgICAgIGlmIChtX21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3cpCkBA IC0xOTgwLDYgKzE5ODAsOCBAQCB2b2lkIFdlYlBhZ2U6OnNldElzSW5XaW5kb3coYm9vbCBpc0lu V2luZG93KQogCiAgICAgICAgIG1fcGFnZS0+ZGlkTW92ZU9uc2NyZWVuKCk7CiAgICAgfQorCisg ICAgbV9wYWdlLT5zZXRJc0luV2luZG93KGlzSW5XaW5kb3cpOwogfQogCiB2b2lkIFdlYlBhZ2U6 OmRpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0 ZW5lcklELCB1aW50MzJfdCBwb2xpY3lBY3Rpb24sIHVpbnQ2NF90IGRvd25sb2FkSUQpCg==