129919 2014-03-07 14:33:25 -0800 Set background color of WK2's UIScrollView to the pageExtendedBackgroundColor 2014-03-10 15:43:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin benjamin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton oldest_to_newest 988354 0 bdakin 2014-03-07 14:33:25 -0800 We should set background color of WK2's UIScrollView to the pageExtendedBackgroundColor, and that information should be passed to the UIProcess via a RemoteLayerTreeTransaction. 988362 1 bdakin 2014-03-07 14:37:31 -0800 *** Bug 129921 has been marked as a duplicate of this bug. *** 988374 2 226171 bdakin 2014-03-07 15:03:33 -0800 Created attachment 226171 Patch 988409 3 226181 bdakin 2014-03-07 16:06:03 -0800 Created attachment 226181 Patch Should fix the build failure. 988427 4 226181 benjamin 2014-03-07 16:45:04 -0800 Comment on attachment 226181 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226181&action=review > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h:207 > + WebCore::Color m_pageExtendedBackgroundColor; Let's move this above with content size. > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:426 > + encoder << m_pageExtendedBackgroundColor; And update this accordingly. > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:492 > + if (!decoder.decode(result.m_pageExtendedBackgroundColor)) > + return false; > + And this. > Source/WebKit2/UIProcess/WebPageProxy.h:432 > + void setPageExtendedBackgroundColor(const WebCore::Color& color) { m_pageExtendedBackgroundColor = color; } You should not need this. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:340 > + _page->setPageExtendedBackgroundColor(layerTreeTransaction.pageExtendedBackgroundColor()); This should be done in WebPageProxy::didCommitLayerTree(). > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:342 > + if ([self _backgroundExtendsBeyondPage] && pageExtendedBackgroundColor != [_scrollView backgroundColor]) You may not need pageExtendedBackgroundColor != [_scrollView backgroundColor], UIScrollView might do that already. > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:880 > + if (m_page->drawingArea()) > + m_page->drawingArea()->scheduleCompositingLayerFlush(); Do we really need this? I would think a flush must be scheduled already since the style would invalidate the full frame rect. 988994 5 bdakin 2014-03-10 11:58:34 -0700 (In reply to comment #4) > (From update of attachment 226181 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226181&action=review > > > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h:207 > > + WebCore::Color m_pageExtendedBackgroundColor; > > Let's move this above with content size. > Okay! > > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:426 > > + encoder << m_pageExtendedBackgroundColor; > > And update this accordingly. > Done. > > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:492 > > + if (!decoder.decode(result.m_pageExtendedBackgroundColor)) > > + return false; > > + > > And this. > Done. > > Source/WebKit2/UIProcess/WebPageProxy.h:432 > > + void setPageExtendedBackgroundColor(const WebCore::Color& color) { m_pageExtendedBackgroundColor = color; } > > You should not need this. > Removed. > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:340 > > + _page->setPageExtendedBackgroundColor(layerTreeTransaction.pageExtendedBackgroundColor()); > > This should be done in WebPageProxy::didCommitLayerTree(). > Moved. > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:342 > > + if ([self _backgroundExtendsBeyondPage] && pageExtendedBackgroundColor != [_scrollView backgroundColor]) > > You may not need pageExtendedBackgroundColor != [_scrollView backgroundColor], UIScrollView might do that already. > Okay, I will remove it if it's not needed. > > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:880 > > + if (m_page->drawingArea()) > > + m_page->drawingArea()->scheduleCompositingLayerFlush(); > > Do we really need this? I would think a flush must be scheduled already since the style would invalidate the full frame rect. It's true that in my testing it doesn't seem like we need to do anything here… 989085 6 bdakin 2014-03-10 15:43:40 -0700 Committed change with http://trac.webkit.org/changeset/165409 226171 2014-03-07 15:03:33 -0800 2014-03-07 16:06:03 -0800 Patch for-review.txt text/plain 11288 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTI5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBTZXQgYmFja2dyb3VuZCBjb2xvciBv ZiBXSzIncyBVSVNjcm9sbFZpZXcgdG8gdGhlIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5OTE5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0syIG5lZWRz IHRvIGJlIGFibGUgdG8gYXNrIGZvciB0aGUgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yLCBz byB0aGlzIHBhdGNoIAorICAgICAgICBhZGRzIGEgZnVuY3Rpb24gdG8gUGFnZSB0aGF0IHdpbGwg cmV0dXJuIGl0LgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGFnZS9Q YWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnBhZ2VFeHRlbmRlZEJhY2tncm91bmRD b2xvcik6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorCiAyMDE0LTAzLTA3ICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBOb3RpZnkgc3lzdGVt IG1hbGxvYyBvZiBmYWtlIG1lbW9yeSBwcmVzc3VyZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29y a2luZyBjb3B5KQpAQCAtMTc3NSw2ICsxNzc1LDcgQEAgX19aTks3V2ViQ29yZTRQYWdlMTRyZW5k ZXJUcmVlU2l6ZUV2CiBfX1pOSzdXZWJDb3JlNFBhZ2UxNXZpc2liaWxpdHlTdGF0ZUV2CiBfX1pO SzdXZWJDb3JlNFBhZ2UxNmhhc1NlZW5BbnlQbHVnaW5FdgogX19aTks3V2ViQ29yZTRQYWdlMTd2 aWV3cG9ydEFyZ3VtZW50c0V2CitfX1pOSzdXZWJDb3JlNFBhZ2UyN3BhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvckV2CiBfX1pOSzdXZWJDb3JlNFBhZ2UzNGluTG93UXVhbGl0eUltYWdlSW50ZXJw b2xhdGlvbk1vZGVFdgogX19aTks3V2ViQ29yZTRQYWdlOWdyb3VwTmFtZUV2CiBfX1pOSzdXZWJD b3JlNFBhZ2U5cGFnZUNvdW50RXYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMTY1 Mjk1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTI3MSw2ICsxMjcxLDE5IEBAIHZvaWQgUGFnZTo6cmVtb3ZlTGF5b3V0TWlsZXN0b25lcyhMYXlv dXQKICAgICBtX3JlcXVlc3RlZExheW91dE1pbGVzdG9uZXMgJj0gfm1pbGVzdG9uZXM7CiB9CiAK K0NvbG9yIFBhZ2U6OnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpIGNvbnN0Cit7CisgICAg RnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtYWluRnJhbWUoKS52aWV3KCk7CisgICAgaWYgKCFmcmFt ZVZpZXcpCisgICAgICAgIHJldHVybiBDb2xvcigpOworCisgICAgUmVuZGVyVmlldyogcmVuZGVy VmlldyA9IGZyYW1lVmlldy0+cmVuZGVyVmlldygpOworICAgIGlmICghcmVuZGVyVmlldykKKyAg ICAgICAgcmV0dXJuIENvbG9yKCk7CisKKyAgICByZXR1cm4gcmVuZGVyVmlldy0+Y29tcG9zaXRv cigpLnJvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpOworfQorCiAvLyBUaGVzZSBhcmUgbWFn aWNhbCBjb25zdGFudHMgdGhhdCBtaWdodCBiZSB0d2Vha2VkIG92ZXIgdGltZS4KIHN0YXRpYyBk b3VibGUgZ01pbmltdW1QYWludGVkQXJlYVJhdGlvID0gMC4xOwogc3RhdGljIGRvdWJsZSBnTWF4 aW11bVVucGFpbnRlZEFyZWFSYXRpbyA9IDAuMDQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNp b24gMTY1Mjk1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkK QEAgLTYyLDYgKzYyLDcgQEAgY2xhc3MgQmFja0ZvcndhcmRDbGllbnQ7CiBjbGFzcyBDaHJvbWU7 CiBjbGFzcyBDaHJvbWVDbGllbnQ7CiBjbGFzcyBDbGllbnRSZWN0TGlzdDsKK2NsYXNzIENvbG9y OwogY2xhc3MgQ29udGV4dE1lbnVDbGllbnQ7CiBjbGFzcyBDb250ZXh0TWVudUNvbnRyb2xsZXI7 CiBjbGFzcyBEb2N1bWVudDsKQEAgLTM1NSw2ICszNTYsOCBAQCBwdWJsaWM6CiAgICAgaW50IGhl YWRlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1faGVhZGVySGVpZ2h0OyB9CiAgICAgaW50IGZv b3RlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9vdGVySGVpZ2h0OyB9CiAKKyAgICBDb2xv ciBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKKwogICAgIGJvb2wgaXNDb3Vu dGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpIGNvbnN0OwogICAgIHZvaWQgc3RhcnRDb3Vu dGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpOwogICAgIHZvaWQgcmVzZXRSZWxldmFudFBh aW50ZWRPYmplY3RDb3VudGVyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgJKHdvcmtpbmcgY29weSkK QEAgLTI5Nyw2ICsyOTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRQYWludEJhY2tpbmcoUmVu ZGVyTGF5ZXJCYWNraW5nKik7CiAKICAgICB2b2lkIHNldFJvb3RFeHRlbmRlZEJhY2tncm91bmRD b2xvcihjb25zdCBDb2xvciYpOworICAgIENvbG9yIHJvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xv cigpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yOyB9CiAKIHBy aXZhdGU6CiAgICAgY2xhc3MgT3ZlcmxhcE1hcDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2 NTI5NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE0LTAzLTA3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBTZXQgYmFja2dyb3VuZCBjb2xvciBvZiBXSzIncyBVSVNjcm9sbFZpZXcgdG8gdGhl IHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5OTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y IHBhcnQgb2YgYSBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi4KKyAgICAgICAgKiBTaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6c2V0UGFnZUV4dGVuZGVk QmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKiBTaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OmRlY29kZSk6CisKKyAgICAgICAgU2V0IHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSBVSVNj cm9sbFZpZXcgYmFzZWQgb24gdGhlIAorICAgICAgICBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAg ICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOldlYktpdDo6XSk6CisKKyAgICAgICAg Rm9yIHRoZSBzYWtlIG9mIFBMQVRGT1JNKE1BQyksIGNvbnRpbnVlIHRvIHN1cHBvcnQgdGhlIGZh Y3QgdGhhdCB0aGlzIGNvbG9yIGNhbiBiZSAKKyAgICAgICAgc2V0IHZpYSBhIG1lc3NhZ2UgZnJv bSB0aGUgV2ViUHJvY2VzcyBvciB0aGUgbmV3IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpzZXRQYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViQ2hyb21lQ2xpZW50OjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFu Z2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6d2lsbENvbW1pdExheWVyVHJlZSk6CisKIDIwMTQtMDMtMDcgIEFu ZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEluc3RhbGwgV2Vi S2l0MiBYUEMgc2VydmljZXMgdG8gdGhlIGNvcnJlY3QgcGxhY2UgZHVyaW5nIGlPUyBTaW11bGF0 b3IgYnVpbGRzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9S ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oCShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE4Niw2ICsxODYsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1ZpZGVvTGF5ZXJJ RFBlbmRpbmdGdWxsc2NyZWVuKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJ RCBsYXllcklEKSBjb25zdCB7IHJldHVybiBtX3ZpZGVvTGF5ZXJJRHNQZW5kaW5nRnVsbHNjcmVl bi5jb250YWlucyhsYXllcklEKTsgfQogICAgIHZvaWQgYWRkVmlkZW9MYXllcklEUGVuZGluZ0Z1 bGxzY3JlZW4oV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxheWVySUQp IHsgbV92aWRlb0xheWVySURzUGVuZGluZ0Z1bGxzY3JlZW4uYXBwZW5kKGxheWVySUQpOyB9CiAK KyAgICBXZWJDb3JlOjpDb2xvciBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCB7 IHJldHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsgfQorICAgIHZvaWQgc2V0UGFn ZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKSB7IG1fcGFnZUV4 dGVuZGVkQmFja2dyb3VuZENvbG9yID0gY29sb3I7IH0KKwogcHJpdmF0ZToKICAgICBXZWJDb3Jl OjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgbV9yb290TGF5ZXJJRDsKICAgICBMYXll clByb3BlcnRpZXNNYXAgbV9jaGFuZ2VkTGF5ZXJQcm9wZXJ0aWVzOwpAQCAtMjAxLDYgKzIwNCw3 IEBAIHByaXZhdGU6CiAgICAgdWludDY0X3QgbV9yZW5kZXJUcmVlU2l6ZTsKICAgICBib29sIG1f c2NhbGVXYXNTZXRCeVVJUHJvY2VzczsKICAgICBib29sIG1fYWxsb3dzVXNlclNjYWxpbmc7Cisg ICAgV2ViQ29yZTo6Q29sb3IgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv U2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQkocmV2aXNpb24gMTY1Mjk1 KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bi5tbQkod29ya2luZyBjb3B5KQpAQCAtNDIzLDYgKzQyMyw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OmVuY29kZSgKIAogICAgIGVuY29kZXIgPDwgbV9zY2FsZVdhc1NldEJ5 VUlQcm9jZXNzOwogICAgIGVuY29kZXIgPDwgbV9hbGxvd3NVc2VyU2NhbGluZzsKKyAgICBlbmNv ZGVyIDw8IG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOwogfQogCiBib29sIFJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIs IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiByZXN1bHQpCkBAIC00ODYsNiArNDg3LDkgQEAg Ym9vbCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6ZGVjb2RlKAogICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocmVzdWx0Lm1fYWxsb3dzVXNlclNjYWxpbmcpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3BhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiB0cnVlOwog fQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lv biAxNjUyOTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTQyMyw3ICs0MjMsMTMgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkNv bG9yIHVuZGVybGF5Q29sb3IoKSBjb25zdCB7IHJldHVybiBtX3VuZGVybGF5Q29sb3I7IH0KICAg ICB2b2lkIHNldFVuZGVybGF5Q29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKIAorICAgIC8v IEF0IHRoaXMgdGltZSwgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgY2FuIGJlIHNldCB2 aWEgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdlKCkgd2hpY2ggaXMgYSBtZXNz YWdlCisgICAgLy8gZnJvbSB0aGUgVUlQcm9jZXNzLCBvciBieSBzZXRQYWdlRXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3IoKSwgd2hpY2ggd2lsbCBiZSBjYWxsZWQgd2hlbiBhIFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uCisgICAgLy8gaXMgY29tbWl0ZWQuIFdoZW4gUExBVEZPUk0oTUFDKSBhZG9w dHMgVUkgc2lkZSBjb21wb3NpdGluZywgd2Ugc2hvdWxkIGdldCByaWQgb2YgdGhlIG1lc3NhZ2Ug ZW50aXJlbHkuIEluIHRoZSBtZWFudGltZSwKKyAgICAvLyB0aGUgbWVzc2FnZSBpcyB1c2VkIHRv IHNldCBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBvbiBNYWMsIGFuZCBzZXRQYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBpcyB1c2VkIHRvIHNldAorICAgIC8vIHRoZSB2YXJpYWJs ZSBvbiBpT1MuCiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0KKyAgICB2 b2lkIHNldFBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYg Y29sb3IpIHsgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgPSBjb2xvcjsgfQogCiAgICAg dm9pZCB2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpOwogICAgIHZvaWQgdmlld1dpbGxFbmRMaXZl UmVzaXplKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTY1Mjk1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzNSw2ICszMzUs MTQgQEAgLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaQogICAgIGlmICgh bGF5ZXJUcmVlVHJhbnNhY3Rpb24uc2NhbGVXYXNTZXRCeVVJUHJvY2VzcygpICYmICFbX3Njcm9s bFZpZXcgaXNab29taW5nXSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSAmJiAhW19z Y3JvbGxWaWV3IF9pc0FuaW1hdGluZ1pvb21dKQogICAgICAgICBbX3Njcm9sbFZpZXcgc2V0Wm9v bVNjYWxlOmxheWVyVHJlZVRyYW5zYWN0aW9uLnBhZ2VTY2FsZUZhY3RvcigpXTsKIAorICAgIC8v IFdlYlBhZ2VQcm94eSBtYW5hZ2VzIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3Igc2lu Y2UsIGF0IHRoaXMgdGltZSwgaXQgY2FuIGJlIHNldCB2aWEgYSBtZXNzZ2UKKyAgICAvLyBvciB0 aGlzIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLgorICAgIF9wYWdlLT5zZXRQYWdlRXh0ZW5k ZWRCYWNrZ3JvdW5kQ29sb3IobGF5ZXJUcmVlVHJhbnNhY3Rpb24ucGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yKCkpOworICAgIGlmIChVSUNvbG9yICpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IgPSBbc2VsZiBfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yXSkgeworICAgICAgICBpZiAo W3NlbGYgX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZV0gJiYgcGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yICE9IFtfc2Nyb2xsVmlldyBiYWNrZ3JvdW5kQ29sb3JdKQorICAgICAgICAgICAg W19zY3JvbGxWaWV3IHNldEJhY2tncm91bmRDb2xvcjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3JdOworICAgIH0KKwogICAgIGlmIChfZ2VzdHVyZUNvbnRyb2xsZXIpCiAgICAgICAgIF9nZXN0 dXJlQ29udHJvbGxlci0+c2V0UmVuZGVyVHJlZVNpemUobGF5ZXJUcmVlVHJhbnNhY3Rpb24ucmVu ZGVyVHJlZVNpemUoKSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlzaW9u IDE2NTI5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODcyLDcgKzg3MiwxMiBAQCBDb2xv ciBXZWJDaHJvbWVDbGllbnQ6OnVuZGVybGF5Q29sb3IoKSBjCiAKIHZvaWQgV2ViQ2hyb21lQ2xp ZW50OjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UoQ29sb3IgYmFja2dyb3Vu ZENvbG9yKSBjb25zdAogeworI2lmIFBMQVRGT1JNKE1BQykKICAgICBtX3BhZ2UtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6UGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdl KGJhY2tncm91bmRDb2xvcikpOworI2Vsc2VpZiBQTEFURk9STShJT1MpCisgICAgVU5VU0VEX1BB UkFNKGJhY2tncm91bmRDb2xvcik7CisgICAgc2NoZWR1bGVDb21wb3NpdGluZ0xheWVyRmx1c2go KTsKKyNlbmRpZgogfQogCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6bnVtV2hlZWxFdmVudEhhbmRs ZXJzQ2hhbmdlZCh1bnNpZ25lZCBjb3VudCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE2NTI5NSkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYzMiw2ICsyNjMyLDcgQEAgdm9pZCBXZWJQYWdlOjp3aWxsQ29tbWl0TGF5ZXJUcmVlKFJlbW90 ZQogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0Q29udGVudHNTaXplKGNvcmVQYWdlKCktPm1haW5G cmFtZSgpLnZpZXcoKS0+Y29udGVudHNTaXplKCkpOwogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0 UGFnZVNjYWxlRmFjdG9yKGNvcmVQYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpKTsKICAgICBsYXll clRyYW5zYWN0aW9uLnNldFJlbmRlclRyZWVTaXplKGNvcmVQYWdlKCktPnJlbmRlclRyZWVTaXpl KCkpOworICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0UGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y KGNvcmVQYWdlKCktPnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKICNpZiBQTEFURk9S TShJT1MpCiAgICAgbGF5ZXJUcmFuc2FjdGlvbi5zZXRMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlSUQobV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQpOwogICAgIGxheWVyVHJhbnNh Y3Rpb24uc2V0U2NhbGVXYXNTZXRCeVVJUHJvY2VzcyhzY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkp Owo= 226181 2014-03-07 16:06:03 -0800 2014-03-07 16:45:04 -0800 Patch for-review-2.txt text/plain 11345 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTI5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBTZXQgYmFja2dyb3VuZCBjb2xvciBv ZiBXSzIncyBVSVNjcm9sbFZpZXcgdG8gdGhlIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5OTE5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0syIG5lZWRz IHRvIGJlIGFibGUgdG8gYXNrIGZvciB0aGUgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yLCBz byB0aGlzIHBhdGNoIAorICAgICAgICBhZGRzIGEgZnVuY3Rpb24gdG8gUGFnZSB0aGF0IHdpbGwg cmV0dXJuIGl0LgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGFnZS9Q YWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnBhZ2VFeHRlbmRlZEJhY2tncm91bmRD b2xvcik6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpyb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorCiAyMDE0LTAzLTA3ICBBbmRyZWFz IEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBOb3RpZnkgc3lzdGVt IG1hbGxvYyBvZiBmYWtlIG1lbW9yeSBwcmVzc3VyZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29y a2luZyBjb3B5KQpAQCAtMTc3NSw2ICsxNzc1LDcgQEAgX19aTks3V2ViQ29yZTRQYWdlMTRyZW5k ZXJUcmVlU2l6ZUV2CiBfX1pOSzdXZWJDb3JlNFBhZ2UxNXZpc2liaWxpdHlTdGF0ZUV2CiBfX1pO SzdXZWJDb3JlNFBhZ2UxNmhhc1NlZW5BbnlQbHVnaW5FdgogX19aTks3V2ViQ29yZTRQYWdlMTd2 aWV3cG9ydEFyZ3VtZW50c0V2CitfX1pOSzdXZWJDb3JlNFBhZ2UyN3BhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvckV2CiBfX1pOSzdXZWJDb3JlNFBhZ2UzNGluTG93UXVhbGl0eUltYWdlSW50ZXJw b2xhdGlvbk1vZGVFdgogX19aTks3V2ViQ29yZTRQYWdlOWdyb3VwTmFtZUV2CiBfX1pOSzdXZWJD b3JlNFBhZ2U5cGFnZUNvdW50RXYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMTY1 Mjk1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTI3MSw2ICsxMjcxLDE5IEBAIHZvaWQgUGFnZTo6cmVtb3ZlTGF5b3V0TWlsZXN0b25lcyhMYXlv dXQKICAgICBtX3JlcXVlc3RlZExheW91dE1pbGVzdG9uZXMgJj0gfm1pbGVzdG9uZXM7CiB9CiAK K0NvbG9yIFBhZ2U6OnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpIGNvbnN0Cit7CisgICAg RnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtYWluRnJhbWUoKS52aWV3KCk7CisgICAgaWYgKCFmcmFt ZVZpZXcpCisgICAgICAgIHJldHVybiBDb2xvcigpOworCisgICAgUmVuZGVyVmlldyogcmVuZGVy VmlldyA9IGZyYW1lVmlldy0+cmVuZGVyVmlldygpOworICAgIGlmICghcmVuZGVyVmlldykKKyAg ICAgICAgcmV0dXJuIENvbG9yKCk7CisKKyAgICByZXR1cm4gcmVuZGVyVmlldy0+Y29tcG9zaXRv cigpLnJvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpOworfQorCiAvLyBUaGVzZSBhcmUgbWFn aWNhbCBjb25zdGFudHMgdGhhdCBtaWdodCBiZSB0d2Vha2VkIG92ZXIgdGltZS4KIHN0YXRpYyBk b3VibGUgZ01pbmltdW1QYWludGVkQXJlYVJhdGlvID0gMC4xOwogc3RhdGljIGRvdWJsZSBnTWF4 aW11bVVucGFpbnRlZEFyZWFSYXRpbyA9IDAuMDQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNp b24gMTY1Mjk1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkK QEAgLTYyLDYgKzYyLDcgQEAgY2xhc3MgQmFja0ZvcndhcmRDbGllbnQ7CiBjbGFzcyBDaHJvbWU7 CiBjbGFzcyBDaHJvbWVDbGllbnQ7CiBjbGFzcyBDbGllbnRSZWN0TGlzdDsKK2NsYXNzIENvbG9y OwogY2xhc3MgQ29udGV4dE1lbnVDbGllbnQ7CiBjbGFzcyBDb250ZXh0TWVudUNvbnRyb2xsZXI7 CiBjbGFzcyBEb2N1bWVudDsKQEAgLTM1NSw2ICszNTYsOCBAQCBwdWJsaWM6CiAgICAgaW50IGhl YWRlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1faGVhZGVySGVpZ2h0OyB9CiAgICAgaW50IGZv b3RlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9vdGVySGVpZ2h0OyB9CiAKKyAgICBDb2xv ciBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKKwogICAgIGJvb2wgaXNDb3Vu dGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpIGNvbnN0OwogICAgIHZvaWQgc3RhcnRDb3Vu dGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpOwogICAgIHZvaWQgcmVzZXRSZWxldmFudFBh aW50ZWRPYmplY3RDb3VudGVyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgJKHdvcmtpbmcgY29weSkK QEAgLTI5Nyw2ICsyOTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRQYWludEJhY2tpbmcoUmVu ZGVyTGF5ZXJCYWNraW5nKik7CiAKICAgICB2b2lkIHNldFJvb3RFeHRlbmRlZEJhY2tncm91bmRD b2xvcihjb25zdCBDb2xvciYpOworICAgIENvbG9yIHJvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xv cigpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yOyB9CiAKIHBy aXZhdGU6CiAgICAgY2xhc3MgT3ZlcmxhcE1hcDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2 NTI5NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE0LTAzLTA3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKwor ICAgICAgICBTZXQgYmFja2dyb3VuZCBjb2xvciBvZiBXSzIncyBVSVNjcm9sbFZpZXcgdG8gdGhl IHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5OTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y IHBhcnQgb2YgYSBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi4KKyAgICAgICAgKiBTaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6c2V0UGFnZUV4dGVuZGVk QmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKiBTaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OmRlY29kZSk6CisKKyAgICAgICAgU2V0IHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSBVSVNj cm9sbFZpZXcgYmFzZWQgb24gdGhlIAorICAgICAgICBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAg ICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOldlYktpdDo6XSk6CisKKyAgICAgICAg Rm9yIHRoZSBzYWtlIG9mIFBMQVRGT1JNKE1BQyksIGNvbnRpbnVlIHRvIHN1cHBvcnQgdGhlIGZh Y3QgdGhhdCB0aGlzIGNvbG9yIGNhbiBiZSAKKyAgICAgICAgc2V0IHZpYSBhIG1lc3NhZ2UgZnJv bSB0aGUgV2ViUHJvY2VzcyBvciB0aGUgbmV3IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpzZXRQYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViQ2hyb21lQ2xpZW50OjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFu Z2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6d2lsbENvbW1pdExheWVyVHJlZSk6CisKIDIwMTQtMDMtMDcgIEFu ZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEluc3RhbGwgV2Vi S2l0MiBYUEMgc2VydmljZXMgdG8gdGhlIGNvcnJlY3QgcGxhY2UgZHVyaW5nIGlPUyBTaW11bGF0 b3IgYnVpbGRzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9S ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oCShyZXZpc2lvbiAxNjUyOTUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE4Niw2ICsxODYsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1ZpZGVvTGF5ZXJJ RFBlbmRpbmdGdWxsc2NyZWVuKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJ RCBsYXllcklEKSBjb25zdCB7IHJldHVybiBtX3ZpZGVvTGF5ZXJJRHNQZW5kaW5nRnVsbHNjcmVl bi5jb250YWlucyhsYXllcklEKTsgfQogICAgIHZvaWQgYWRkVmlkZW9MYXllcklEUGVuZGluZ0Z1 bGxzY3JlZW4oV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxheWVySUQp IHsgbV92aWRlb0xheWVySURzUGVuZGluZ0Z1bGxzY3JlZW4uYXBwZW5kKGxheWVySUQpOyB9CiAK KyAgICBXZWJDb3JlOjpDb2xvciBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCB7 IHJldHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsgfQorICAgIHZvaWQgc2V0UGFn ZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKSB7IG1fcGFnZUV4 dGVuZGVkQmFja2dyb3VuZENvbG9yID0gY29sb3I7IH0KKwogcHJpdmF0ZToKICAgICBXZWJDb3Jl OjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgbV9yb290TGF5ZXJJRDsKICAgICBMYXll clByb3BlcnRpZXNNYXAgbV9jaGFuZ2VkTGF5ZXJQcm9wZXJ0aWVzOwpAQCAtMjAxLDYgKzIwNCw3 IEBAIHByaXZhdGU6CiAgICAgdWludDY0X3QgbV9yZW5kZXJUcmVlU2l6ZTsKICAgICBib29sIG1f c2NhbGVXYXNTZXRCeVVJUHJvY2VzczsKICAgICBib29sIG1fYWxsb3dzVXNlclNjYWxpbmc7Cisg ICAgV2ViQ29yZTo6Q29sb3IgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv U2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQkocmV2aXNpb24gMTY1Mjk1 KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bi5tbQkod29ya2luZyBjb3B5KQpAQCAtNDIzLDYgKzQyMyw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OmVuY29kZSgKIAogICAgIGVuY29kZXIgPDwgbV9zY2FsZVdhc1NldEJ5 VUlQcm9jZXNzOwogICAgIGVuY29kZXIgPDwgbV9hbGxvd3NVc2VyU2NhbGluZzsKKyAgICBlbmNv ZGVyIDw8IG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOwogfQogCiBib29sIFJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIs IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiByZXN1bHQpCkBAIC00ODYsNiArNDg3LDkgQEAg Ym9vbCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6ZGVjb2RlKAogICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocmVzdWx0Lm1fYWxsb3dzVXNlclNjYWxpbmcpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3BhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiB0cnVlOwog fQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lv biAxNjUyOTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTQyMyw3ICs0MjMsMTMgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkNv bG9yIHVuZGVybGF5Q29sb3IoKSBjb25zdCB7IHJldHVybiBtX3VuZGVybGF5Q29sb3I7IH0KICAg ICB2b2lkIHNldFVuZGVybGF5Q29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKIAorICAgIC8v IEF0IHRoaXMgdGltZSwgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgY2FuIGJlIHNldCB2 aWEgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdlKCkgd2hpY2ggaXMgYSBtZXNz YWdlCisgICAgLy8gZnJvbSB0aGUgVUlQcm9jZXNzLCBvciBieSBzZXRQYWdlRXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3IoKSwgd2hpY2ggd2lsbCBiZSBjYWxsZWQgd2hlbiBhIFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uCisgICAgLy8gaXMgY29tbWl0ZWQuIFdoZW4gUExBVEZPUk0oTUFDKSBhZG9w dHMgVUkgc2lkZSBjb21wb3NpdGluZywgd2Ugc2hvdWxkIGdldCByaWQgb2YgdGhlIG1lc3NhZ2Ug ZW50aXJlbHkuIEluIHRoZSBtZWFudGltZSwKKyAgICAvLyB0aGUgbWVzc2FnZSBpcyB1c2VkIHRv IHNldCBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciBvbiBNYWMsIGFuZCBzZXRQYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBpcyB1c2VkIHRvIHNldAorICAgIC8vIHRoZSB2YXJpYWJs ZSBvbiBpT1MuCiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0KKyAgICB2 b2lkIHNldFBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYg Y29sb3IpIHsgbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IgPSBjb2xvcjsgfQogCiAgICAg dm9pZCB2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpOwogICAgIHZvaWQgdmlld1dpbGxFbmRMaXZl UmVzaXplKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQkocmV2aXNpb24gMTY1Mjk1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzNSw2ICszMzUs MTQgQEAgLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaQogICAgIGlmICgh bGF5ZXJUcmVlVHJhbnNhY3Rpb24uc2NhbGVXYXNTZXRCeVVJUHJvY2VzcygpICYmICFbX3Njcm9s bFZpZXcgaXNab29taW5nXSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSAmJiAhW19z Y3JvbGxWaWV3IF9pc0FuaW1hdGluZ1pvb21dKQogICAgICAgICBbX3Njcm9sbFZpZXcgc2V0Wm9v bVNjYWxlOmxheWVyVHJlZVRyYW5zYWN0aW9uLnBhZ2VTY2FsZUZhY3RvcigpXTsKIAorICAgIC8v IFdlYlBhZ2VQcm94eSBtYW5hZ2VzIHRoZSBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3Igc2lu Y2UsIGF0IHRoaXMgdGltZSwgaXQgY2FuIGJlIHNldCB2aWEgYSBtZXNzZ2UKKyAgICAvLyBvciB0 aGlzIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLgorICAgIF9wYWdlLT5zZXRQYWdlRXh0ZW5k ZWRCYWNrZ3JvdW5kQ29sb3IobGF5ZXJUcmVlVHJhbnNhY3Rpb24ucGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yKCkpOworICAgIGlmIChVSUNvbG9yICpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IgPSBbc2VsZiBfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yXSkgeworICAgICAgICBpZiAo W3NlbGYgX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZV0gJiYgcGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yICE9IFtfc2Nyb2xsVmlldyBiYWNrZ3JvdW5kQ29sb3JdKQorICAgICAgICAgICAg W19zY3JvbGxWaWV3IHNldEJhY2tncm91bmRDb2xvcjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3JdOworICAgIH0KKwogICAgIGlmIChfZ2VzdHVyZUNvbnRyb2xsZXIpCiAgICAgICAgIF9nZXN0 dXJlQ29udHJvbGxlci0+c2V0UmVuZGVyVHJlZVNpemUobGF5ZXJUcmVlVHJhbnNhY3Rpb24ucmVu ZGVyVHJlZVNpemUoKSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlzaW9u IDE2NTI5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODcyLDcgKzg3MiwxMyBAQCBDb2xv ciBXZWJDaHJvbWVDbGllbnQ6OnVuZGVybGF5Q29sb3IoKSBjCiAKIHZvaWQgV2ViQ2hyb21lQ2xp ZW50OjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UoQ29sb3IgYmFja2dyb3Vu ZENvbG9yKSBjb25zdAogeworI2lmIFBMQVRGT1JNKE1BQykKICAgICBtX3BhZ2UtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6UGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdl KGJhY2tncm91bmRDb2xvcikpOworI2VsaWYgUExBVEZPUk0oSU9TKQorICAgIFVOVVNFRF9QQVJB TShiYWNrZ3JvdW5kQ29sb3IpOworICAgIGlmIChtX3BhZ2UtPmRyYXdpbmdBcmVhKCkpCisgICAg ICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2NoZWR1bGVDb21wb3NpdGluZ0xheWVyRmx1c2go KTsKKyNlbmRpZgogfQogCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6bnVtV2hlZWxFdmVudEhhbmRs ZXJzQ2hhbmdlZCh1bnNpZ25lZCBjb3VudCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE2NTI5NSkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYzMiw2ICsyNjMyLDcgQEAgdm9pZCBXZWJQYWdlOjp3aWxsQ29tbWl0TGF5ZXJUcmVlKFJlbW90 ZQogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0Q29udGVudHNTaXplKGNvcmVQYWdlKCktPm1haW5G cmFtZSgpLnZpZXcoKS0+Y29udGVudHNTaXplKCkpOwogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0 UGFnZVNjYWxlRmFjdG9yKGNvcmVQYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpKTsKICAgICBsYXll clRyYW5zYWN0aW9uLnNldFJlbmRlclRyZWVTaXplKGNvcmVQYWdlKCktPnJlbmRlclRyZWVTaXpl KCkpOworICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0UGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y KGNvcmVQYWdlKCktPnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKICNpZiBQTEFURk9S TShJT1MpCiAgICAgbGF5ZXJUcmFuc2FjdGlvbi5zZXRMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlSUQobV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQpOwogICAgIGxheWVyVHJhbnNh Y3Rpb24uc2V0U2NhbGVXYXNTZXRCeVVJUHJvY2VzcyhzY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkp Owo=