124745 2013-11-21 14:17:30 -0800 Add a setting to opt into a mode where the background extends and fixed elements don't move on rubber-band 2013-12-02 13:50:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin andersca bdakin commit-queue eflews.bot esprehn+autocc glenn gyuyoung.kim kondapallykalyan sam simon.fraser thorton oldest_to_newest 953292 0 bdakin 2013-11-21 14:17:30 -0800 We should add a setting to opt into a mode where the tile cache has a margin and fixed elements don't move on rubber-band. In other words, this setting would enable a way to opt into the work done in these bugs: https://bugs.webkit.org/show_bug.cgi?id=124260 http://bugs.webkit.org/show_bug.cgi?id=124216 953301 1 217614 bdakin 2013-11-21 14:26:42 -0800 Created attachment 217614 Patch 953305 2 commit-queue 2013-11-21 14:29:28 -0800 Attachment 217614 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/page/FrameView.cpp', u'Source/WebCore/page/Settings.in', u'Source/WebCore/rendering/RenderLayerBacking.cpp', u'Source/WebKit/ChangeLog', u'Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Shared/WebPreferencesStore.h', u'Source/WebKit2/UIProcess/API/C/WKPreferences.cpp', u'Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h', u'Source/WebKit2/WebProcess/WebPage/WebPage.cpp']" exit_code: 1 Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:462: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 953307 3 217616 bdakin 2013-11-21 14:33:46 -0800 Created attachment 217616 Patch 953317 4 217616 eflews.bot 2013-11-21 15:17:49 -0800 Comment on attachment 217616 Patch Attachment 217616 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/33018009 953599 5 217616 thorton 2013-11-22 09:47:18 -0800 Comment on attachment 217616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217616&action=review EFL error is "c++: internal compiler error: Killed (program cc1plus)" so we don't care. > Source/WebCore/page/Settings.in:216 > +backgroundShouldExtendBeyondPage initial=false, setNeedsStyleRecalcInAllFrames=1 Do you need the style recalc? Are we intending for this to be switchable, live? I don't think it will be as it stands, so maybe you don't need this either. 955564 6 bdakin 2013-12-02 13:50:56 -0800 Thanks, Tim! http://trac.webkit.org/changeset/159960 217614 2013-11-21 14:26:42 -0800 2013-11-21 14:33:46 -0800 Patch for-review-os.txt text/plain 10715 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTY0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTIxICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBzZXR0aW5nIHRvIG9wdCBp bnRvIGEgbW9kZSB3aGVyZSB0aGUgYmFja2dyb3VuZCBleHRlbmRzIGFuZCBmaXhlZCBlbGVtZW50 cyAKKyAgICAgICAgZG9uJ3QgbW92ZSBvbiBydWJiZXItYmFuZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NzQ1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IHNldHRpbmcgYmFja2dyb3VuZFNob3Vs ZEV4dGVuZEJleW9uZFBhZ2UoKSB3aWxsIGNhdXNlIHRoZSB0aWxlIGNhY2hlIHRvIGhhdmUgYSAK KyAgICAgICAgbWFyZ2luLCBhbmQgaXQgd2lsbCBhbHNvIGNhdXNlIGZpeGVkIGVsZW1lbnRzIGFu ZCBiYWNrZ3JvdW5kcyB0byBzdGljayB0byB0aGUgCisgICAgICAgIHZpZXdwb3J0IG9uIHNjcm9s bCBpbnN0ZWFkIG9mIHN0aWNraW5nIHRvIHRoZSBkb2N1bWVudC4gCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyk6CisgICAgICAg ICogcGFnZS9TZXR0aW5ncy5pbjoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6UmVuZGVyTGF5 ZXJCYWNraW5nKToKKwogMjAxMy0xMS0yMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIGEgbmV3IG1vZGUgdG8gZXh0ZW5kIHRoZSB0aWxlIGNhY2hlIGJleW9u ZCB0aGUgcGFnZQpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE1OTY0MCkKKysr IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk2LDYg KzExOTYsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldE5lZWRzQWRvYmVGcmFtCiBfX1pO N1dlYkNvcmU4U2V0dGluZ3MzMnNldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkRWIKIF9f Wk43V2ViQ29yZThTZXR0aW5nczMzc2V0QWdncmVzc2l2ZVRpbGVSZXRlbnRpb25FbmFibGVkRWIK IF9fWk43V2ViQ29yZThTZXR0aW5nczMzc2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhz RWIKK19fWk43V2ViQ29yZThTZXR0aW5nczM1c2V0QmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2VFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzdzZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxv Z2dpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczM4c2V0TG93UG93ZXJWaWRlb0F1 ZGlvQnVmZmVyU2l6ZUVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzhzZXRTaW1wbGVM aW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZEViCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxNzgsOCArNDE3OCw3IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IKIAogU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1l bnRzIEZyYW1lVmlldzo6c2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCkgY29uc3QKIHsK LSAgICAvLyBGSVhNRTogSW1wbGVtZW50LiBUaGlzIHNob3VsZCBjb25zdWx0IGEgc2V0dGluZyB0 aGF0IGRvZXMgbm90IHlldCBleGlzdC4KLSAgICByZXR1cm4gU3RpY2tUb0RvY3VtZW50Qm91bmRz OworICAgIHJldHVybiBmcmFtZSgpLnNldHRpbmdzKCkuYmFja2dyb3VuZFNob3VsZEV4dGVuZEJl eW9uZFBhZ2UoKSA/IFN0aWNrVG9WaWV3cG9ydEJvdW5kcyA6IFN0aWNrVG9Eb2N1bWVudEJvdW5k czsKIH0KIAogUmVuZGVyVmlldyogRnJhbWVWaWV3OjpyZW5kZXJWaWV3KCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5pbgkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5pbgkod29ya2luZyBjb3B5KQpAQCAtMjEyLDMgKzIxMiw1IEBAIG1p bmltdW1ab29tRm9udFNpemUgdHlwZT1mbG9hdCwgaW5pdGlhbD0KIAogc2ltcGxlTGluZUxheW91 dEVuYWJsZWQgaW5pdGlhbD10cnVlLCBzZXROZWVkc1N0eWxlUmVjYWxjSW5BbGxGcmFtZXM9MQog c2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWQgaW5pdGlhbD1mYWxzZSwgc2V0TmVl ZHNTdHlsZVJlY2FsY0luQWxsRnJhbWVzPTEKKworYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2UgaW5pdGlhbD1mYWxzZSwgc2V0TmVlZHNTdHlsZVJlY2FsY0luQWxsRnJhbWVzPTEKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CShyZXZpc2lvbiAxNTk2NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM2LDggKzEzNiwxMSBAQCBSZW5kZXJM YXllckJhY2tpbmc6OlJlbmRlckxheWVyQmFja2luZyhSCiAKICAgICAgICAgdGlsZWRCYWNraW5n LT5zZXRJc0luV2luZG93KHBhZ2UtPmlzSW5XaW5kb3coKSk7CiAKLSAgICAgICAgaWYgKG1faXNN YWluRnJhbWVSZW5kZXJWaWV3TGF5ZXIpCisgICAgICAgIGlmIChtX2lzTWFpbkZyYW1lUmVuZGVy Vmlld0xheWVyKSB7CiAgICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldFVucGFyZW50c09mZnNj cmVlblRpbGVzKHRydWUpOworICAgICAgICAgICAgaWYgKHBhZ2UtPnNldHRpbmdzKCkuYmFja2dy b3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoKSkKKyAgICAgICAgICAgICAgICB0aWxlZEJhY2tp bmctPnNldFRpbGVNYXJnaW5zKDUxMiwgNTEyLCA1MTIsIDUxMik7CisgICAgICAgIH0KIAogICAg ICAgICB0aWxlZEJhY2tpbmctPnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQo cGFnZS0+c2V0dGluZ3MoKS5zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKCkpOwog ICAgICAgICBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMTEtMjEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBhIHNldHRpbmcgdG8gb3B0IGludG8gYSBtb2RlIHdoZXJlIHRo ZSBiYWNrZ3JvdW5kIGV4dGVuZHMgYW5kIGZpeGVkIGVsZW1lbnRzIAorICAgICAgICBkb24ndCBt b3ZlIG9uIHJ1YmJlci1iYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjQ3NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgU1BJIHRvIGVuYWJsZSB0aGUgbmV3IHNldHRpbmcuCisKKyAgICAgICAg KiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRCYWNrZ3JvdW5k U2hvdWxkRXh0ZW5kQmV5b25kUGFnZSk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0QmFja2dy b3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9X S1ByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgor CiAyMDEzLTExLTIwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBIb29rIHVwIFdlYlByb2Nlc3Mtc2lkZSBvZiBnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0 YWRhdGEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUu aAkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMTczLDYgKzE3Myw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogICAgIG1hY3JvKFRocmVhZGVkU2Nyb2xsaW5nRW5hYmxlZCwgdGhyZWFkZWRTY3Jv bGxpbmdFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oU2ltcGxlTGluZUxh eW91dEVuYWJsZWQsIHNpbXBsZUxpbmVMYXlvdXRFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBc CiAgICAgbWFjcm8oU2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWQsIHNpbXBsZUxp bmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1h Y3JvKEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlLCBiYWNrZ3JvdW5kU2hvdWxkRXh0 ZW5kQmV5b25kUGFnZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhNZWRpYVN0cmVh bUVuYWJsZWQsIG1lZGlhU3RyZWFtRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBt YWNybyhWaWRlb1BsdWdpblByb3h5RW5hYmxlZCwgaXNWaWRlb1BsdWdpblByb3h5RW5hYmxlZCwg Qm9vbCwgYm9vbCwgREVGQVVMVF9WSURFT19QTFVHSU5fUFJPWFlfRU5BQkxFRCkgXAogICAgIG1h Y3JvKFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3IsIHVzZUxlZ2Fj eVRleHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3IsIEJvb2wsIGJvb2wsIGZhbHNlKSBc CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5j ZXMuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMDYsNiArMTIwNiwxNiBA QCBib29sIFdLUHJlZmVyZW5jZXNHZXRTaW1wbGVMaW5lTGF5b3V0RGViCiAgICAgcmV0dXJuIHRv SW1wbChwcmVmZXJlbmNlc1JlZiktPnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVk KCk7CiB9CiAKK3ZvaWQgV0tQcmVmZXJlbmNlc1NldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlv bmRQYWdlKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKK3sKKyAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25k UGFnZShmbGFnKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0QmFja2dyb3VuZFNob3VsZEV4 dGVuZEJleW9uZFBhZ2UoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKK3sKKyAgICBy ZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+YmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2UoKTsKK30KKwogdm9pZCBXS1ByZWZlcmVuY2VzU2V0TWVkaWFTdHJlYW1FbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKIHsKICAgICB0b0lt cGwocHJlZmVyZW5jZXNSZWYpLT5zZXRNZWRpYVN0cmVhbUVuYWJsZWQoZW5hYmxlZCk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaAkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCw2ICsz MDQsMTAgQEAgV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbgogV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNl c0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYp OwogCisvLyBEZWZhdWx0cyB0byBmYWxzZS4KK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNT ZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmLCBib29s KTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5k QmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJl bmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2Vz UmVmKTsKIAogLy8gRGVmYXVsdHMgdG8gZmFsc2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0ODIsNiArMjQ4Miw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKICAgICBzZXR0aW5ncy5zZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlk ZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVM aW5lTGF5b3V0RW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNpbXBsZUxpbmVMYXlvdXRFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1w bGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5 KCkpKTsKKyAgICBzZXR0aW5ncy5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShz dG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmJhY2tncm91bmRTaG91 bGRFeHRlbmRCZXlvbmRQYWdlS2V5KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRl eHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5Ojp1c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJl aGF2aW9yS2V5KCkpKTsKIApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTY0NSkKKysrIFNvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMt MTEtMjEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHNl dHRpbmcgdG8gb3B0IGludG8gYSBtb2RlIHdoZXJlIHRoZSBiYWNrZ3JvdW5kIGV4dGVuZHMgYW5k IGZpeGVkIGVsZW1lbnRzIAorICAgICAgICBkb24ndCBtb3ZlIG9uIHJ1YmJlci1iYW5kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ3NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBLZWVwIFdpbmRvd3Mg aGFwcHkuCisKKyAgICAgICAgKiBXZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3Iv V2ViS2l0RXhwb3J0cy5kZWYuaW46CisKIDIwMTMtMTEtMjEgIHBlYXZvQG91dGxvb2suY29tICA8 cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBCdWlsZGluZyBBTkdMRSBs aWJyYXJpZXMgZmFpbHMuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktp dEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbgo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBv cnRzLmRlZi5pbgkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdC9XZWJLaXQudmN4 cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTQ1OSw2ICs0NTksNyBAQCBFWFBPUlRTCiAgICAgICAgIHN5bWJvbFdpdGhQb2lu dGVyKD9jdXJzaXZlRm9udEZhbWlseUBTZXR0aW5nc0BXZWJDb3JlQEBRQkVBQlZBdG9taWNTdHJp bmdAV1RGQEBXNFVTY3JpcHRDb2RlQEBAWiwgP2N1cnNpdmVGb250RmFtaWx5QFNldHRpbmdzQFdl YkNvcmVAQFFFQkFBRUJWQXRvbWljU3RyaW5nQFdURkBAVzRVU2NyaXB0Q29kZUBAQFopCiAgICAg ICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zZXRTaW1wbGVMaW5lTGF5b3V0RW5hYmxlZEBTZXR0aW5n c0BXZWJDb3JlQEBRQUVYX05AWiwgP3NldFNpbXBsZUxpbmVMYXlvdXRFbmFibGVkQFNldHRpbmdz QFdlYkNvcmVAQFFFQUFYX05AWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP3NldFNpbXBs ZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkQFNldHRpbmdzQFdlYkNvcmVAQFFBRVhfTkBa LCA/c2V0U2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWRAU2V0dGluZ3NAV2ViQ29y ZUBAUUVBQVhfTkBaKQorCQlzeW1ib2xXaXRoUG9pbnRlcig/c2V0QmFja2dyb3VuZFNob3VsZEV4 dGVuZEJleW9uZFBhZ2VAU2V0dGluZ3NAV2ViQ29yZUBAUUFFWF9OQFosID9zZXRCYWNrZ3JvdW5k U2hvdWxkRXh0ZW5kQmV5b25kUGFnZUBTZXR0aW5nc0BXZWJDb3JlQEBRRUFBWF9OQFopCiAgICAg ICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zdG9yZVVwZGF0ZWRRdW90YUZvck9yaWdpbkBBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZUBXZWJDb3JlQEBRQUVfTlBCVlNlY3VyaXR5T3JpZ2luQDJAX0pAWiwg P3N0b3JlVXBkYXRlZFF1b3RhRm9yT3JpZ2luQEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlQFdlYkNv cmVAQFFFQUFfTlBFQlZTZWN1cml0eU9yaWdpbkAyQF9KQFopCiAgICAgICAgIHN5bWJvbFdpdGhQ b2ludGVyKD9jYWNoZVN0b3JhZ2VAV2ViQ29yZUBAWUFBQVZBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZUAxQFhaLCA/Y2FjaGVTdG9yYWdlQFdlYkNvcmVAQFlBQUVBVkFwcGxpY2F0aW9uQ2FjaGVTdG9y YWdlQDFAWFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zZXREZWZhdWx0T3JpZ2luUXVv dGFAQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBAUUFFWF9KQFosID9zZXREZWZhdWx0 T3JpZ2luUXVvdGFAQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBAUUVBQVhfSkBaKQo= 217616 2013-11-21 14:33:46 -0800 2013-11-22 09:47:18 -0800 Patch for-review-os-2.txt text/plain 10721 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTY0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTIxICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBzZXR0aW5nIHRvIG9wdCBp bnRvIGEgbW9kZSB3aGVyZSB0aGUgYmFja2dyb3VuZCBleHRlbmRzIGFuZCBmaXhlZCBlbGVtZW50 cyAKKyAgICAgICAgZG9uJ3QgbW92ZSBvbiBydWJiZXItYmFuZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NzQ1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IHNldHRpbmcgYmFja2dyb3VuZFNob3Vs ZEV4dGVuZEJleW9uZFBhZ2UoKSB3aWxsIGNhdXNlIHRoZSB0aWxlIGNhY2hlIHRvIGhhdmUgYSAK KyAgICAgICAgbWFyZ2luLCBhbmQgaXQgd2lsbCBhbHNvIGNhdXNlIGZpeGVkIGVsZW1lbnRzIGFu ZCBiYWNrZ3JvdW5kcyB0byBzdGljayB0byB0aGUgCisgICAgICAgIHZpZXdwb3J0IG9uIHNjcm9s bCBpbnN0ZWFkIG9mIHN0aWNraW5nIHRvIHRoZSBkb2N1bWVudC4gCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyk6CisgICAgICAg ICogcGFnZS9TZXR0aW5ncy5pbjoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6UmVuZGVyTGF5 ZXJCYWNraW5nKToKKwogMjAxMy0xMS0yMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIGEgbmV3IG1vZGUgdG8gZXh0ZW5kIHRoZSB0aWxlIGNhY2hlIGJleW9u ZCB0aGUgcGFnZQpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE1OTY0MCkKKysr IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk2LDYg KzExOTYsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldE5lZWRzQWRvYmVGcmFtCiBfX1pO N1dlYkNvcmU4U2V0dGluZ3MzMnNldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkRWIKIF9f Wk43V2ViQ29yZThTZXR0aW5nczMzc2V0QWdncmVzc2l2ZVRpbGVSZXRlbnRpb25FbmFibGVkRWIK IF9fWk43V2ViQ29yZThTZXR0aW5nczMzc2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhz RWIKK19fWk43V2ViQ29yZThTZXR0aW5nczM1c2V0QmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2VFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzdzZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxv Z2dpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczM4c2V0TG93UG93ZXJWaWRlb0F1 ZGlvQnVmZmVyU2l6ZUVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzhzZXRTaW1wbGVM aW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZEViCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxNzgsOCArNDE3OCw3IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IKIAogU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1l bnRzIEZyYW1lVmlldzo6c2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCkgY29uc3QKIHsK LSAgICAvLyBGSVhNRTogSW1wbGVtZW50LiBUaGlzIHNob3VsZCBjb25zdWx0IGEgc2V0dGluZyB0 aGF0IGRvZXMgbm90IHlldCBleGlzdC4KLSAgICByZXR1cm4gU3RpY2tUb0RvY3VtZW50Qm91bmRz OworICAgIHJldHVybiBmcmFtZSgpLnNldHRpbmdzKCkuYmFja2dyb3VuZFNob3VsZEV4dGVuZEJl eW9uZFBhZ2UoKSA/IFN0aWNrVG9WaWV3cG9ydEJvdW5kcyA6IFN0aWNrVG9Eb2N1bWVudEJvdW5k czsKIH0KIAogUmVuZGVyVmlldyogRnJhbWVWaWV3OjpyZW5kZXJWaWV3KCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5pbgkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5pbgkod29ya2luZyBjb3B5KQpAQCAtMjEyLDMgKzIxMiw1IEBAIG1p bmltdW1ab29tRm9udFNpemUgdHlwZT1mbG9hdCwgaW5pdGlhbD0KIAogc2ltcGxlTGluZUxheW91 dEVuYWJsZWQgaW5pdGlhbD10cnVlLCBzZXROZWVkc1N0eWxlUmVjYWxjSW5BbGxGcmFtZXM9MQog c2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWQgaW5pdGlhbD1mYWxzZSwgc2V0TmVl ZHNTdHlsZVJlY2FsY0luQWxsRnJhbWVzPTEKKworYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2UgaW5pdGlhbD1mYWxzZSwgc2V0TmVlZHNTdHlsZVJlY2FsY0luQWxsRnJhbWVzPTEKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CShyZXZpc2lvbiAxNTk2NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM2LDggKzEzNiwxMSBAQCBSZW5kZXJM YXllckJhY2tpbmc6OlJlbmRlckxheWVyQmFja2luZyhSCiAKICAgICAgICAgdGlsZWRCYWNraW5n LT5zZXRJc0luV2luZG93KHBhZ2UtPmlzSW5XaW5kb3coKSk7CiAKLSAgICAgICAgaWYgKG1faXNN YWluRnJhbWVSZW5kZXJWaWV3TGF5ZXIpCisgICAgICAgIGlmIChtX2lzTWFpbkZyYW1lUmVuZGVy Vmlld0xheWVyKSB7CiAgICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldFVucGFyZW50c09mZnNj cmVlblRpbGVzKHRydWUpOworICAgICAgICAgICAgaWYgKHBhZ2UtPnNldHRpbmdzKCkuYmFja2dy b3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoKSkKKyAgICAgICAgICAgICAgICB0aWxlZEJhY2tp bmctPnNldFRpbGVNYXJnaW5zKDUxMiwgNTEyLCA1MTIsIDUxMik7CisgICAgICAgIH0KIAogICAg ICAgICB0aWxlZEJhY2tpbmctPnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQo cGFnZS0+c2V0dGluZ3MoKS5zY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKCkpOwog ICAgICAgICBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMTEtMjEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBhIHNldHRpbmcgdG8gb3B0IGludG8gYSBtb2RlIHdoZXJlIHRo ZSBiYWNrZ3JvdW5kIGV4dGVuZHMgYW5kIGZpeGVkIGVsZW1lbnRzIAorICAgICAgICBkb24ndCBt b3ZlIG9uIHJ1YmJlci1iYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjQ3NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgU1BJIHRvIGVuYWJsZSB0aGUgbmV3IHNldHRpbmcuCisKKyAgICAgICAg KiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRCYWNrZ3JvdW5k U2hvdWxkRXh0ZW5kQmV5b25kUGFnZSk6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0QmFja2dy b3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9X S1ByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgor CiAyMDEzLTExLTIwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBIb29rIHVwIFdlYlByb2Nlc3Mtc2lkZSBvZiBnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0 YWRhdGEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUu aAkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtMTczLDYgKzE3Myw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogICAgIG1hY3JvKFRocmVhZGVkU2Nyb2xsaW5nRW5hYmxlZCwgdGhyZWFkZWRTY3Jv bGxpbmdFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oU2ltcGxlTGluZUxh eW91dEVuYWJsZWQsIHNpbXBsZUxpbmVMYXlvdXRFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBc CiAgICAgbWFjcm8oU2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWQsIHNpbXBsZUxp bmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1h Y3JvKEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlLCBiYWNrZ3JvdW5kU2hvdWxkRXh0 ZW5kQmV5b25kUGFnZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhNZWRpYVN0cmVh bUVuYWJsZWQsIG1lZGlhU3RyZWFtRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBt YWNybyhWaWRlb1BsdWdpblByb3h5RW5hYmxlZCwgaXNWaWRlb1BsdWdpblByb3h5RW5hYmxlZCwg Qm9vbCwgYm9vbCwgREVGQVVMVF9WSURFT19QTFVHSU5fUFJPWFlfRU5BQkxFRCkgXAogICAgIG1h Y3JvKFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3IsIHVzZUxlZ2Fj eVRleHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3IsIEJvb2wsIGJvb2wsIGZhbHNlKSBc CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5j ZXMuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMDYsNiArMTIwNiwxNiBA QCBib29sIFdLUHJlZmVyZW5jZXNHZXRTaW1wbGVMaW5lTGF5b3V0RGViCiAgICAgcmV0dXJuIHRv SW1wbChwcmVmZXJlbmNlc1JlZiktPnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVk KCk7CiB9CiAKK3ZvaWQgV0tQcmVmZXJlbmNlc1NldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlv bmRQYWdlKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKK3sKKyAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25k UGFnZShmbGFnKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0QmFja2dyb3VuZFNob3VsZEV4 dGVuZEJleW9uZFBhZ2UoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKK3sKKyAgICBy ZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+YmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2UoKTsKK30KKwogdm9pZCBXS1ByZWZlcmVuY2VzU2V0TWVkaWFTdHJlYW1FbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKIHsKICAgICB0b0lt cGwocHJlZmVyZW5jZXNSZWYpLT5zZXRNZWRpYVN0cmVhbUVuYWJsZWQoZW5hYmxlZCk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaAkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCw2ICsz MDQsMTAgQEAgV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbgogV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNl c0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYp OwogCisvLyBEZWZhdWx0cyB0byBmYWxzZS4KK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNT ZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmLCBib29s KTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5k QmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJl bmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2Vz UmVmKTsKIAogLy8gRGVmYXVsdHMgdG8gZmFsc2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxNTk2NDApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0ODIsNiArMjQ4Miw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKICAgICBzZXR0aW5ncy5zZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlk ZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVM aW5lTGF5b3V0RW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNpbXBsZUxpbmVMYXlvdXRFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1w bGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5 KCkpKTsKKyAgICBzZXR0aW5ncy5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShz dG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmJhY2tncm91bmRTaG91 bGRFeHRlbmRCZXlvbmRQYWdlS2V5KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRl eHRBbGlnblBvc2l0aW9uZWRFbGVtZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5Ojp1c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJl aGF2aW9yS2V5KCkpKTsKIApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTY0NSkKKysrIFNvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMt MTEtMjEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHNl dHRpbmcgdG8gb3B0IGludG8gYSBtb2RlIHdoZXJlIHRoZSBiYWNrZ3JvdW5kIGV4dGVuZHMgYW5k IGZpeGVkIGVsZW1lbnRzIAorICAgICAgICBkb24ndCBtb3ZlIG9uIHJ1YmJlci1iYW5kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ3NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBLZWVwIFdpbmRvd3Mg aGFwcHkuCisKKyAgICAgICAgKiBXZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3Iv V2ViS2l0RXhwb3J0cy5kZWYuaW46CisKIDIwMTMtMTEtMjEgIHBlYXZvQG91dGxvb2suY29tICA8 cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBCdWlsZGluZyBBTkdMRSBs aWJyYXJpZXMgZmFpbHMuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktp dEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbgo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBv cnRzLmRlZi5pbgkocmV2aXNpb24gMTU5NjQwKQorKysgU291cmNlL1dlYktpdC9XZWJLaXQudmN4 cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTQ1OSw2ICs0NTksNyBAQCBFWFBPUlRTCiAgICAgICAgIHN5bWJvbFdpdGhQb2lu dGVyKD9jdXJzaXZlRm9udEZhbWlseUBTZXR0aW5nc0BXZWJDb3JlQEBRQkVBQlZBdG9taWNTdHJp bmdAV1RGQEBXNFVTY3JpcHRDb2RlQEBAWiwgP2N1cnNpdmVGb250RmFtaWx5QFNldHRpbmdzQFdl YkNvcmVAQFFFQkFBRUJWQXRvbWljU3RyaW5nQFdURkBAVzRVU2NyaXB0Q29kZUBAQFopCiAgICAg ICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zZXRTaW1wbGVMaW5lTGF5b3V0RW5hYmxlZEBTZXR0aW5n c0BXZWJDb3JlQEBRQUVYX05AWiwgP3NldFNpbXBsZUxpbmVMYXlvdXRFbmFibGVkQFNldHRpbmdz QFdlYkNvcmVAQFFFQUFYX05AWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP3NldFNpbXBs ZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkQFNldHRpbmdzQFdlYkNvcmVAQFFBRVhfTkBa LCA/c2V0U2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWRAU2V0dGluZ3NAV2ViQ29y ZUBAUUVBQVhfTkBaKQorICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/c2V0QmFja2dyb3VuZFNo b3VsZEV4dGVuZEJleW9uZFBhZ2VAU2V0dGluZ3NAV2ViQ29yZUBAUUFFWF9OQFosID9zZXRCYWNr Z3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZUBTZXR0aW5nc0BXZWJDb3JlQEBRRUFBWF9OQFop CiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zdG9yZVVwZGF0ZWRRdW90YUZvck9yaWdpbkBB cHBsaWNhdGlvbkNhY2hlU3RvcmFnZUBXZWJDb3JlQEBRQUVfTlBCVlNlY3VyaXR5T3JpZ2luQDJA X0pAWiwgP3N0b3JlVXBkYXRlZFF1b3RhRm9yT3JpZ2luQEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl QFdlYkNvcmVAQFFFQUFfTlBFQlZTZWN1cml0eU9yaWdpbkAyQF9KQFopCiAgICAgICAgIHN5bWJv bFdpdGhQb2ludGVyKD9jYWNoZVN0b3JhZ2VAV2ViQ29yZUBAWUFBQVZBcHBsaWNhdGlvbkNhY2hl U3RvcmFnZUAxQFhaLCA/Y2FjaGVTdG9yYWdlQFdlYkNvcmVAQFlBQUVBVkFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlQDFAWFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9zZXREZWZhdWx0T3Jp Z2luUXVvdGFAQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBAUUFFWF9KQFosID9zZXRE ZWZhdWx0T3JpZ2luUXVvdGFAQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBAUUVBQVhf SkBaKQo=