69040 2011-09-28 16:53:40 -0700 ScrollbarThemeComposite requires a ScrollView to draw scroll corner 2011-09-29 12:39:46 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap ossy webkit.review.bot oldest_to_newest 475084 0 ap 2011-09-28 16:53:40 -0700 Not every ScrollableArea is a ScrollView, much less a FrameView. Talking to Page from platform code is obviously a layering violation, but I'm going to take the easy way out and just skip over failing code when there is no ScrollView. 475093 1 109095 ap 2011-09-28 17:05:33 -0700 Created attachment 109095 proposed fix 475096 2 109095 simon.fraser 2011-09-28 17:08:05 -0700 Comment on attachment 109095 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=109095&action=review > Source/WebCore/platform/qt/ScrollbarThemeQt.cpp:248 > + // FIXME: It's incorrect to do invalidation while painting. > if (context->updatingControlTints()) { > scrollView->invalidateRect(rect); It's actually OK during the "updatingControlTints" paint phase. This is a special paint whose sole purpose is to invalidate things whose appearance changes based on the window's activation state. 475237 3 ap 2011-09-28 22:46:54 -0700 I need to make sure that Qt doesn't crash with null scrollView here. Normally, it's something a caller does (e.g. in FrameView). 475530 4 109177 ap 2011-09-29 11:01:37 -0700 Created attachment 109177 patch with Qt fix 475538 5 109177 ap 2011-09-29 11:16:01 -0700 Comment on attachment 109177 patch with Qt fix If this breaks something in Qt, platform/qt/ScrollbarThemeQt.cpp change alone can be reverted for now. But I'll need a good deal of detail about failures to fix (what calls ScrollbarThemeQt::paintScrollCorner() bypassing cross-platform code?) 475608 6 109177 webkit.review.bot 2011-09-29 12:39:41 -0700 Comment on attachment 109177 patch with Qt fix Clearing flags on attachment: 109177 Committed r96348: <http://trac.webkit.org/changeset/96348> 475609 7 webkit.review.bot 2011-09-29 12:39:46 -0700 All reviewed patches have been landed. Closing bug. 109095 2011-09-28 17:05:33 -0700 2011-09-29 11:01:37 -0700 proposed fix ScrollViewInRenderTheme.txt text/plain 8231 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2MjY4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMjggIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MDQwCisgICAgICAgIFNjcm9sbGJhclRoZW1lQ29tcG9z aXRlIHJlcXVpcmVzIGEgU2Nyb2xsVmlldyB0byBkcmF3IHNjcm9sbCBjb3JuZXIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgd2lsbCBiZSBuZWVkZWQgbGF0ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxiYXJU aGVtZUNvbXBvc2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYWdlRm9yU2Nyb2xsVmlldyk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRTY3JvbGxD b3JuZXIpOgorICAgICAgICBVc2UgcGFnZUZvclNjcm9sbFZpZXcoKSBmdW5jdGlvbiB3aGljaCBh bHJlYWR5IGV4aXN0ZWQgaW4gdGhpcyBmaWxlLCB1c2VkIGluIGFub3RoZXIgc2ltaWxhcgorICAg ICAgICBsb2NhdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVzc1Nj cm9sbFZpZXcuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVzc1Njcm9s bFZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwOgor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oOgorICAgICAgICAqIHBs YXRmb3JtL3d4L1Njcm9sbGJhclRoZW1lV3guY3BwOgorICAgICAgICAqIHBsYXRmb3JtL3d4L1Nj cm9sbGJhclRoZW1lV3guaDoKKyAgICAgICAgQWxsIHRoZXNlIG92ZXJyaWRlcyBhcmUgbm8gbG9u Z2VyIG5lZWRlZCwgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUgd2lsbCBkbyB0aGUgcmlnaHQgdGhp bmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcDogKFdlYkNv cmU6OlNjcm9sbGJhclRoZW1lUXQ6OnBhaW50U2Nyb2xsQ29ybmVyKToKKyAgICAgICAgQWRkZWQg YSBGSVhNRSBhYm91dCBhIG1pc3Rha2UgaW4gUXQgdmVyc2lvbi4KKwogMjAxMS0wOS0yOCAgU2Vy Z2V5IEdsYXp1bm92ICA8c2VyZy5nbGF6dW5vdkBnbWFpbC5jb20+CiAKICAgICAgICAgSmF2YVNj cmlwdCBnZW5lcmF0ZWQgZG9jdW1lbnRzIGRvbid0IGluaGVyaXQgdGhlIGNvb2tpZSBVUkwKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBv c2l0ZS5jcHAJKHJldmlzaW9uIDk1OTY5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw2IEBA IHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIFBMQVRG T1JNKFdJTikKIHN0YXRpYyBQYWdlKiBwYWdlRm9yU2Nyb2xsVmlldyhTY3JvbGxWaWV3KiB2aWV3 KQogewogICAgIGlmICghdmlldykKQEAgLTUzLDcgKzUyLDYgQEAgc3RhdGljIFBhZ2UqIHBhZ2VG b3JTY3JvbGxWaWV3KFNjcm9sbFZpZQogICAgICAgICByZXR1cm4gMDsKICAgICByZXR1cm4gZnJh bWVWaWV3LT5mcmFtZSgpLT5wYWdlKCk7CiB9Ci0jZW5kaWYKIAogYm9vbCBTY3JvbGxiYXJUaGVt ZUNvbXBvc2l0ZTo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCog Z3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0KQogewpAQCAtMzA4LDgg KzMwNiw3IEBAIGludCBTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6dHJhY2tMZW5ndGgKIAogdm9p ZCBTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRTY3JvbGxDb3JuZXIoU2Nyb2xsVmlldyog dmlldywgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb3JuZXJSZWN0 KQogewotICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4o dmlldyk7Ci0gICAgUGFnZSogcGFnZSA9IGZyYW1lVmlldy0+ZnJhbWUoKSA/IGZyYW1lVmlldy0+ ZnJhbWUoKS0+cGFnZSgpIDogMDsKKyAgICBQYWdlKiBwYWdlID0gcGFnZUZvclNjcm9sbFZpZXco dmlldyk7CiAgICAgaWYgKHBhZ2UgJiYgcGFnZS0+c2V0dGluZ3MoKS0+c2hvdWxkUGFpbnRDdXN0 b21TY3JvbGxiYXJzKCkgJiYgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5wYWludEN1c3RvbVNj cm9sbENvcm5lcihjb250ZXh0LCBjb3JuZXJSZWN0KSkKICAgICAgICAgcmV0dXJuOwogICAgIGNv bnRleHQtPmZpbGxSZWN0KGNvcm5lclJlY3QsIENvbG9yOjp3aGl0ZSwgQ29sb3JTcGFjZURldmlj ZVJHQik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GcmFtZWxlc3NT Y3JvbGxWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3LmNwcAkocmV2aXNpb24gOTU5NjkpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODMsMTIgKzgzLDYgQEAgdm9pZCBGcmFtZWxlc3NTY3JvbGxWaWV3OjpwYWlu dENvbnRlbnRzKAogewogfQogCi12b2lkIEZyYW1lbGVzc1Njcm9sbFZpZXc6OnBhaW50U2Nyb2xs Q29ybmVyKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgY29ybmVyUmVj dCkKLXsKLSAgICAvLyBTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRTY3JvbGxDb3JuZXIg aW5jb3JyZWN0bHkgYXNzdW1lcyB0aGF0IHRoZSBTY3JvbGxWaWV3IGlzIGEgRnJhbWVWaWV3Lgot ICAgIFNjcm9sbGJhclRoZW1lOjpkZWZhdWx0UGFpbnRTY3JvbGxDb3JuZXIoY29udGV4dCwgY29y bmVyUmVjdCk7Ci19Ci0KIHZvaWQgRnJhbWVsZXNzU2Nyb2xsVmlldzo6Y29udGVudHNSZXNpemVk KCkKIHsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVz c1Njcm9sbFZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3LmgJKHJldmlzaW9uIDk1OTY5KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRnJhbWVsZXNzU2Nyb2xsVmlldy5oCSh3b3JraW5nIGNv cHkpCkBAIC04OCw3ICs4OCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBwcm90ZWN0ZWQ6 CiAgICAgICAgIC8vIFNjcm9sbFZpZXcgcHJvdGVjdGVkIG1ldGhvZHM6CiAgICAgICAgIHZpcnR1 YWwgdm9pZCBwYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsK LSAgICAgICAgdmlydHVhbCB2b2lkIHBhaW50U2Nyb2xsQ29ybmVyKEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IEludFJlY3QmIGNvcm5lclJlY3QpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgY29udGVu dHNSZXNpemVkKCk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCB2aXNpYmxlQ29udGVudHNSZXNpemVk KCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0 ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJh clRoZW1lR3RrLmNwcAkocmV2aXNpb24gOTU5NjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTEsMTUgKzI1 MSw2IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVHdGs6OnBhaW50KFNjcm9sbGJhcioKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotdm9pZCBTY3JvbGxiYXJUaGVtZUd0azo6cGFpbnRTY3JvbGxDb3JuZXIo U2Nyb2xsVmlldyogdmlldywgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBjb3JuZXJSZWN0KQotewotICAgIC8vIFNjcm9sbGJhclRoZW1lQ29tcG9zaXRlOjpwYWludFNj cm9sbENvcm5lciBpbmNvcnJlY3RseSBhc3N1bWVzIHRoYXQgdGhlCi0gICAgLy8gU2Nyb2xsVmll dyBpcyBhIEZyYW1lVmlldyAoc2VlIEZyYW1lbGVzc1Njcm9sbFZpZXcpLCBzbyB3ZSBjYW5ub3Qg bGV0Ci0gICAgLy8gdGhhdCBjb2RlIHJ1bi4gIEZvciBGcmFtZVZpZXcncyB0aGlzIGlzIGNvcnJl Y3Qgc2luY2Ugd2UgZG9uJ3QgZG8gY3VzdG9tCi0gICAgLy8gc2Nyb2xsYmFyIGNvcm5lciByZW5k ZXJpbmcsIHdoaWNoIFNjcm9sbGJhclRoZW1lQ29tcG9zaXRlIHN1cHBvcnRzLgotICAgIFNjcm9s bGJhclRoZW1lOjpwYWludFNjcm9sbENvcm5lcih2aWV3LCBjb250ZXh0LCBjb3JuZXJSZWN0KTsK LX0KLQogYm9vbCBTY3JvbGxiYXJUaGVtZUd0azo6c2hvdWxkQ2VudGVyT25UaHVtYihTY3JvbGxi YXIqLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQogewogICAgIHJldHVybiAoZXZl bnQuc2hpZnRLZXkoKSAmJiBldmVudC5idXR0b24oKSA9PSBMZWZ0QnV0dG9uKSB8fCAoZXZlbnQu YnV0dG9uKCkgPT0gTWlkZGxlQnV0dG9uKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCShyZXZpc2lvbiA5NTk2OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oCSh3b3JraW5nIGNvcHkp CkBAIC00OCw3ICs0OCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhaW50VHJhY2tCYWNrZ3JvdW5k KEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKTsKICAgICB2b2lk IHBhaW50VGh1bWIoR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYp OwogICAgIHZpcnR1YWwgdm9pZCBwYWludEJ1dHRvbihHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxi YXIqLCBjb25zdCBJbnRSZWN0JiwgU2Nyb2xsYmFyUGFydCk7Ci0gICAgdmlydHVhbCB2b2lkIHBh aW50U2Nyb2xsQ29ybmVyKFNjcm9sbFZpZXcqLCBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRS ZWN0Jik7CiAgICAgdmlydHVhbCBib29sIHNob3VsZENlbnRlck9uVGh1bWIoU2Nyb2xsYmFyKiwg Y29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7CiAgICAgdmlydHVhbCBpbnQgc2Nyb2xsYmFyVGhp Y2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXplKTsKICAgICB2aXJ0dWFsIEludFNpemUgYnV0dG9u U2l6ZShTY3JvbGxiYXIqKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9s bGJhclRoZW1lUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0 L1Njcm9sbGJhclRoZW1lUXQuY3BwCShyZXZpc2lvbiA5NTk2OSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDMs NiArMjQzLDcgQEAgaW50IFNjcm9sbGJhclRoZW1lUXQ6OnRyYWNrTGVuZ3RoKFNjcm9sbAogCiB2 b2lkIFNjcm9sbGJhclRoZW1lUXQ6OnBhaW50U2Nyb2xsQ29ybmVyKFNjcm9sbFZpZXcqIHNjcm9s bFZpZXcsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsK KyAgICAvLyBGSVhNRTogSXQncyBpbmNvcnJlY3QgdG8gZG8gaW52YWxpZGF0aW9uIHdoaWxlIHBh aW50aW5nLgogICAgIGlmIChjb250ZXh0LT51cGRhdGluZ0NvbnRyb2xUaW50cygpKSB7CiAgICAg ICAgc2Nyb2xsVmlldy0+aW52YWxpZGF0ZVJlY3QocmVjdCk7CiAgICAgICAgcmV0dXJuOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3gvU2Nyb2xsYmFyVGhlbWVXeC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3gvU2Nyb2xsYmFyVGhlbWVXeC5jcHAJ KHJldmlzaW9uIDk1OTY5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3gvU2Nyb2xsYmFy VGhlbWVXeC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3OSwxNSArMTc5LDYgQEAgSW50UmVjdCBT Y3JvbGxiYXJUaGVtZVd4Ojp0cmFja1JlY3QoU2NybwogICAgIHJldHVybiBJbnRSZWN0KHNjcm9s bGJhci0+eCgpLCBzY3JvbGxiYXItPnkoKSArIHRyYWNrU3RhcnQsIHRoaWNrbmVzcywgc2Nyb2xs YmFyLT5oZWlnaHQoKSAtIDIgKiBicy5oZWlnaHQoKSk7CiB9CiAKLXZvaWQgU2Nyb2xsYmFyVGhl bWVXeDo6cGFpbnRTY3JvbGxDb3JuZXIoU2Nyb2xsVmlldyogdmlldywgR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb3JuZXJSZWN0KQotewotICAgIC8vIFNjcm9sbGJh clRoZW1lQ29tcG9zaXRlOjpwYWludFNjcm9sbENvcm5lciBpbmNvcnJlY3RseSBhc3N1bWVzIHRo YXQgdGhlCi0gICAgLy8gU2Nyb2xsVmlldyBpcyBhIEZyYW1lVmlldyAoc2VlIEZyYW1lbGVzc1Nj cm9sbFZpZXcpLCBzbyB3ZSBjYW5ub3QgbGV0Ci0gICAgLy8gdGhhdCBjb2RlIHJ1bi4gIEZvciBG cmFtZVZpZXcncyB0aGlzIGlzIGNvcnJlY3Qgc2luY2Ugd2UgZG9uJ3QgZG8gY3VzdG9tCi0gICAg Ly8gc2Nyb2xsYmFyIGNvcm5lciByZW5kZXJpbmcsIHdoaWNoIFNjcm9sbGJhclRoZW1lQ29tcG9z aXRlIHN1cHBvcnRzLgotICAgIFNjcm9sbGJhclRoZW1lOjpwYWludFNjcm9sbENvcm5lcih2aWV3 LCBjb250ZXh0LCBjb3JuZXJSZWN0KTsKLX0KLQogYm9vbCBTY3JvbGxiYXJUaGVtZVd4OjpwYWlu dChTY3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJ bnRSZWN0JiByZWN0KQogewogICAgIHd4T3JpZW50YXRpb24gb3JpZW50YXRpb24gPSAoc2Nyb2xs YmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpID8gd3hIT1JJWk9OVEFM IDogd3hWRVJUSUNBTDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3d4L1Njcm9sbGJh clRoZW1lV3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93eC9TY3Jv bGxiYXJUaGVtZVd4LmgJKHJldmlzaW9uIDk1OTY5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd3gvU2Nyb2xsYmFyVGhlbWVXeC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw4ICszNiw2IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIH5TY3JvbGxiYXJUaGVtZVd4KCk7CiAgICAgdmlydHVhbCBp bnQgc2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJhckNvbnRyb2xTaXplID0gUmVndWxhclNjcm9s bGJhcik7CiAgICAgdmlydHVhbCBib29sIHBhaW50KFNjcm9sbGJhciosIEdyYXBoaWNzQ29udGV4 dCosIGNvbnN0IEludFJlY3QmKTsKLQotICAgIHZpcnR1YWwgdm9pZCBwYWludFNjcm9sbENvcm5l cihTY3JvbGxWaWV3KiwgR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYgY29ybmVyUmVj dCk7CiAgICAgCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIGhhc0J1dHRvbnMoU2Nyb2xs YmFyKikgeyByZXR1cm4gdHJ1ZTsgfQo= 109177 2011-09-29 11:01:37 -0700 2011-09-29 12:39:41 -0700 patch with Qt fix ScrollViewInRenderTheme.txt text/plain 8698 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2MzQxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDktMjggIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MDQwCisgICAgICAgIFNjcm9sbGJhclRoZW1lQ29tcG9z aXRlIHJlcXVpcmVzIGEgU2Nyb2xsVmlldyB0byBkcmF3IHNjcm9sbCBjb3JuZXIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRo aXMgd2lsbCBiZSBuZWVkZWQgbGF0ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxiYXJU aGVtZUNvbXBvc2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYWdlRm9yU2Nyb2xsVmlldyk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRTY3JvbGxD b3JuZXIpOgorICAgICAgICBVc2UgcGFnZUZvclNjcm9sbFZpZXcoKSBmdW5jdGlvbiB3aGljaCBh bHJlYWR5IGV4aXN0ZWQgaW4gdGhpcyBmaWxlLCB1c2VkIGluIGFub3RoZXIgc2ltaWxhcgorICAg ICAgICBsb2NhdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVzc1Nj cm9sbFZpZXcuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVzc1Njcm9s bFZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwOgor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5oOgorICAgICAgICAqIHBs YXRmb3JtL3d4L1Njcm9sbGJhclRoZW1lV3guY3BwOgorICAgICAgICAqIHBsYXRmb3JtL3d4L1Nj cm9sbGJhclRoZW1lV3guaDoKKyAgICAgICAgQWxsIHRoZXNlIG92ZXJyaWRlcyBhcmUgbm8gbG9u Z2VyIG5lZWRlZCwgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUgd2lsbCBkbyB0aGUgcmlnaHQgdGhp bmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcDogKFdlYkNv cmU6OlNjcm9sbGJhclRoZW1lUXQ6OnBhaW50U2Nyb2xsQ29ybmVyKToKKyAgICAgICAgUmVtb3Zl ZCBhIHNwZWNpYWwgY2FzZSBmb3IgdXBkYXRpbmdDb250cm9sVGludHMgcGhhc2UuIFRoZSBzYW1l IGNhc2UgaXMgcHJlc2VudCBpbiBjcm9zcy1wbGF0Zm9ybQorICAgICAgICBjb2RlIG5vdywgYW5k IFF0IGRvZXNuJ3QgaGF2ZSBhbnkgY3VzdG9tIHN1YmNsYXNzZXMgb2YgU2Nyb2xsYWJsZUFyZWEg b3IgU2Nyb2xsVmlldyB0byBuZWVkCisgICAgICAgIHNwZWNpYWwgaGFuZGxpbmcuCisgICAgICAg IFRoaXMgd2FzIGFkZGVkIGluIHIzNzM3NyB3aXRob3V0IGEgYnVnIG9yIG11Y2ggQ2hhbmdlTG9n IGV4cGxhbmF0aW9uLgorCiAyMDExLTA5LTI5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CiAKICAgICAgICAgV2Ugc2hvdWxkIGlnbm9yZSB0aGUgcmV0dXJuIHZhbHVlIG9mIEdldFJl YWxOYW1lZFByb3BlcnR5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJU aGVtZUNvbXBvc2l0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCShyZXZpc2lvbiA5NjM0MSkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDEsNyArNDEsNiBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLSNpZiBQTEFURk9STShXSU4pCiBzdGF0aWMgUGFnZSogcGFnZUZvclNjcm9sbFZp ZXcoU2Nyb2xsVmlldyogdmlldykKIHsKICAgICBpZiAoIXZpZXcpCkBAIC01Myw3ICs1Miw2IEBA IHN0YXRpYyBQYWdlKiBwYWdlRm9yU2Nyb2xsVmlldyhTY3JvbGxWaWUKICAgICAgICAgcmV0dXJu IDA7CiAgICAgcmV0dXJuIGZyYW1lVmlldy0+ZnJhbWUoKS0+cGFnZSgpOwogfQotI2VuZGlmCiAK IGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFy LCBHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdl UmVjdCkKIHsKQEAgLTMwOCw4ICszMDYsNyBAQCBpbnQgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6 OnRyYWNrTGVuZ3RoCiAKIHZvaWQgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50U2Nyb2xs Q29ybmVyKFNjcm9sbFZpZXcqIHZpZXcsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg SW50UmVjdCYgY29ybmVyUmVjdCkKIHsKLSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IHN0YXRp Y19jYXN0PEZyYW1lVmlldyo+KHZpZXcpOwotICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZVZpZXctPmZy YW1lKCkgPyBmcmFtZVZpZXctPmZyYW1lKCktPnBhZ2UoKSA6IDA7CisgICAgUGFnZSogcGFnZSA9 IHBhZ2VGb3JTY3JvbGxWaWV3KHZpZXcpOwogICAgIGlmIChwYWdlICYmIHBhZ2UtPnNldHRpbmdz KCktPnNob3VsZFBhaW50Q3VzdG9tU2Nyb2xsYmFycygpICYmIHBhZ2UtPmNocm9tZSgpLT5jbGll bnQoKS0+cGFpbnRDdXN0b21TY3JvbGxDb3JuZXIoY29udGV4dCwgY29ybmVyUmVjdCkpCiAgICAg ICAgIHJldHVybjsKICAgICBjb250ZXh0LT5maWxsUmVjdChjb3JuZXJSZWN0LCBDb2xvcjo6d2hp dGUsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vRnJhbWVsZXNzU2Nyb2xsVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRnJhbWVsZXNzU2Nyb2xsVmlldy5jcHAJKHJldmlzaW9u IDk2MzQxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRnJhbWVsZXNzU2Ny b2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDEyICs4Myw2IEBAIHZvaWQgRnJhbWVs ZXNzU2Nyb2xsVmlldzo6cGFpbnRDb250ZW50cygKIHsKIH0KIAotdm9pZCBGcmFtZWxlc3NTY3Jv bGxWaWV3OjpwYWludFNjcm9sbENvcm5lcihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEludFJlY3QmIGNvcm5lclJlY3QpCi17Ci0gICAgLy8gU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6 OnBhaW50U2Nyb2xsQ29ybmVyIGluY29ycmVjdGx5IGFzc3VtZXMgdGhhdCB0aGUgU2Nyb2xsVmll dyBpcyBhIEZyYW1lVmlldy4KLSAgICBTY3JvbGxiYXJUaGVtZTo6ZGVmYXVsdFBhaW50U2Nyb2xs Q29ybmVyKGNvbnRleHQsIGNvcm5lclJlY3QpOwotfQotCiB2b2lkIEZyYW1lbGVzc1Njcm9sbFZp ZXc6OmNvbnRlbnRzUmVzaXplZCgpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9GcmFtZWxlc3NTY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRnJhbWVsZXNzU2Nyb2xsVmlldy5oCShyZXZpc2lvbiA5 NjM0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZyYW1lbGVzc1Njcm9s bFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgcHJvdGVjdGVkOgogICAgICAgICAvLyBTY3JvbGxWaWV3IHByb3RlY3RlZCBtZXRo b2RzOgogICAgICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQq LCBjb25zdCBJbnRSZWN0Jik7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBwYWludFNjcm9sbENvcm5l cihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBjb3JuZXJSZWN0KTsKICAgICAgICAg dmlydHVhbCB2b2lkIGNvbnRlbnRzUmVzaXplZCgpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgdmlz aWJsZUNvbnRlbnRzUmVzaXplZCgpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAJKHJldmlzaW9uIDk2MzQxKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhclRoZW1lR3RrLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjUxLDE1ICsyNTEsNiBAQCBib29sIFNjcm9sbGJhclRoZW1lR3RrOjpwYWludChT Y3JvbGxiYXIqCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgU2Nyb2xsYmFyVGhlbWVHdGs6 OnBhaW50U2Nyb2xsQ29ybmVyKFNjcm9sbFZpZXcqIHZpZXcsIEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgSW50UmVjdCYgY29ybmVyUmVjdCkKLXsKLSAgICAvLyBTY3JvbGxiYXJUaGVt ZUNvbXBvc2l0ZTo6cGFpbnRTY3JvbGxDb3JuZXIgaW5jb3JyZWN0bHkgYXNzdW1lcyB0aGF0IHRo ZQotICAgIC8vIFNjcm9sbFZpZXcgaXMgYSBGcmFtZVZpZXcgKHNlZSBGcmFtZWxlc3NTY3JvbGxW aWV3KSwgc28gd2UgY2Fubm90IGxldAotICAgIC8vIHRoYXQgY29kZSBydW4uICBGb3IgRnJhbWVW aWV3J3MgdGhpcyBpcyBjb3JyZWN0IHNpbmNlIHdlIGRvbid0IGRvIGN1c3RvbQotICAgIC8vIHNj cm9sbGJhciBjb3JuZXIgcmVuZGVyaW5nLCB3aGljaCBTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZSBz dXBwb3J0cy4KLSAgICBTY3JvbGxiYXJUaGVtZTo6cGFpbnRTY3JvbGxDb3JuZXIodmlldywgY29u dGV4dCwgY29ybmVyUmVjdCk7Ci19Ci0KIGJvb2wgU2Nyb2xsYmFyVGhlbWVHdGs6OnNob3VsZENl bnRlck9uVGh1bWIoU2Nyb2xsYmFyKiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkK IHsKICAgICByZXR1cm4gKGV2ZW50LnNoaWZ0S2V5KCkgJiYgZXZlbnQuYnV0dG9uKCkgPT0gTGVm dEJ1dHRvbikgfHwgKGV2ZW50LmJ1dHRvbigpID09IE1pZGRsZUJ1dHRvbik7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuaAkocmV2aXNp b24gOTYzNDEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVH dGsuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNyArNDgsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBw YWludFRyYWNrQmFja2dyb3VuZChHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25zdCBJ bnRSZWN0Jik7CiAgICAgdm9pZCBwYWludFRodW1iKEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJh ciosIGNvbnN0IEludFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRCdXR0b24oR3JhcGhp Y3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYsIFNjcm9sbGJhclBhcnQpOwot ICAgIHZpcnR1YWwgdm9pZCBwYWludFNjcm9sbENvcm5lcihTY3JvbGxWaWV3KiwgR3JhcGhpY3ND b250ZXh0KiwgY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJP blRodW1iKFNjcm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwogICAgIHZpcnR1 YWwgaW50IHNjcm9sbGJhclRoaWNrbmVzcyhTY3JvbGxiYXJDb250cm9sU2l6ZSk7CiAgICAgdmly dHVhbCBJbnRTaXplIGJ1dHRvblNpemUoU2Nyb2xsYmFyKik7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcAkocmV2aXNpb24gOTYzNDEp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjQxLDEzICsyNDEsOCBAQCBpbnQgU2Nyb2xsYmFyVGhlbWVRdDo6dHJh Y2tMZW5ndGgoU2Nyb2xsCiAgICAgcmV0dXJuIHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBI b3Jpem9udGFsU2Nyb2xsYmFyID8gdHJhY2sud2lkdGgoKSA6IHRyYWNrLmhlaWdodCgpOwogfQog Ci12b2lkIFNjcm9sbGJhclRoZW1lUXQ6OnBhaW50U2Nyb2xsQ29ybmVyKFNjcm9sbFZpZXcqIHNj cm9sbFZpZXcsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkK K3ZvaWQgU2Nyb2xsYmFyVGhlbWVRdDo6cGFpbnRTY3JvbGxDb3JuZXIoU2Nyb2xsVmlldyosIEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKLSAgICBpZiAo Y29udGV4dC0+dXBkYXRpbmdDb250cm9sVGludHMoKSkgewotICAgICAgIHNjcm9sbFZpZXctPmlu dmFsaWRhdGVSZWN0KHJlY3QpOwotICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBTdHlsZVBh aW50ZXIgcCh0aGlzLCBjb250ZXh0KTsKICAgICBpZiAoIXAuaXNWYWxpZCgpKQogICAgICAgICBy ZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93eC9TY3JvbGxiYXJUaGVtZVd4 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93eC9TY3JvbGxiYXJU aGVtZVd4LmNwcAkocmV2aXNpb24gOTYzNDEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 eC9TY3JvbGxiYXJUaGVtZVd4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc5LDE1ICsxNzksNiBA QCBJbnRSZWN0IFNjcm9sbGJhclRoZW1lV3g6OnRyYWNrUmVjdChTY3JvCiAgICAgcmV0dXJuIElu dFJlY3Qoc2Nyb2xsYmFyLT54KCksIHNjcm9sbGJhci0+eSgpICsgdHJhY2tTdGFydCwgdGhpY2tu ZXNzLCBzY3JvbGxiYXItPmhlaWdodCgpIC0gMiAqIGJzLmhlaWdodCgpKTsKIH0KIAotdm9pZCBT Y3JvbGxiYXJUaGVtZVd4OjpwYWludFNjcm9sbENvcm5lcihTY3JvbGxWaWV3KiB2aWV3LCBHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvcm5lclJlY3QpCi17Ci0gICAg Ly8gU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50U2Nyb2xsQ29ybmVyIGluY29ycmVjdGx5 IGFzc3VtZXMgdGhhdCB0aGUKLSAgICAvLyBTY3JvbGxWaWV3IGlzIGEgRnJhbWVWaWV3IChzZWUg RnJhbWVsZXNzU2Nyb2xsVmlldyksIHNvIHdlIGNhbm5vdCBsZXQKLSAgICAvLyB0aGF0IGNvZGUg cnVuLiAgRm9yIEZyYW1lVmlldydzIHRoaXMgaXMgY29ycmVjdCBzaW5jZSB3ZSBkb24ndCBkbyBj dXN0b20KLSAgICAvLyBzY3JvbGxiYXIgY29ybmVyIHJlbmRlcmluZywgd2hpY2ggU2Nyb2xsYmFy VGhlbWVDb21wb3NpdGUgc3VwcG9ydHMuCi0gICAgU2Nyb2xsYmFyVGhlbWU6OnBhaW50U2Nyb2xs Q29ybmVyKHZpZXcsIGNvbnRleHQsIGNvcm5lclJlY3QpOwotfQotCiBib29sIFNjcm9sbGJhclRo ZW1lV3g6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgd3hPcmllbnRhdGlvbiBvcmllbnRhdGlv biA9IChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikgPyB3 eEhPUklaT05UQUwgOiB3eFZFUlRJQ0FMOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d3gvU2Nyb2xsYmFyVGhlbWVXeC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3d4L1Njcm9sbGJhclRoZW1lV3guaAkocmV2aXNpb24gOTYzNDEpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93eC9TY3JvbGxiYXJUaGVtZVd4LmgJKHdvcmtpbmcgY29weSkKQEAgLTM2 LDggKzM2LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflNjcm9sbGJhclRoZW1lV3goKTsKICAg ICB2aXJ0dWFsIGludCBzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNpemUgPSBS ZWd1bGFyU2Nyb2xsYmFyKTsKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnQoU2Nyb2xsYmFyKiwgR3Jh cGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYpOwotCi0gICAgdmlydHVhbCB2b2lkIHBhaW50 U2Nyb2xsQ29ybmVyKFNjcm9sbFZpZXcqLCBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0 JiBjb3JuZXJSZWN0KTsKICAgICAKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIGJvb2wgaGFzQnV0 dG9ucyhTY3JvbGxiYXIqKSB7IHJldHVybiB0cnVlOyB9Cg==