126457 2014-01-03 13:41:34 -0800 [iOS] [WK2] TileController creates all tiles on first paint, making it slow and consuming lots of memory 2014-01-03 16:33:02 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca benjamin matthew_hanson sam simon.fraser webkit-bug-importer oldest_to_newest 964255 0 thorton 2014-01-03 13:41:34 -0800 Otherwise, we make all of the tiles upfront. We can reuse the view exposed rect mechanism that already exists, we just have to: 1. Hook it up to WKView/WKContentView on iOS. 2. Plumb it through RemoteLayerTreeDrawingArea. 3. Make the WebPage(Proxy) bits available to iOS. There is a good bit of cleanup of all of this stuff that should happen, but this at least gets us to a functional state. 964256 1 webkit-bug-importer 2014-01-03 13:41:45 -0800 <rdar://problem/15745931> 964259 2 220335 thorton 2014-01-03 13:54:35 -0800 Created attachment 220335 patch 964260 3 220336 thorton 2014-01-03 14:03:38 -0800 Created attachment 220336 fix the title for sam 964265 4 220336 thorton 2014-01-03 14:11:08 -0800 Comment on attachment 220336 fix the title for sam View in context: https://bugs.webkit.org/attachment.cgi?id=220336&action=review > Source/WebKit2/ChangeLog:24 > + We can't use the existing WKContentView didScrollTo:, because it is > + expected to only fire when a scroll lands. Instead, add didLiveScrollTo:, > + which fires continually as scrolling progresses. Naming proposal: rename didScrollTo: to didFinishScrollTo:, and use didScrollTo: instead of didLiveScrollTo: 964266 5 220336 simon.fraser 2014-01-03 14:11:23 -0800 Comment on attachment 220336 fix the title for sam View in context: https://bugs.webkit.org/attachment.cgi?id=220336&action=review > Source/WebKit2/UIProcess/API/ios/WKContentView.h:68 > +- (void)didLiveScrollTo:(CGPoint)contentOffset; Hmm, we don't really use the term "live scroll" anywhere else. > Source/WebKit2/UIProcess/API/ios/WKContentView.mm:141 > + _page->viewExposedRectChanged(FloatRect(_page->viewExposedRect().location(), FloatSize(size)), true); No idea what true means. > Source/WebKit2/UIProcess/WebPageProxy.cpp:4398 > +void WebPageProxy::viewExposedRectChanged(const FloatRect& exposedRect, bool clipsToExposedRect) Please replace clipsToExposedRect with an enum 964323 6 thorton 2014-01-03 16:33:02 -0800 http://trac.webkit.org/changeset/161296 220335 2014-01-03 13:54:35 -0800 2014-01-03 14:03:38 -0800 patch fixtilecache2.diff text/plain 13717 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlNTE5MjAzLi4wZWVhYzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIg QEAKKzIwMTQtMDEtMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gW1dLMl0gSW5mb3JtIFRpbGVDb250cm9sbGVyIG9mIHRoZSB2aWV3J3Mg YWN0dWFsIGV4cG9zZWQgcmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI2NDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgYWxsIG9mIHRoZSB0aWxlcyBhbGwgb2YgdGhl IHRpbWUsIHdlIHNob3VsZCB1c2UgdGhlCisgICAgICAgIHZpZXctZXhwb3NlZC1yZWN0IG1lY2hh bmlzbSB0byBpbmZvcm0gVGlsZUNvbnRyb2xsZXIgYWJvdXQgd2hhdCBwb3J0aW9uCisgICAgICAg IG9mIHRoZSBXS0NvbnRlbnRWaWV3IGlzIGN1cnJlbnRseSBleHBvc2VkIGJ5IHRoZSBXS1Njcm9s bFZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBzZXRWaWV3cG9ydFNpemU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgZGlkU2Nyb2xsVG86XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZGlkTGl2ZVNjcm9s bFRvOl0pOgorICAgICAgICBJbmZvcm0gdGhlIFdlYlBhZ2VQcm94eSB0aGF0IG91ciBleHBvc2Vk IHJlY3QgY2hhbmdlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLVmlldy5tbToK KyAgICAgICAgKC1bV0tWaWV3IHNjcm9sbFZpZXdEaWRTY3JvbGw6XSk6CisgICAgICAgIEluZm9y bSB0aGUgV0tDb250ZW50VmlldyB0aGF0IHdlJ3ZlIHNjcm9sbGVkIGF0IGFsbC4KKyAgICAgICAg V2UgY2FuJ3QgdXNlIHRoZSBleGlzdGluZyBXS0NvbnRlbnRWaWV3IGRpZFNjcm9sbFRvOiwgYmVj YXVzZSBpdCBpcworICAgICAgICBleHBlY3RlZCB0byBvbmx5IGZpcmUgd2hlbiBhIHNjcm9sbCBs YW5kcy4gSW5zdGVhZCwgYWRkIGRpZExpdmVTY3JvbGxUbzosCisgICAgICAgIHdoaWNoIGZpcmVz IGNvbnRpbnVhbGx5IGFzIHNjcm9sbGluZyBwcm9ncmVzc2VzLgorCisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2Vi UGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3RXhwb3NlZFJl Y3RDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpleHBvc2VkUmVjdENo YW5nZWRUaW1lckZpcmVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld0V4cG9zZWRSZWN0KToKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgTW92ZSB2aWV3LWV4 cG9zZWQtcmVjdCBzdHVmZiB0byBXZWJQYWdlUHJveHkgc28gaXQgY2FuIGJlIGJ1aWx0IG9uIGJv dGgKKyAgICAgICAgTWFjIGFuZCBpT1MsIGFuZCB1bi0hUExBVEZPUk0oSU9TKSBzb21lIG9mIHRo ZSByZWxhdGVkIG1lbWJlcnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhKToKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnNldEV4cG9zZWRSZWN0 KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnNldENsaXBz VG9FeHBvc2VkUmVjdCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhOjp1cGRhdGVTY3JvbGxlZEV4cG9zZWRSZWN0KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVjdCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjptYWluRnJhbWVU aWxlZEJhY2tpbmcpOgorICAgICAgICBTdGVhbCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YSdzIGV4cG9zZWQtcmVjdCBjb2RlLgorICAgICAgICBOb3RlIHRoYXQgb24gaU9TLCB3ZSBkb24n dCBuZWVkIHRvIG1hbnVhbGx5IG9mZnNldCB0aGUgZXhwb3NlZCByZWN0IGJ5CisgICAgICAgIHRo ZSBzY3JvbGwgcG9zaXRpb24sIGJlY2F1c2UgdGhlIHNjcm9sbCBwb3NpdGlvbiBpcyBhbHJlYWR5 IGJha2VkIGludG8KKyAgICAgICAgdGhlIGV4cG9zZWQgcmVjdCwgYW5kIFdlYkNvcmUncyBub3Rp b24gb2YgdGhlIHNjcm9sbCBwb3NpdGlvbiB3aWxsIGJlCisgICAgICAgIGluYWNjdXJhdGUgdW50 aWwgdGhlIHNjcm9sbCBsYW5kcy4KKwogMjAxNC0wMS0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgRGVmaW5lIFdlYlByb2Nlc3M6OnVzZXNO ZXR3b3JrUHJvY2VzcyB1bmNvbmRpdGlvbmFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcuaAppbmRleCA0Y2M1MGU3Li4xZDE1OTU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oCkBA IC02NSw2ICs2NSw3IEBAIFdLX0FQSV9DTEFTUwogLSAodm9pZClzZXRWaWV3cG9ydFNpemU6KENH U2l6ZSlzaXplOwogCiAtICh2b2lkKWRpZFNjcm9sbFRvOihDR1BvaW50KWNvbnRlbnRPZmZzZXQ7 CistICh2b2lkKWRpZExpdmVTY3JvbGxUbzooQ0dQb2ludCljb250ZW50T2Zmc2V0OwogLSAodm9p ZClkaWRab29tVG9TY2FsZTooQ0dGbG9hdClzY2FsZTsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggMzZiZTM5YS4u YjIwNjRmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tD b250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tCkBAIC0xMzgsMTEgKzEzOCwxOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogLSAodm9pZClzZXRWaWV3cG9ydFNpemU6KENHU2l6ZSlzaXplCiB7CiAgICAgX3BhZ2UtPnNl dEZpeGVkTGF5b3V0U2l6ZShJbnRTaXplKHNpemUpKTsKKyAgICBfcGFnZS0+dmlld0V4cG9zZWRS ZWN0Q2hhbmdlZChGbG9hdFJlY3QoX3BhZ2UtPnZpZXdFeHBvc2VkUmVjdCgpLmxvY2F0aW9uKCks IEZsb2F0U2l6ZShzaXplKSksIHRydWUpOwogfQogCiAtICh2b2lkKWRpZFNjcm9sbFRvOihDR1Bv aW50KWNvbnRlbnRPZmZzZXQKIHsKICAgICBfcGFnZS0+ZGlkRmluaXNoU2Nyb2xsaW5nKGNvbnRl bnRPZmZzZXQpOworICAgIF9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKEZsb2F0UmVjdChG bG9hdFBvaW50KGNvbnRlbnRPZmZzZXQpLCBfcGFnZS0+Zml4ZWRMYXlvdXRTaXplKCkpLCB0cnVl KTsKK30KKworLSAodm9pZClkaWRMaXZlU2Nyb2xsVG86KENHUG9pbnQpY29udGVudE9mZnNldAor eworICAgIF9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKEZsb2F0UmVjdChGbG9hdFBvaW50 KGNvbnRlbnRPZmZzZXQpLCBfcGFnZS0+Zml4ZWRMYXlvdXRTaXplKCkpLCB0cnVlKTsKIH0KIAog LSAodm9pZClkaWRab29tVG9TY2FsZTooQ0dGbG9hdClzY2FsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9pb3MvV0tWaWV3Lm1tCmluZGV4IDM5ODkzYWIuLmNiNDQ4M2YgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXcubW0KQEAgLTIxMCw2ICsyMTAsMTIg QEAgc3RhdGljIHN0cnVjdCBfVUlXZWJWaWV3cG9ydENvbmZpZ3VyYXRpb24gc3RhbmRhcmRWaWV3 cG9ydENvbmZpZ3VyYXRpb24gPSB7IHsgVUkKICAgICBbc2VsZiBfZGlkU2Nyb2xsXTsKIH0KIAor LSAodm9pZClzY3JvbGxWaWV3RGlkU2Nyb2xsOihVSVNjcm9sbFZpZXcgKilzY3JvbGxWaWV3Cit7 CisgICAgQ0dQb2ludCBwb3NpdGlvbiA9IFtfc2Nyb2xsVmlldyBjb252ZXJ0UG9pbnQ6W19zY3Jv bGxWaWV3IGNvbnRlbnRPZmZzZXRdIHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOworICAgIFtf Y29udGVudFZpZXcgZGlkTGl2ZVNjcm9sbFRvOnBvc2l0aW9uXTsKK30KKwogLSAodm9pZClzY3Jv bGxWaWV3RGlkRW5kWm9vbWluZzooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldyB3aXRoVmlldzoo VUlWaWV3ICopdmlldyBhdFNjYWxlOihDR0Zsb2F0KXNjYWxlCiB7CiAgICAgQVNTRVJUKHNjcm9s bFZpZXcgPT0gX3Njcm9sbFZpZXcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAppbmRleCA3NmIzYmM2Li5kNjAyYjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzAyLDcgKzMwMiw3IEBAIFdlYlBhZ2VQcm94eTo6V2Vi UGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vz cywgV2ViCiAgICAgLCBtX21lZGlhVm9sdW1lKDEpCiAgICAgLCBtX21heVN0YXJ0TWVkaWFXaGVu SW5XaW5kb3codHJ1ZSkKICAgICAsIG1fd2FpdGluZ0ZvckRpZFVwZGF0ZVZpZXdTdGF0ZShmYWxz ZSkKLSNpZiBQTEFURk9STShNQUMpICYmICFQTEFURk9STShJT1MpCisjaWYgUExBVEZPUk0oTUFD KQogICAgICwgbV9leHBvc2VkUmVjdENoYW5nZWRUaW1lcih0aGlzLCAmV2ViUGFnZVByb3h5Ojpl eHBvc2VkUmVjdENoYW5nZWRUaW1lckZpcmVkKQogICAgICwgbV9jbGlwc1RvRXhwb3NlZFJlY3Qo ZmFsc2UpCiAgICAgLCBtX2xhc3RTZW50Q2xpcHNUb0V4cG9zZWRSZWN0KGZhbHNlKQpAQCAtNDM5 NCw0ICs0Mzk0LDMxIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRTY3JvbGxQaW5uaW5nQmVoYXZp b3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9yIHBpbm5pbmcpCiAgICAgICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0U2Nyb2xsUGlubmluZ0JlaGF2aW9yKHBpbm5pbmcpLCBt X3BhZ2VJRCk7CiB9CiAKKyNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykKK3ZvaWQg V2ViUGFnZVByb3h5Ojp2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgZXhw b3NlZFJlY3QsIGJvb2wgY2xpcHNUb0V4cG9zZWRSZWN0KQoreworICAgIGlmICghaXNWYWxpZCgp KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2V4cG9zZWRSZWN0ID0gZXhwb3NlZFJlY3Q7Cisg ICAgbV9jbGlwc1RvRXhwb3NlZFJlY3QgPSBjbGlwc1RvRXhwb3NlZFJlY3Q7CisKKyAgICBpZiAo IW1fZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgbV9leHBvc2Vk UmVjdENoYW5nZWRUaW1lci5zdGFydE9uZVNob3QoMCk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5 OjpleHBvc2VkUmVjdENoYW5nZWRUaW1lckZpcmVkKFRpbWVyPFdlYlBhZ2VQcm94eT4qKQorewor ICAgIGlmICghaXNWYWxpZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAobV9leHBvc2Vk UmVjdCA9PSBtX2xhc3RTZW50RXhwb3NlZFJlY3QgJiYgbV9jbGlwc1RvRXhwb3NlZFJlY3QgPT0g bV9sYXN0U2VudENsaXBzVG9FeHBvc2VkUmVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgcHJv Y2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlZpZXdFeHBvc2VkUmVjdENoYW5nZWQobV9l eHBvc2VkUmVjdCwgbV9jbGlwc1RvRXhwb3NlZFJlY3QpLCBtX3BhZ2VJRCk7CisgICAgbV9sYXN0 U2VudEV4cG9zZWRSZWN0ID0gbV9leHBvc2VkUmVjdDsKKyAgICBtX2xhc3RTZW50Q2xpcHNUb0V4 cG9zZWRSZWN0ID0gbV9jbGlwc1RvRXhwb3NlZFJlY3Q7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXgg ZjRjMDdkMC4uMWUwODBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aApAQCAtNDY0LDYgKzQ2NCw3IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShNQUMpCiAgICAgdm9p ZCB3aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHZp ZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGFj Y2Vzc2liaWxpdHlWaWV3Q29vcmRpbmF0ZXMpOwogICAgIHZvaWQgdmlld0V4cG9zZWRSZWN0Q2hh bmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGV4cG9zZWRSZWN0LCBib29sKTsKKyAgICBX ZWJDb3JlOjpGbG9hdFJlY3Qgdmlld0V4cG9zZWRSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9leHBv c2VkUmVjdDsgfQogICAgIHZvaWQgZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJlZChXZWJDb3Jl OjpUaW1lcjxXZWJQYWdlUHJveHk+Kik7CiAgICAgdm9pZCBzZXRNYWluRnJhbWVJc1Njcm9sbGFi bGUoYm9vbCk7CiAKQEAgLTEzNTUsOSArMTM1Niw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3dh aXRpbmdGb3JEaWRVcGRhdGVWaWV3U3RhdGU7CiAKICNpZiBQTEFURk9STShNQUMpCi0jaWYgIVBM QVRGT1JNKElPUykKICAgICBXZWJDb3JlOjpUaW1lcjxXZWJQYWdlUHJveHk+IG1fZXhwb3NlZFJl Y3RDaGFuZ2VkVGltZXI7Ci0jZW5kaWYgLy8gUExBVEZPUk0oSU9TKQogICAgIFdlYkNvcmU6OkZs b2F0UmVjdCBtX2V4cG9zZWRSZWN0OwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX2xhc3RTZW50 RXhwb3NlZFJlY3Q7CiAgICAgYm9vbCBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KaW5kZXggZWRhMzg1ZS4u ZmZmZmRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdl UHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv eHlNYWMubW0KQEAgLTE1NSwzMSArMTU1LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OndpbmRvd0Fu ZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgdmlld0ZyYW1lSW5XaW5kb3cKICAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6V2luZG93QW5kVmlld0ZyYW1lc0No YW5nZWQod2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCB3aW5kb3dGcmFtZUluVW5mbGlw cGVkU2NyZWVuQ29vcmRpbmF0ZXMsIHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMsIGFjY2Vz c2liaWxpdHlWaWV3Q29vcmRpbmF0ZXMpLCBtX3BhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUGFnZVBy b3h5Ojp2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3Qs IGJvb2wgY2xpcHNUb0V4cG9zZWRSZWN0KQotewotICAgIGlmICghaXNWYWxpZCgpKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBtX2V4cG9zZWRSZWN0ID0gZXhwb3NlZFJlY3Q7Ci0gICAgbV9jbGlw c1RvRXhwb3NlZFJlY3QgPSBjbGlwc1RvRXhwb3NlZFJlY3Q7Ci0KLSAgICBpZiAoIW1fZXhwb3Nl ZFJlY3RDaGFuZ2VkVGltZXIuaXNBY3RpdmUoKSkKLSAgICAgICAgbV9leHBvc2VkUmVjdENoYW5n ZWRUaW1lci5zdGFydE9uZVNob3QoMCk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpleHBvc2Vk UmVjdENoYW5nZWRUaW1lckZpcmVkKFRpbWVyPFdlYlBhZ2VQcm94eT4qKQotewotICAgIGlmICgh aXNWYWxpZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV9leHBvc2VkUmVjdCA9PSBt X2xhc3RTZW50RXhwb3NlZFJlY3QgJiYgbV9jbGlwc1RvRXhwb3NlZFJlY3QgPT0gbV9sYXN0U2Vu dENsaXBzVG9FeHBvc2VkUmVjdCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcHJvY2VzcygpLnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OlZpZXdFeHBvc2VkUmVjdENoYW5nZWQobV9leHBvc2VkUmVj dCwgbV9jbGlwc1RvRXhwb3NlZFJlY3QpLCBtX3BhZ2VJRCk7Ci0gICAgbV9sYXN0U2VudEV4cG9z ZWRSZWN0ID0gbV9leHBvc2VkUmVjdDsKLSAgICBtX2xhc3RTZW50Q2xpcHNUb0V4cG9zZWRSZWN0 ID0gbV9jbGlwc1RvRXhwb3NlZFJlY3Q7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRNYWlu RnJhbWVJc1Njcm9sbGFibGUoYm9vbCBpc1Njcm9sbGFibGUpCiB7CiAgICAgaWYgKCFpc1ZhbGlk KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKaW5kZXggNzk5NWMxYi4uZjc1 NDE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9S ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaApAQCAtNjksNiArNjks OSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBmb3JjZVJlcGFpbnQoKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIGJvb2wgZm9yY2VSZXBhaW50QXN5bmModWludDY0X3QpIE9WRVJSSURFIHsg cmV0dXJuIGZhbHNlOyB9CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZFJlY3QoY29uc3Qg V2ViQ29yZTo6RmxvYXRSZWN0JikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHNldENsaXBz VG9FeHBvc2VkUmVjdChib29sKSBPVkVSUklERTsKKwogICAgIC8vIFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDbGllbnQKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5QW5pbWF0aW9uU3RhcnRlZChjb25z dCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgZG91YmxlIHRpbWUpIE9WRVJSSURFIHsgfQogICAg IHZpcnR1YWwgdm9pZCBub3RpZnlGbHVzaFJlcXVpcmVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXIqKSBPVkVSUklERSB7IH0KQEAgLTgwLDEyICs4MywyMSBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgYm9vbCBhbGxvd0NvbXBvc2l0aW5nTGF5ZXJWaXN1YWxEZWdyYWRhdGlvbigpIGNvbnN0 IE9WRVJSSURFIHsgcmV0dXJuIGZhbHNlOyB9CiAjZW5kaWYKIAorICAgIHZvaWQgdXBkYXRlTWFp bkZyYW1lQ2xpcHNUb0V4cG9zZWRSZWN0KCk7CisgICAgdm9pZCB1cGRhdGVTY3JvbGxlZEV4cG9z ZWRSZWN0KCk7CisKKyAgICBXZWJDb3JlOjpUaWxlZEJhY2tpbmcqIG1haW5GcmFtZVRpbGVkQmFj a2luZygpIGNvbnN0OworCiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbW90ZUxheWVyVHJlZUNvbnRl eHQ+IG1fcmVtb3RlTGF5ZXJUcmVlQ29udGV4dDsKICAgICBSZWZQdHI8V2ViQ29yZTo6UGxhdGZv cm1DQUxheWVyPiBtX3Jvb3RMYXllcjsKIAogICAgIEhhc2hNYXA8UGFnZU92ZXJsYXkqLCBzdGQ6 OnVuaXF1ZV9wdHI8R3JhcGhpY3NMYXllckNBUmVtb3RlPj4gbV9wYWdlT3ZlcmxheUxheWVyczsK IAogICAgIFdlYkNvcmU6OkludFNpemUgbV92aWV3U2l6ZTsKKworICAgIFdlYkNvcmU6OkZsb2F0 UmVjdCBtX2V4cG9zZWRSZWN0OworICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3Njcm9sbGVkRXhw b3NlZFJlY3Q7CisgICAgYm9vbCBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KaW5kZXgg OGFmMjNiZS4uMjI4NTUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1t CkBAIC0zNCw2ICszNCw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2ltcG9y dCA8V2ViQ29yZS9NYWluRnJhbWUuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2V0dGluZ3MuaD4KKyNp bXBvcnQgPFdlYkNvcmUvVGlsZWRCYWNraW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCkBAIC00MiwxMCArNDMsMTIgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYTo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEoV2ViUGFnZSogd2ViUGFn ZSwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYpCiAgICAgOiBEcmF3aW5nQXJlYShE cmF3aW5nQXJlYVR5cGVSZW1vdGVMYXllclRyZWUsIHdlYlBhZ2UpCiAgICAgLCBtX3JlbW90ZUxh eWVyVHJlZUNvbnRleHQoc3RkOjptYWtlX3VuaXF1ZTxSZW1vdGVMYXllclRyZWVDb250ZXh0Pih3 ZWJQYWdlKSkKKyAgICAsIG1fY2xpcHNUb0V4cG9zZWRSZWN0KGZhbHNlKQogewogICAgIHdlYlBh Z2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCkuc2V0Rm9yY2VDb21wb3NpdGluZ01vZGUodHJ1ZSk7 CiAjaWYgUExBVEZPUk0oSU9TKQogICAgIHdlYlBhZ2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCku c2V0RGVsZWdhdGVzUGFnZVNjYWxpbmcodHJ1ZSk7CisgICAgc2V0Q2xpcHNUb0V4cG9zZWRSZWN0 KHRydWUpOwogI2VuZGlmCiB9CiAKQEAgLTIwNyw0ICsyMTAsNjMgQEAgdm9pZCBSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYTo6Zm9yY2VSZXBhaW50KCkKICAgICBtX3JlbW90ZUxheWVyVHJlZUNv bnRleHQtPmZvcmNlUmVwYWludCgpOwogfQogCit2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhOjpzZXRFeHBvc2VkUmVjdChjb25zdCBGbG9hdFJlY3QmIGV4cG9zZWRSZWN0KQoreworICAg IG1fZXhwb3NlZFJlY3QgPSBleHBvc2VkUmVjdDsKKyAgICB1cGRhdGVTY3JvbGxlZEV4cG9zZWRS ZWN0KCk7Cit9CisKK3ZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnNldENsaXBzVG9F eHBvc2VkUmVjdChib29sIGNsaXBzVG9FeHBvc2VkUmVjdCkKK3sKKyAgICBtX2NsaXBzVG9FeHBv c2VkUmVjdCA9IGNsaXBzVG9FeHBvc2VkUmVjdDsKKyAgICB1cGRhdGVTY3JvbGxlZEV4cG9zZWRS ZWN0KCk7CisgICAgdXBkYXRlTWFpbkZyYW1lQ2xpcHNUb0V4cG9zZWRSZWN0KCk7Cit9CisKK3Zv aWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3Qo KQoreworICAgIGlmICghbV9jbGlwc1RvRXhwb3NlZFJlY3QpCisgICAgICAgIHJldHVybjsKKwor ICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYWluRnJh bWUoKS52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybjsKKworICAg IG1fc2Nyb2xsZWRFeHBvc2VkUmVjdCA9IG1fZXhwb3NlZFJlY3Q7CisKKyNpZiAhUExBVEZPUk0o SU9TKQorICAgIEludFBvaW50IHNjcm9sbFBvc2l0aW9uV2l0aE9yaWdpbiA9IGZyYW1lVmlldy0+ c2Nyb2xsUG9zaXRpb24oKSArIHRvSW50U2l6ZShmcmFtZVZpZXctPnNjcm9sbE9yaWdpbigpKTsK KyAgICBtX3Njcm9sbGVkRXhwb3NlZFJlY3QubW92ZUJ5KHNjcm9sbFBvc2l0aW9uV2l0aE9yaWdp bik7CisjZW5kaWYKKworICAgIG1haW5GcmFtZVRpbGVkQmFja2luZygpLT5zZXRFeHBvc2VkUmVj dChtX3Njcm9sbGVkRXhwb3NlZFJlY3QpOworCisgICAgZm9yIChhdXRvIGl0ID0gbV9wYWdlT3Zl cmxheUxheWVycy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAh PSBlbmQ7ICsraXQpIHsKKyAgICAgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0g aXQtPnZhbHVlLT50aWxlZEJhY2tpbmcoKSkKKyAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0 RXhwb3NlZFJlY3QobV9zY3JvbGxlZEV4cG9zZWRSZWN0KTsKKyAgICB9Cit9CisKK3ZvaWQgUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVj dCgpCit7CisgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbWFpbkZyYW1lVGls ZWRCYWNraW5nKCkpCisgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xpcHNUb0V4cG9zZWRSZWN0 KG1fY2xpcHNUb0V4cG9zZWRSZWN0KTsKKworICAgIGZvciAoYXV0byBpdCA9IG1fcGFnZU92ZXJs YXlMYXllcnMuYmVnaW4oKSwgZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsgaXQgIT0g ZW5kOyArK2l0KQorICAgICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBpdC0+ dmFsdWUtPnRpbGVkQmFja2luZygpKQorICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlw c1RvRXhwb3NlZFJlY3QobV9jbGlwc1RvRXhwb3NlZFJlY3QpOworCisgICAgRnJhbWVWaWV3KiBm cmFtZVZpZXcgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnZpZXcoKTsKKyAg ICBpZiAoIWZyYW1lVmlldykKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIGZyYW1lVmlldy0+ YWRqdXN0VGlsZWRCYWNraW5nQ292ZXJhZ2UoKTsKK30KKworVGlsZWRCYWNraW5nKiBSZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYTo6bWFpbkZyYW1lVGlsZWRCYWNraW5nKCkgY29uc3QKK3sKKyAg ICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1l KCkudmlldygpOworICAgIHJldHVybiBmcmFtZVZpZXcgPyBmcmFtZVZpZXctPnRpbGVkQmFja2lu ZygpIDogMDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 220336 2014-01-03 14:03:38 -0800 2014-01-03 14:11:23 -0800 fix the title for sam fixtilecache2.diff text/plain 13754 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlNTE5MjAzLi5mYTc4NDQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIg QEAKKzIwMTQtMDEtMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gW1dLMl0gVGlsZUNvbnRyb2xsZXIgY3JlYXRlcyBhbGwgdGlsZXMgb24g Zmlyc3QgcGFpbnQsIG1ha2luZyBpdCBzbG93IGFuZCBjb25zdW1pbmcgbG90cyBvZiBtZW1vcnkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjQ1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQg b2YgbWFraW5nIGFsbCBvZiB0aGUgdGlsZXMgYWxsIG9mIHRoZSB0aW1lLCB3ZSBzaG91bGQgdXNl IHRoZQorICAgICAgICB2aWV3LWV4cG9zZWQtcmVjdCBtZWNoYW5pc20gdG8gaW5mb3JtIFRpbGVD b250cm9sbGVyIGFib3V0IHdoYXQgcG9ydGlvbgorICAgICAgICBvZiB0aGUgV0tDb250ZW50Vmll dyBpcyBjdXJyZW50bHkgZXhwb3NlZCBieSB0aGUgV0tTY3JvbGxWaWV3LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgc2V0Vmll d3BvcnRTaXplOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZFNjcm9sbFRvOl0pOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZExpdmVTY3JvbGxUbzpdKToKKyAgICAgICAgSW5m b3JtIHRoZSBXZWJQYWdlUHJveHkgdGhhdCBvdXIgZXhwb3NlZCByZWN0IGNoYW5nZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBz Y3JvbGxWaWV3RGlkU2Nyb2xsOl0pOgorICAgICAgICBJbmZvcm0gdGhlIFdLQ29udGVudFZpZXcg dGhhdCB3ZSd2ZSBzY3JvbGxlZCBhdCBhbGwuCisgICAgICAgIFdlIGNhbid0IHVzZSB0aGUgZXhp c3RpbmcgV0tDb250ZW50VmlldyBkaWRTY3JvbGxUbzosIGJlY2F1c2UgaXQgaXMKKyAgICAgICAg ZXhwZWN0ZWQgdG8gb25seSBmaXJlIHdoZW4gYSBzY3JvbGwgbGFuZHMuIEluc3RlYWQsIGFkZCBk aWRMaXZlU2Nyb2xsVG86LAorICAgICAgICB3aGljaCBmaXJlcyBjb250aW51YWxseSBhcyBzY3Jv bGxpbmcgcHJvZ3Jlc3Nlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld0V4cG9zZWRSZWN0Q2hhbmdlZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJlZCk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnZpZXdFeHBvc2VkUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW06CisgICAgICAgIE1vdmUgdmlldy1leHBvc2VkLXJlY3Qgc3R1ZmYgdG8g V2ViUGFnZVByb3h5IHNvIGl0IGNhbiBiZSBidWlsdCBvbiBib3RoCisgICAgICAgIE1hYyBhbmQg aU9TLCBhbmQgdW4tIVBMQVRGT1JNKElPUykgc29tZSBvZiB0aGUgcmVsYXRlZCBtZW1iZXJzLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpzZXRFeHBvc2VkUmVjdCk6CisgICAgICAgIChXZWJLaXQ6 OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpzZXRDbGlwc1RvRXhwb3NlZFJlY3QpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6dXBkYXRlU2Nyb2xsZWRF eHBvc2VkUmVjdCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh Ojp1cGRhdGVNYWluRnJhbWVDbGlwc1RvRXhwb3NlZFJlY3QpOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6bWFpbkZyYW1lVGlsZWRCYWNraW5nKToKKyAgICAg ICAgU3RlYWwgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEncyBleHBvc2VkLXJlY3QgY29k ZS4KKyAgICAgICAgTm90ZSB0aGF0IG9uIGlPUywgd2UgZG9uJ3QgbmVlZCB0byBtYW51YWxseSBv ZmZzZXQgdGhlIGV4cG9zZWQgcmVjdCBieQorICAgICAgICB0aGUgc2Nyb2xsIHBvc2l0aW9uLCBi ZWNhdXNlIHRoZSBzY3JvbGwgcG9zaXRpb24gaXMgYWxyZWFkeSBiYWtlZCBpbnRvCisgICAgICAg IHRoZSBleHBvc2VkIHJlY3QsIGFuZCBXZWJDb3JlJ3Mgbm90aW9uIG9mIHRoZSBzY3JvbGwgcG9z aXRpb24gd2lsbCBiZQorICAgICAgICBpbmFjY3VyYXRlIHVudGlsIHRoZSBzY3JvbGwgbGFuZHMu CisKIDIwMTQtMDEtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIERlZmluZSBXZWJQcm9jZXNzOjp1c2VzTmV0d29ya1Byb2Nlc3MgdW5jb25k aXRpb25hbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9X S0NvbnRlbnRWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRl bnRWaWV3LmgKaW5kZXggNGNjNTBlNy4uMWQxNTk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcuaApAQCAtNjUsNiArNjUsNyBAQCBXS19B UElfQ0xBU1MKIC0gKHZvaWQpc2V0Vmlld3BvcnRTaXplOihDR1NpemUpc2l6ZTsKIAogLSAodm9p ZClkaWRTY3JvbGxUbzooQ0dQb2ludCljb250ZW50T2Zmc2V0OworLSAodm9pZClkaWRMaXZlU2Ny b2xsVG86KENHUG9pbnQpY29udGVudE9mZnNldDsKIC0gKHZvaWQpZGlkWm9vbVRvU2NhbGU6KENH RmxvYXQpc2NhbGU7CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDM2YmUzOWEuLmIyMDY0ZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQpAQCAtMTM4 LDExICsxMzgsMTggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIC0gKHZvaWQpc2V0Vmlld3Bv cnRTaXplOihDR1NpemUpc2l6ZQogewogICAgIF9wYWdlLT5zZXRGaXhlZExheW91dFNpemUoSW50 U2l6ZShzaXplKSk7CisgICAgX3BhZ2UtPnZpZXdFeHBvc2VkUmVjdENoYW5nZWQoRmxvYXRSZWN0 KF9wYWdlLT52aWV3RXhwb3NlZFJlY3QoKS5sb2NhdGlvbigpLCBGbG9hdFNpemUoc2l6ZSkpLCB0 cnVlKTsKIH0KIAogLSAodm9pZClkaWRTY3JvbGxUbzooQ0dQb2ludCljb250ZW50T2Zmc2V0CiB7 CiAgICAgX3BhZ2UtPmRpZEZpbmlzaFNjcm9sbGluZyhjb250ZW50T2Zmc2V0KTsKKyAgICBfcGFn ZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChGbG9hdFJlY3QoRmxvYXRQb2ludChjb250ZW50T2Zm c2V0KSwgX3BhZ2UtPmZpeGVkTGF5b3V0U2l6ZSgpKSwgdHJ1ZSk7Cit9CisKKy0gKHZvaWQpZGlk TGl2ZVNjcm9sbFRvOihDR1BvaW50KWNvbnRlbnRPZmZzZXQKK3sKKyAgICBfcGFnZS0+dmlld0V4 cG9zZWRSZWN0Q2hhbmdlZChGbG9hdFJlY3QoRmxvYXRQb2ludChjb250ZW50T2Zmc2V0KSwgX3Bh Z2UtPmZpeGVkTGF5b3V0U2l6ZSgpKSwgdHJ1ZSk7CiB9CiAKIC0gKHZvaWQpZGlkWm9vbVRvU2Nh bGU6KENHRmxvYXQpc2NhbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvaW9zL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLVmll dy5tbQppbmRleCAzOTg5M2FiLi5jYjQ0ODNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9pb3MvV0tWaWV3Lm1tCkBAIC0yMTAsNiArMjEwLDEyIEBAIHN0YXRpYyBzdHJ1Y3QgX1VJ V2ViVmlld3BvcnRDb25maWd1cmF0aW9uIHN0YW5kYXJkVmlld3BvcnRDb25maWd1cmF0aW9uID0g eyB7IFVJCiAgICAgW3NlbGYgX2RpZFNjcm9sbF07CiB9CiAKKy0gKHZvaWQpc2Nyb2xsVmlld0Rp ZFNjcm9sbDooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldworeworICAgIENHUG9pbnQgcG9zaXRp b24gPSBbX3Njcm9sbFZpZXcgY29udmVydFBvaW50Oltfc2Nyb2xsVmlldyBjb250ZW50T2Zmc2V0 XSB0b1ZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsKKyAgICBbX2NvbnRlbnRWaWV3IGRpZExpdmVT Y3JvbGxUbzpwb3NpdGlvbl07Cit9CisKIC0gKHZvaWQpc2Nyb2xsVmlld0RpZEVuZFpvb21pbmc6 KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcgd2l0aFZpZXc6KFVJVmlldyAqKXZpZXcgYXRTY2Fs ZTooQ0dGbG9hdClzY2FsZQogewogICAgIEFTU0VSVChzY3JvbGxWaWV3ID09IF9zY3JvbGxWaWV3 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNzZiM2Jj Ni4uZDYwMmIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTMwMiw3ICszMDIsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50 JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYgogICAgICwgbV9tZWRp YVZvbHVtZSgxKQogICAgICwgbV9tYXlTdGFydE1lZGlhV2hlbkluV2luZG93KHRydWUpCiAgICAg LCBtX3dhaXRpbmdGb3JEaWRVcGRhdGVWaWV3U3RhdGUoZmFsc2UpCi0jaWYgUExBVEZPUk0oTUFD KSAmJiAhUExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JNKE1BQykKICAgICAsIG1fZXhwb3NlZFJl Y3RDaGFuZ2VkVGltZXIodGhpcywgJldlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2VkVGlt ZXJGaXJlZCkKICAgICAsIG1fY2xpcHNUb0V4cG9zZWRSZWN0KGZhbHNlKQogICAgICwgbV9sYXN0 U2VudENsaXBzVG9FeHBvc2VkUmVjdChmYWxzZSkKQEAgLTQzOTQsNCArNDM5NCwzMSBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6c2V0U2Nyb2xsUGlubmluZ0JlaGF2aW9yKFNjcm9sbFBpbm5pbmdCZWhh dmlvciBwaW5uaW5nKQogICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcihwaW5uaW5nKSwgbV9wYWdlSUQpOwogfQogCisjaWYg UExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1MpCit2b2lkIFdlYlBhZ2VQcm94eTo6dmlld0V4 cG9zZWRSZWN0Q2hhbmdlZChjb25zdCBGbG9hdFJlY3QmIGV4cG9zZWRSZWN0LCBib29sIGNsaXBz VG9FeHBvc2VkUmVjdCkKK3sKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9leHBvc2VkUmVjdCA9IGV4cG9zZWRSZWN0OworICAgIG1fY2xpcHNUb0V4cG9zZWRS ZWN0ID0gY2xpcHNUb0V4cG9zZWRSZWN0OworCisgICAgaWYgKCFtX2V4cG9zZWRSZWN0Q2hhbmdl ZFRpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgIG1fZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXIuc3Rh cnRPbmVTaG90KDApOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2Vk VGltZXJGaXJlZChUaW1lcjxXZWJQYWdlUHJveHk+KikKK3sKKyAgICBpZiAoIWlzVmFsaWQoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fZXhwb3NlZFJlY3QgPT0gbV9sYXN0U2VudEV4 cG9zZWRSZWN0ICYmIG1fY2xpcHNUb0V4cG9zZWRSZWN0ID09IG1fbGFzdFNlbnRDbGlwc1RvRXhw b3NlZFJlY3QpCisgICAgICAgIHJldHVybjsKKworICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpWaWV3RXhwb3NlZFJlY3RDaGFuZ2VkKG1fZXhwb3NlZFJlY3QsIG1fY2xpcHNU b0V4cG9zZWRSZWN0KSwgbV9wYWdlSUQpOworICAgIG1fbGFzdFNlbnRFeHBvc2VkUmVjdCA9IG1f ZXhwb3NlZFJlY3Q7CisgICAgbV9sYXN0U2VudENsaXBzVG9FeHBvc2VkUmVjdCA9IG1fY2xpcHNU b0V4cG9zZWRSZWN0OworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGY0YzA3ZDAuLjFlMDgwZGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTQ2NCw2ICs0NjQsNyBA QCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgd2luZG93QW5kVmlld0ZyYW1l c0NoYW5nZWQoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nvb3Jk aW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBhY2Nlc3NpYmlsaXR5Vmlld0Nvb3Jk aW5hdGVzKTsKICAgICB2b2lkIHZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiBleHBvc2VkUmVjdCwgYm9vbCk7CisgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHZp ZXdFeHBvc2VkUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fZXhwb3NlZFJlY3Q7IH0KICAgICB2b2lk IGV4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyRmlyZWQoV2ViQ29yZTo6VGltZXI8V2ViUGFnZVByb3h5 PiopOwogICAgIHZvaWQgc2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKGJvb2wpOwogCkBAIC0xMzU1 LDkgKzEzNTYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV93YWl0aW5nRm9yRGlkVXBkYXRlVmll d1N0YXRlOwogCiAjaWYgUExBVEZPUk0oTUFDKQotI2lmICFQTEFURk9STShJT1MpCiAgICAgV2Vi Q29yZTo6VGltZXI8V2ViUGFnZVByb3h5PiBtX2V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyOwotI2Vu ZGlmIC8vIFBMQVRGT1JNKElPUykKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9leHBvc2VkUmVj dDsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9sYXN0U2VudEV4cG9zZWRSZWN0OwogICAgIGJv b2wgbV9jbGlwc1RvRXhwb3NlZFJlY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCmluZGV4IGVkYTM4NWUuLmZmZmZkZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC0xNTUsMzEg KzE1NSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChj b25zdCBGbG9hdFJlY3QmIHZpZXdGcmFtZUluV2luZG93CiAgICAgcHJvY2VzcygpLnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OldpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKHdpbmRvd0ZyYW1lSW5T Y3JlZW5Db29yZGluYXRlcywgd2luZG93RnJhbWVJblVuZmxpcHBlZFNjcmVlbkNvb3JkaW5hdGVz LCB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBhY2Nlc3NpYmlsaXR5Vmlld0Nvb3JkaW5h dGVzKSwgbV9wYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6dmlld0V4cG9zZWRSZWN0 Q2hhbmdlZChjb25zdCBGbG9hdFJlY3QmIGV4cG9zZWRSZWN0LCBib29sIGNsaXBzVG9FeHBvc2Vk UmVjdCkKLXsKLSAgICBpZiAoIWlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9l eHBvc2VkUmVjdCA9IGV4cG9zZWRSZWN0OwotICAgIG1fY2xpcHNUb0V4cG9zZWRSZWN0ID0gY2xp cHNUb0V4cG9zZWRSZWN0OwotCi0gICAgaWYgKCFtX2V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyLmlz QWN0aXZlKCkpCi0gICAgICAgIG1fZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXIuc3RhcnRPbmVTaG90 KDApOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJl ZChUaW1lcjxXZWJQYWdlUHJveHk+KikKLXsKLSAgICBpZiAoIWlzVmFsaWQoKSkKLSAgICAgICAg cmV0dXJuOwotCi0gICAgaWYgKG1fZXhwb3NlZFJlY3QgPT0gbV9sYXN0U2VudEV4cG9zZWRSZWN0 ICYmIG1fY2xpcHNUb0V4cG9zZWRSZWN0ID09IG1fbGFzdFNlbnRDbGlwc1RvRXhwb3NlZFJlY3Qp Ci0gICAgICAgIHJldHVybjsKLQotICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpWaWV3RXhwb3NlZFJlY3RDaGFuZ2VkKG1fZXhwb3NlZFJlY3QsIG1fY2xpcHNUb0V4cG9zZWRS ZWN0KSwgbV9wYWdlSUQpOwotICAgIG1fbGFzdFNlbnRFeHBvc2VkUmVjdCA9IG1fZXhwb3NlZFJl Y3Q7Ci0gICAgbV9sYXN0U2VudENsaXBzVG9FeHBvc2VkUmVjdCA9IG1fY2xpcHNUb0V4cG9zZWRS ZWN0OwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKGJv b2wgaXNTY3JvbGxhYmxlKQogewogICAgIGlmICghaXNWYWxpZCgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYS5oCmluZGV4IDc5OTVjMWIuLmY3NTQxNTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKQEAgLTY5LDYgKzY5LDkgQEAgcHJpdmF0ZToKICAgICB2 aXJ0dWFsIHZvaWQgZm9yY2VSZXBhaW50KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGZv cmNlUmVwYWludEFzeW5jKHVpbnQ2NF90KSBPVkVSUklERSB7IHJldHVybiBmYWxzZTsgfQogCisg ICAgdmlydHVhbCB2b2lkIHNldEV4cG9zZWRSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYp IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzZXRDbGlwc1RvRXhwb3NlZFJlY3QoYm9vbCkg T1ZFUlJJREU7CisKICAgICAvLyBXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2xpZW50CiAgICAgdmly dHVhbCB2b2lkIG5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NM YXllciosIGRvdWJsZSB0aW1lKSBPVkVSUklERSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5 Rmx1c2hSZXF1aXJlZChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKikgT1ZFUlJJREUgeyB9 CkBAIC04MCwxMiArODMsMjEgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgYWxsb3dDb21w b3NpdGluZ0xheWVyVmlzdWFsRGVncmFkYXRpb24oKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBm YWxzZTsgfQogI2VuZGlmCiAKKyAgICB2b2lkIHVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2Vk UmVjdCgpOworICAgIHZvaWQgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOworCisgICAgV2Vi Q29yZTo6VGlsZWRCYWNraW5nKiBtYWluRnJhbWVUaWxlZEJhY2tpbmcoKSBjb25zdDsKKwogICAg IHN0ZDo6dW5pcXVlX3B0cjxSZW1vdGVMYXllclRyZWVDb250ZXh0PiBtX3JlbW90ZUxheWVyVHJl ZUNvbnRleHQ7CiAgICAgUmVmUHRyPFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXllcj4gbV9yb290TGF5 ZXI7CiAKICAgICBIYXNoTWFwPFBhZ2VPdmVybGF5Kiwgc3RkOjp1bmlxdWVfcHRyPEdyYXBoaWNz TGF5ZXJDQVJlbW90ZT4+IG1fcGFnZU92ZXJsYXlMYXllcnM7CiAKICAgICBXZWJDb3JlOjpJbnRT aXplIG1fdmlld1NpemU7CisKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9leHBvc2VkUmVjdDsK KyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9zY3JvbGxlZEV4cG9zZWRSZWN0OworICAgIGJvb2wg bV9jbGlwc1RvRXhwb3NlZFJlY3Q7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IDhhZjIzYmUuLjIyODU1MGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQpAQCAtMzQsNiArMzQsNyBAQAog I2ltcG9ydCA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KICNpbXBvcnQgPFdlYkNvcmUvTWFpbkZyYW1l Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1NldHRpbmdzLmg+CisjaW1wb3J0IDxXZWJDb3JlL1RpbGVk QmFja2luZy5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNDIsMTAgKzQzLDEy IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OlJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhKFdlYlBhZ2UqIHdlYlBhZ2UsIGNvbnN0IFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMmKQogICAgIDogRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFUeXBlUmVtb3Rl TGF5ZXJUcmVlLCB3ZWJQYWdlKQogICAgICwgbV9yZW1vdGVMYXllclRyZWVDb250ZXh0KHN0ZDo6 bWFrZV91bmlxdWU8UmVtb3RlTGF5ZXJUcmVlQ29udGV4dD4od2ViUGFnZSkpCisgICAgLCBtX2Ns aXBzVG9FeHBvc2VkUmVjdChmYWxzZSkKIHsKICAgICB3ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0 aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHRydWUpOwogI2lmIFBMQVRGT1JNKElPUykK ICAgICB3ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLnNldERlbGVnYXRlc1BhZ2VTY2Fs aW5nKHRydWUpOworICAgIHNldENsaXBzVG9FeHBvc2VkUmVjdCh0cnVlKTsKICNlbmRpZgogfQog CkBAIC0yMDcsNCArMjEwLDYzIEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OmZv cmNlUmVwYWludCgpCiAgICAgbV9yZW1vdGVMYXllclRyZWVDb250ZXh0LT5mb3JjZVJlcGFpbnQo KTsKIH0KIAordm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6c2V0RXhwb3NlZFJlY3Qo Y29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCkKK3sKKyAgICBtX2V4cG9zZWRSZWN0ID0gZXhw b3NlZFJlY3Q7CisgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOworfQorCit2b2lkIFJl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpzZXRDbGlwc1RvRXhwb3NlZFJlY3QoYm9vbCBjbGlw c1RvRXhwb3NlZFJlY3QpCit7CisgICAgbV9jbGlwc1RvRXhwb3NlZFJlY3QgPSBjbGlwc1RvRXhw b3NlZFJlY3Q7CisgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOworICAgIHVwZGF0ZU1h aW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVjdCgpOworfQorCit2b2lkIFJlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhOjp1cGRhdGVTY3JvbGxlZEV4cG9zZWRSZWN0KCkKK3sKKyAgICBpZiAoIW1fY2xp cHNUb0V4cG9zZWRSZWN0KQorICAgICAgICByZXR1cm47CisKKyAgICBGcmFtZVZpZXcqIGZyYW1l VmlldyA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkudmlldygpOworICAgIGlm ICghZnJhbWVWaWV3KQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Njcm9sbGVkRXhwb3NlZFJl Y3QgPSBtX2V4cG9zZWRSZWN0OworCisjaWYgIVBMQVRGT1JNKElPUykKKyAgICBJbnRQb2ludCBz Y3JvbGxQb3NpdGlvbldpdGhPcmlnaW4gPSBmcmFtZVZpZXctPnNjcm9sbFBvc2l0aW9uKCkgKyB0 b0ludFNpemUoZnJhbWVWaWV3LT5zY3JvbGxPcmlnaW4oKSk7CisgICAgbV9zY3JvbGxlZEV4cG9z ZWRSZWN0Lm1vdmVCeShzY3JvbGxQb3NpdGlvbldpdGhPcmlnaW4pOworI2VuZGlmCisKKyAgICBt YWluRnJhbWVUaWxlZEJhY2tpbmcoKS0+c2V0RXhwb3NlZFJlY3QobV9zY3JvbGxlZEV4cG9zZWRS ZWN0KTsKKworICAgIGZvciAoYXV0byBpdCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuYmVnaW4oKSwg ZW5kID0gbV9wYWdlT3ZlcmxheUxheWVycy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAg ICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IGl0LT52YWx1ZS0+dGlsZWRCYWNr aW5nKCkpCisgICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KG1fc2Nyb2xs ZWRFeHBvc2VkUmVjdCk7CisgICAgfQorfQorCit2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhOjp1cGRhdGVNYWluRnJhbWVDbGlwc1RvRXhwb3NlZFJlY3QoKQoreworICAgIGlmIChUaWxl ZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IG1haW5GcmFtZVRpbGVkQmFja2luZygpKQorICAgICAg ICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2VkUmVjdChtX2NsaXBzVG9FeHBvc2VkUmVj dCk7CisKKyAgICBmb3IgKGF1dG8gaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCksIGVu ZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAg aWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gaXQtPnZhbHVlLT50aWxlZEJhY2tpbmco KSkKKyAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xpcHNUb0V4cG9zZWRSZWN0KG1fY2xp cHNUb0V4cG9zZWRSZWN0KTsKKworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJQYWdl LT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS52aWV3KCk7CisgICAgaWYgKCFmcmFtZVZpZXcpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBmcmFtZVZpZXctPmFkanVzdFRpbGVkQmFja2luZ0Nv dmVyYWdlKCk7Cit9CisKK1RpbGVkQmFja2luZyogUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6 Om1haW5GcmFtZVRpbGVkQmFja2luZygpIGNvbnN0Cit7CisgICAgRnJhbWVWaWV3KiBmcmFtZVZp ZXcgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnZpZXcoKTsKKyAgICByZXR1 cm4gZnJhbWVWaWV3ID8gZnJhbWVWaWV3LT50aWxlZEJhY2tpbmcoKSA6IDA7Cit9CisKIH0gLy8g bmFtZXNwYWNlIFdlYktpdAo=