62783 2011-06-15 23:41:56 -0700 [Chromium] Draw search tickmarks on overlay scrollbars 2011-06-20 18:22:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 sail sail dglazkov dpranke eric jamesr mihaip ojan rsesek thakis tony webkit.review.bot yutak oldest_to_newest 421804 0 sail 2011-06-15 23:41:56 -0700 [Chromium] Draw search tickmarks on overlay scrollbars 421806 1 97407 sail 2011-06-15 23:45:42 -0700 Created attachment 97407 Patch 421807 2 sail 2011-06-15 23:47:59 -0700 Adding Cole and Robert for feedback on the UI. Screenshots here: http://www.dropmocks.com/mWaIN 421810 3 thakis 2011-06-15 23:57:40 -0700 Looks like you added me instead of Cole. I like the screenshots fwiw. 421813 4 sail 2011-06-16 00:01:52 -0700 Trying to add Cole gets me a "alcor@google.com" didn't match anything error. I sent him an email instead. 422121 5 sail 2011-06-16 11:53:10 -0700 Got an LGTM from Cole. Please take a look. 422175 6 97407 mihaip 2011-06-16 13:35:19 -0700 Comment on attachment 97407 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97407&action=review > Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm:488 > + if (wkScrollbarPainterTrackAlpha(scrollbarPainter) >= 1.0) Might make more sense fo the tickmarks to use the same alpha as the track alpha, so that they fade out gradually too. 422176 7 97407 eric 2011-06-16 13:40:13 -0700 Comment on attachment 97407 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97407&action=review > Source/WebCore/platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h:61 > +void wkScrollbarPainterPaintTrack(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, NSRect frameRect); > +void wkScrollbarPainterPaintKnob(WKScrollbarPainterRef); I assume this is our version of WebKitSystemInterface.h? 422190 8 97488 sail 2011-06-16 13:53:57 -0700 Created attachment 97488 Patch 422191 9 sail 2011-06-16 13:54:45 -0700 > Might make more sense fo the tickmarks to use the same alpha as the track alpha, so that they fade out gradually too. Good idea. Fixed. > I assume this is our version of WebKitSystemInterface.h? Yea. 422276 10 97488 webkit.review.bot 2011-06-16 15:08:25 -0700 Comment on attachment 97488 Patch Clearing flags on attachment: 97488 Committed r89073: <http://trac.webkit.org/changeset/89073> 422277 11 webkit.review.bot 2011-06-16 15:08:31 -0700 All reviewed patches have been landed. Closing bug. 422437 12 yutak 2011-06-16 23:09:27 -0700 Hi, your change seemed to cause a compile error in our clang bots: In file included from /b/build/slave/Mac_Clang_Builder__dbg_/build/src/third_party/WebKit/Source/WebCore/WebCore.gyp/../platform/chromium/ScrollAnimatorChromiumMac.mm:36: ../platform/chromium/ScrollbarThemeChromiumMac.h:74:10: error: 'WebCore::ScrollbarThemeChromiumMac::paintTickmarks' hides overloaded virtual function [-Werror,-Woverloaded-virtual] void paintTickmarks(Scrollbar*, GraphicsContext* drawingContext, bool canDrawDirectly, float alpha); ^ ../platform/ScrollbarThemeComposite.h:65:18: note: hidden overloaded virtual function 'WebCore::ScrollbarThemeComposite::paintTickmarks' declared here virtual void paintTickmarks(GraphicsContext*, Scrollbar*, const IntRect&) {} ^ 1 error generated. Could you fix this at your earliest convenience? 422440 13 yutak 2011-06-16 23:18:32 -0700 Reverted r89073 for reason: Broke Chromium Clang build Committed r89120: <http://trac.webkit.org/changeset/89120> 422665 14 eric 2011-06-17 09:36:45 -0700 We need a clang EWS and clang bot on build.webkit.org to stop this "this broke clang but nothing else" rollout nonsense. This is at least the 3rd bug I've seen this happen to in the last week. :( 422666 15 eric 2011-06-17 09:37:37 -0700 Also, why should a build error ever cause a rollout? I would imagine build errors are generally super-easy to fix? Not that I'm against rollouts! It just seems silly to do this dance every time for a clang-only build error. 424066 16 97886 sail 2011-06-20 16:34:05 -0700 Created attachment 97886 Patch 424069 17 sail 2011-06-20 16:37:07 -0700 Fixed clang error. The problem was that there was already a paintTickmarks() method in the super class. I changed the patch to use the same method signature as the super class. The patch passes the chromium clang bog: http://build.chromium.org/p/tryserver.chromium/builders/mac_clang/builds/899 Please take another look. Thanks. 424150 18 97886 webkit.review.bot 2011-06-20 18:22:19 -0700 Comment on attachment 97886 Patch Clearing flags on attachment: 97886 Committed r89326: <http://trac.webkit.org/changeset/89326> 424151 19 webkit.review.bot 2011-06-20 18:22:25 -0700 All reviewed patches have been landed. Closing bug. 97407 2011-06-15 23:45:42 -0700 2011-06-16 13:53:51 -0700 Patch bug-62783-20110615234541.patch text/plain 9470 sail U3VidmVyc2lvbiBSZXZpc2lvbjogODg5NzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjY2VhMGQ0ZjIxMWFiNTJj NTNhMjJhYTQ4ZGU2Njc2NTNkZDA1MzU0Li41Y2ZiZGUxZDZiZGI5MThhNWI0ODg1ZTYwYTAxYTY4 OWI3NGYzOTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMTUgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gRHJhdyBzZWFyY2ggdGlja21hcmtz IG9uIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjI3ODMKKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIHNlYXJjaCB0 aWNrbWFyayBzdXBwb3J0IGZvciBvdmVybGF5IHNjcm9sbGJhcnMuIFRpY2ttYXJrcyBhcmUgb25s eSBkcmF3biB3aGVuIHRoZSBzY3JvbGwgdHJhY2sgaXMgdmlzaWJsZS4KKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oOlNw bGl0IHRoZSBzY3JvbGxiYXIgZHJhd2luZyBjb2RlIGludG8gYSB0cmFjayBhbmQga25vYiB2ZXJz aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRp ZXNDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50KToKKyAg ICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50VHJhY2spOgorICAgICAgICAod2tTY3JvbGxi YXJQYWludGVyUGFpbnRLbm9iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bU1hYy5tbTpGYWN0b3Igb3V0IHRoZSBwYWludCB0aWNrbWFyayBjb2Rl IGFuZCBjYWxsIGl0IGZyb20gdGhlIG92ZXJsYXkgc2Nyb2xsYmFyIGRyYXdpbmcgY29kZS4KKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50VGlja21hcmtzKToK KwogMjAxMS0wNi0xNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJP dmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAppbmRleCAwNTdlMmY3YmNlMGYwZWU4NzkwZTNh NmE2ODM5ZTMwYTNhYmY3MmJjLi4yMWM5OWNhMjdmODE0ZDU4MzMxY2RmMWFlYzYxNTUzMjM2M2M4 YzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaApAQCAt NTcsNiArNTcsOCBAQCBib29sIHdrU2Nyb2xsYmFyUGFpbnRlcklzSG9yaXpvbnRhbChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJLbm9iQWxwaGEoV0tT Y3JvbGxiYXJQYWludGVyUmVmKTsKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0T3ZlcmxheVN0 YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgaW50IG92ZXJsYXlTY3JvbGxlclN0YXRlKTsKIHZv aWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVu YWJsZWQsIGRvdWJsZSB2YWx1ZSwgQ0dGbG9hdCBwcm9wb3J0aW9uLCBOU1JlY3QgZnJhbWVSZWN0 KTsKK3ZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJS ZWYsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5TUmVj dCBmcmFtZVJlY3QpOwordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2IoV0tTY3JvbGxi YXJQYWludGVyUmVmKTsKIGludCB3a1Njcm9sbGJhck1pbmltdW1UaHVtYkxlbmd0aChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Nj cm9sbGJhclBhaW50ZXJSZWYsIGlkIHNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSk7CiBDR0Zsb2F0 IHdrU2Nyb2xsYmFyUGFpbnRlclRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJs YXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQppbmRleCA4MTZhYjM5 ZmI4YTBiODhhZmZkMGRmNTA1YWE1NGM4OWUxY2RiMzk2Li42YzY4MjM0ZmE1YzY5ZGJhNmIzYmMz ZjQ1MDhkNjVjNDVjNDRhYzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLm1tCkBAIC0xNTcsNiArMTU3LDEyIEBAIHZvaWQgd2tTY3JvbGxiYXJQYWludGVy U2V0T3ZlcmxheVN0YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyLCBpbnQgb3Zlcmxh CiAKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBh aW50ZXIsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5T UmVjdCBmcmFtZVJlY3QpCiB7CisgICAgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhwYWlu dGVyLCBlbmFibGVkLCB2YWx1ZSwgcHJvcG9ydGlvbiwgZnJhbWVSZWN0KTsKKyAgICB3a1Njcm9s bGJhclBhaW50ZXJQYWludEtub2IocGFpbnRlcik7Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVk LCBkb3VibGUgdmFsdWUsIENHRmxvYXQgcHJvcG9ydGlvbiwgTlNSZWN0IGZyYW1lUmVjdCkKK3sK ICAgICBbcGFpbnRlciBzZXRFbmFibGVkOmVuYWJsZWRdOwogICAgIFtwYWludGVyIHNldEJvdW5k c1NpemU6ZnJhbWVSZWN0LnNpemVdOwogICAgIFtwYWludGVyIHNldERvdWJsZVZhbHVlOnZhbHVl XTsKQEAgLTE2OSw2ICsxNzUsMTAgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludChXS1Nj cm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVkLCBkb3VibGUKICAgICBmcmFt ZVJlY3Qub3JpZ2luID0gTlNaZXJvUG9pbnQ7CiAKICAgICBbcGFpbnRlciBkcmF3S25vYlNsb3RJ blJlY3Q6ZnJhbWVSZWN0IGhpZ2hsaWdodDpOT107Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyKQorewogICAgIFtwYWlu dGVyIGRyYXdLbm9iXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IDZmNjQ1ZThj ZmU5M2Q5NDA2NTFlYzIzMjY5NGFhOTg3M2NkNzVkZGYuLjgwYTczYjE5YzNlY2U0MzFlMGZhNmEz MTg5OGJkNWJkZTUyNTExNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTcxLDYgKzcx LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJPblRodW1iKFNj cm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwogICAgIHZpcnR1YWwgYm9vbCBz aG91bGREcmFnRG9jdW1lbnRJbnN0ZWFkT2ZUaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmKTsKIAorICAgIHZvaWQgcGFpbnRUaWNrbWFya3MoU2Nyb2xsYmFyKiwgR3Jh cGhpY3NDb250ZXh0KiBkcmF3aW5nQ29udGV4dCwgYm9vbCBjYW5EcmF3RGlyZWN0bHkpOworCiBw dWJsaWM6CiAgICAgdm9pZCBwcmVmZXJlbmNlc0NoYW5nZWQoKTsKIH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bU1hYy5tbQppbmRleCAwZmQ4M2RiNjM2ZGVlYTE0YWFlYjUwNzE3MmE4NDAzOWY5NmY5MDQ5 Li5jMDk4ZTljZTQ5MmYyYjdkMmYzZTUwOGI2OGJmN2NlOTU4ZDViM2I4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1l Q2hyb21pdW1NYWMubW0KQEAgLTQ3OSwxMSArNDc5LDE1IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVD aHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCog Y29uCiAgICAgICAgIGNvbnRleHQtPmNsaXAoZGFtYWdlUmVjdCk7CiAgICAgICAgIGNvbnRleHQt PnRyYW5zbGF0ZShzY3JvbGxiYXItPmZyYW1lUmVjdCgpLngoKSwgc2Nyb2xsYmFyLT5mcmFtZVJl Y3QoKS55KCkpOwogICAgICAgICBMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQgbG9jYWxDb250 ZXh0KGNvbnRleHQpOwotICAgICAgICB3a1Njcm9sbGJhclBhaW50ZXJQYWludChzY3JvbGxiYXJN YXAoKS0+Z2V0KHNjcm9sbGJhcikuZ2V0KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNjcm9sbGJhci0+ZW5hYmxlZCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB2YWx1ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0YXRpY19jYXN0PENH RmxvYXQ+KHNjcm9sbGJhci0+dmlzaWJsZVNpemUoKSkgLSBvdmVyaGFuZykgLyBzY3JvbGxiYXIt PnRvdGFsU2l6ZSgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxiYXIt PmZyYW1lUmVjdCgpKTsKKyAgICAgICAgV0tTY3JvbGxiYXJQYWludGVyUmVmIHNjcm9sbGJhclBh aW50ZXIgPSBzY3JvbGxiYXJNYXAoKS0+Z2V0KHNjcm9sbGJhcikuZ2V0KCk7CisgICAgICAgIHdr U2Nyb2xsYmFyUGFpbnRlclBhaW50VHJhY2soc2Nyb2xsYmFyUGFpbnRlciwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxiYXItPmVuYWJsZWQoKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWx1ZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoc3RhdGljX2Nhc3Q8Q0dGbG9hdD4oc2Nyb2xsYmFyLT52aXNpYmxl U2l6ZSgpKSAtIG92ZXJoYW5nKSAvIHNjcm9sbGJhci0+dG90YWxTaXplKCksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKSk7CisgICAg ICAgIGlmICh3a1Njcm9sbGJhclBhaW50ZXJUcmFja0FscGhhKHNjcm9sbGJhclBhaW50ZXIpID49 IDEuMCkKKyAgICAgICAgICAgIHBhaW50VGlja21hcmtzKHNjcm9sbGJhciwgY29udGV4dCwgZmFs c2UpOworICAgICAgICB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2Ioc2Nyb2xsYmFyUGFpbnRl cik7CiAKICAgICAgICAgc2Nyb2xsQW5pbWF0b3ItPnNldElzRHJhd2luZ0ludG9MYXllcihmYWxz ZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNTQ0LDYgKzU0OCwzMiBAQCBib29sIFNjcm9s bGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGlj c0NvbnRleHQqIGNvbgogI2VuZGlmCiAgICAgSElUaGVtZURyYXdUcmFjaygmdHJhY2tJbmZvLCAw LCBjZ0NvbnRleHQsIGtISVRoZW1lT3JpZW50YXRpb25Ob3JtYWwpOwogCisgICAgcGFpbnRUaWNr bWFya3Moc2Nyb2xsYmFyLCBkcmF3aW5nQ29udGV4dCwgY2FuRHJhd0RpcmVjdGx5KTsKKworICAg IGlmIChoYXNUaHVtYihzY3JvbGxiYXIpKSB7CisgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpUaGVt ZVBhaW50U2Nyb2xsYmFySW5mbyBzY3JvbGxiYXJJbmZvOworICAgICAgICBzY3JvbGxiYXJJbmZv Lm9yaWVudGF0aW9uID0gc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3Jv bGxiYXIgPyBQbGF0Zm9ybUJyaWRnZTo6U2Nyb2xsYmFyT3JpZW50YXRpb25Ib3Jpem9udGFsIDog UGxhdGZvcm1CcmlkZ2U6OlNjcm9sbGJhck9yaWVudGF0aW9uVmVydGljYWw7CisgICAgICAgIHNj cm9sbGJhckluZm8ucGFyZW50ID0gc2Nyb2xsYmFyLT5wYXJlbnQoKSAmJiBzY3JvbGxiYXItPnBh cmVudCgpLT5pc0ZyYW1lVmlldygpICYmIHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHNjcm9sbGJh ci0+cGFyZW50KCkpLT5pc1Njcm9sbFZpZXdTY3JvbGxiYXIoc2Nyb2xsYmFyKSA/IFBsYXRmb3Jt QnJpZGdlOjpTY3JvbGxiYXJQYXJlbnRTY3JvbGxWaWV3IDogUGxhdGZvcm1CcmlkZ2U6OlNjcm9s bGJhclBhcmVudFJlbmRlckxheWVyOworICAgICAgICBzY3JvbGxiYXJJbmZvLm1heFZhbHVlID0g c2Nyb2xsYmFyLT5tYXhpbXVtKCk7CisgICAgICAgIHNjcm9sbGJhckluZm8uY3VycmVudFZhbHVl ID0gc2Nyb2xsYmFyLT5jdXJyZW50UG9zKCk7CisgICAgICAgIHNjcm9sbGJhckluZm8udmlzaWJs ZVNpemUgPSBzY3JvbGxiYXItPnZpc2libGVTaXplKCk7CisgICAgICAgIHNjcm9sbGJhckluZm8u dG90YWxTaXplID0gc2Nyb2xsYmFyLT50b3RhbFNpemUoKTsKKworICAgICAgICBQbGF0Zm9ybUJy aWRnZTo6cGFpbnRTY3JvbGxiYXJUaHVtYigKKyAgICAgICAgICAgIGRyYXdpbmdDb250ZXh0LAor ICAgICAgICAgICAgc2Nyb2xsYmFyU3RhdGVUb1RoZW1lU3RhdGUoc2Nyb2xsYmFyKSwKKyAgICAg ICAgICAgIHNjcm9sbGJhci0+Y29udHJvbFNpemUoKSA9PSBSZWd1bGFyU2Nyb2xsYmFyID8gUGxh dGZvcm1CcmlkZ2U6OlNpemVSZWd1bGFyIDogUGxhdGZvcm1CcmlkZ2U6OlNpemVTbWFsbCwKKyAg ICAgICAgICAgIHNjcm9sbGJhci0+ZnJhbWVSZWN0KCksCisgICAgICAgICAgICBzY3JvbGxiYXJJ bmZvKTsKKyAgICB9CisKKyAgICBpZiAoIWNhbkRyYXdEaXJlY3RseSkKKyAgICAgICAgY29udGV4 dC0+ZHJhd0ltYWdlQnVmZmVyKGltYWdlQnVmZmVyLmdldCgpLCBDb2xvclNwYWNlRGV2aWNlUkdC LCBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLmxvY2F0aW9uKCkpOworCisgICAgcmV0dXJuIHRydWU7 Cit9CisKK3ZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnRUaWNrbWFya3MoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogZHJhd2luZ0NvbnRleHQsIGJvb2wg Y2FuRHJhd0RpcmVjdGx5KSB7CiAgICAgVmVjdG9yPEludFJlY3Q+IHRpY2ttYXJrczsKICAgICBz Y3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCktPmdldFRpY2ttYXJrcyh0aWNrbWFya3MpOwogICAg IGlmIChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWxTY3JvbGxiYXIgJiYgdGlj a21hcmtzLnNpemUoKSkgewpAQCAtNTc4LDI4ICs2MDgsNiBAQCBib29sIFNjcm9sbGJhclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQq IGNvbgogCiAgICAgICAgIGRyYXdpbmdDb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgfQotCi0gICAg aWYgKGhhc1RodW1iKHNjcm9sbGJhcikpIHsKLSAgICAgICAgUGxhdGZvcm1CcmlkZ2U6OlRoZW1l UGFpbnRTY3JvbGxiYXJJbmZvIHNjcm9sbGJhckluZm87Ci0gICAgICAgIHNjcm9sbGJhckluZm8u b3JpZW50YXRpb24gPSBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9s bGJhciA/IFBsYXRmb3JtQnJpZGdlOjpTY3JvbGxiYXJPcmllbnRhdGlvbkhvcml6b250YWwgOiBQ bGF0Zm9ybUJyaWRnZTo6U2Nyb2xsYmFyT3JpZW50YXRpb25WZXJ0aWNhbDsKLSAgICAgICAgc2Ny b2xsYmFySW5mby5wYXJlbnQgPSBzY3JvbGxiYXItPnBhcmVudCgpICYmIHNjcm9sbGJhci0+cGFy ZW50KCktPmlzRnJhbWVWaWV3KCkgJiYgc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4oc2Nyb2xsYmFy LT5wYXJlbnQoKSktPmlzU2Nyb2xsVmlld1Njcm9sbGJhcihzY3JvbGxiYXIpID8gUGxhdGZvcm1C cmlkZ2U6OlNjcm9sbGJhclBhcmVudFNjcm9sbFZpZXcgOiBQbGF0Zm9ybUJyaWRnZTo6U2Nyb2xs YmFyUGFyZW50UmVuZGVyTGF5ZXI7Ci0gICAgICAgIHNjcm9sbGJhckluZm8ubWF4VmFsdWUgPSBz Y3JvbGxiYXItPm1heGltdW0oKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby5jdXJyZW50VmFsdWUg PSBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby52aXNpYmxl U2l6ZSA9IHNjcm9sbGJhci0+dmlzaWJsZVNpemUoKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby50 b3RhbFNpemUgPSBzY3JvbGxiYXItPnRvdGFsU2l6ZSgpOwotCi0gICAgICAgIFBsYXRmb3JtQnJp ZGdlOjpwYWludFNjcm9sbGJhclRodW1iKAotICAgICAgICAgICAgZHJhd2luZ0NvbnRleHQsCi0g ICAgICAgICAgICBzY3JvbGxiYXJTdGF0ZVRvVGhlbWVTdGF0ZShzY3JvbGxiYXIpLAotICAgICAg ICAgICAgc2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpID09IFJlZ3VsYXJTY3JvbGxiYXIgPyBQbGF0 Zm9ybUJyaWRnZTo6U2l6ZVJlZ3VsYXIgOiBQbGF0Zm9ybUJyaWRnZTo6U2l6ZVNtYWxsLAotICAg ICAgICAgICAgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKSwKLSAgICAgICAgICAgIHNjcm9sbGJhcklu Zm8pOwotICAgIH0KLQotICAgIGlmICghY2FuRHJhd0RpcmVjdGx5KQotICAgICAgICBjb250ZXh0 LT5kcmF3SW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXIuZ2V0KCksIENvbG9yU3BhY2VEZXZpY2VSR0Is IHNjcm9sbGJhci0+ZnJhbWVSZWN0KCkubG9jYXRpb24oKSk7Ci0KLSAgICByZXR1cm4gdHJ1ZTsK IH0KIAogfQo= 97488 2011-06-16 13:53:57 -0700 2011-06-20 16:34:01 -0700 Patch bug-62783-20110616135356.patch text/plain 10148 sail U3VidmVyc2lvbiBSZXZpc2lvbjogODg5NzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjY2VhMGQ0ZjIxMWFiNTJj NTNhMjJhYTQ4ZGU2Njc2NTNkZDA1MzU0Li41Y2ZiZGUxZDZiZGI5MThhNWI0ODg1ZTYwYTAxYTY4 OWI3NGYzOTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMTUgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gRHJhdyBzZWFyY2ggdGlja21hcmtz IG9uIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjI3ODMKKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIHNlYXJjaCB0 aWNrbWFyayBzdXBwb3J0IGZvciBvdmVybGF5IHNjcm9sbGJhcnMuIFRpY2ttYXJrcyBhcmUgb25s eSBkcmF3biB3aGVuIHRoZSBzY3JvbGwgdHJhY2sgaXMgdmlzaWJsZS4KKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oOlNw bGl0IHRoZSBzY3JvbGxiYXIgZHJhd2luZyBjb2RlIGludG8gYSB0cmFjayBhbmQga25vYiB2ZXJz aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRp ZXNDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50KToKKyAg ICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50VHJhY2spOgorICAgICAgICAod2tTY3JvbGxi YXJQYWludGVyUGFpbnRLbm9iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bU1hYy5tbTpGYWN0b3Igb3V0IHRoZSBwYWludCB0aWNrbWFyayBjb2Rl IGFuZCBjYWxsIGl0IGZyb20gdGhlIG92ZXJsYXkgc2Nyb2xsYmFyIGRyYXdpbmcgY29kZS4KKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50VGlja21hcmtzKToK KwogMjAxMS0wNi0xNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJP dmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAppbmRleCAwNTdlMmY3YmNlMGYwZWU4NzkwZTNh NmE2ODM5ZTMwYTNhYmY3MmJjLi4yMWM5OWNhMjdmODE0ZDU4MzMxY2RmMWFlYzYxNTUzMjM2M2M4 YzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaApAQCAt NTcsNiArNTcsOCBAQCBib29sIHdrU2Nyb2xsYmFyUGFpbnRlcklzSG9yaXpvbnRhbChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJLbm9iQWxwaGEoV0tT Y3JvbGxiYXJQYWludGVyUmVmKTsKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0T3ZlcmxheVN0 YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgaW50IG92ZXJsYXlTY3JvbGxlclN0YXRlKTsKIHZv aWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVu YWJsZWQsIGRvdWJsZSB2YWx1ZSwgQ0dGbG9hdCBwcm9wb3J0aW9uLCBOU1JlY3QgZnJhbWVSZWN0 KTsKK3ZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJS ZWYsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5TUmVj dCBmcmFtZVJlY3QpOwordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2IoV0tTY3JvbGxi YXJQYWludGVyUmVmKTsKIGludCB3a1Njcm9sbGJhck1pbmltdW1UaHVtYkxlbmd0aChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Nj cm9sbGJhclBhaW50ZXJSZWYsIGlkIHNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSk7CiBDR0Zsb2F0 IHdrU2Nyb2xsYmFyUGFpbnRlclRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJs YXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQppbmRleCA4MTZhYjM5 ZmI4YTBiODhhZmZkMGRmNTA1YWE1NGM4OWUxY2RiMzk2Li42YzY4MjM0ZmE1YzY5ZGJhNmIzYmMz ZjQ1MDhkNjVjNDVjNDRhYzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLm1tCkBAIC0xNTcsNiArMTU3LDEyIEBAIHZvaWQgd2tTY3JvbGxiYXJQYWludGVy U2V0T3ZlcmxheVN0YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyLCBpbnQgb3Zlcmxh CiAKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBh aW50ZXIsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5T UmVjdCBmcmFtZVJlY3QpCiB7CisgICAgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhwYWlu dGVyLCBlbmFibGVkLCB2YWx1ZSwgcHJvcG9ydGlvbiwgZnJhbWVSZWN0KTsKKyAgICB3a1Njcm9s bGJhclBhaW50ZXJQYWludEtub2IocGFpbnRlcik7Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVk LCBkb3VibGUgdmFsdWUsIENHRmxvYXQgcHJvcG9ydGlvbiwgTlNSZWN0IGZyYW1lUmVjdCkKK3sK ICAgICBbcGFpbnRlciBzZXRFbmFibGVkOmVuYWJsZWRdOwogICAgIFtwYWludGVyIHNldEJvdW5k c1NpemU6ZnJhbWVSZWN0LnNpemVdOwogICAgIFtwYWludGVyIHNldERvdWJsZVZhbHVlOnZhbHVl XTsKQEAgLTE2OSw2ICsxNzUsMTAgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludChXS1Nj cm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVkLCBkb3VibGUKICAgICBmcmFt ZVJlY3Qub3JpZ2luID0gTlNaZXJvUG9pbnQ7CiAKICAgICBbcGFpbnRlciBkcmF3S25vYlNsb3RJ blJlY3Q6ZnJhbWVSZWN0IGhpZ2hsaWdodDpOT107Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyKQorewogICAgIFtwYWlu dGVyIGRyYXdLbm9iXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IDZmNjQ1ZThj ZmU5M2Q5NDA2NTFlYzIzMjY5NGFhOTg3M2NkNzVkZGYuLmM0NzlkZjhiNWJjNTMzN2ExMTJiZTZi ZmUxYWI4NGMwY2I3NGM3MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTcxLDYgKzcx LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJPblRodW1iKFNj cm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwogICAgIHZpcnR1YWwgYm9vbCBz aG91bGREcmFnRG9jdW1lbnRJbnN0ZWFkT2ZUaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmKTsKIAorICAgIHZvaWQgcGFpbnRUaWNrbWFya3MoU2Nyb2xsYmFyKiwgR3Jh cGhpY3NDb250ZXh0KiBkcmF3aW5nQ29udGV4dCwgYm9vbCBjYW5EcmF3RGlyZWN0bHksIGZsb2F0 IGFscGhhKTsKKwogcHVibGljOgogICAgIHZvaWQgcHJlZmVyZW5jZXNDaGFuZ2VkKCk7CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9s bGJhclRoZW1lQ2hyb21pdW1NYWMubW0KaW5kZXggMGZkODNkYjYzNmRlZWExNGFhZWI1MDcxNzJh ODQwMzlmOTZmOTA0OS4uNWJlZWNlYjU2OTI1MWE4OGMxZDFkNjg5MzFjNGMzZmI4MTlkMzJhZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhl bWVDaHJvbWl1bU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9T Y3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCkBAIC00NzksMTEgKzQ3OSwxNiBAQCBib29sIFNj cm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFw aGljc0NvbnRleHQqIGNvbgogICAgICAgICBjb250ZXh0LT5jbGlwKGRhbWFnZVJlY3QpOwogICAg ICAgICBjb250ZXh0LT50cmFuc2xhdGUoc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKS54KCksIHNjcm9s bGJhci0+ZnJhbWVSZWN0KCkueSgpKTsKICAgICAgICAgTG9jYWxDdXJyZW50R3JhcGhpY3NDb250 ZXh0IGxvY2FsQ29udGV4dChjb250ZXh0KTsKLSAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyUGFp bnQoc2Nyb2xsYmFyTWFwKCktPmdldChzY3JvbGxiYXIpLmdldCgpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzY3JvbGxiYXItPmVuYWJsZWQoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdmFsdWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChz dGF0aWNfY2FzdDxDR0Zsb2F0PihzY3JvbGxiYXItPnZpc2libGVTaXplKCkpIC0gb3Zlcmhhbmcp IC8gc2Nyb2xsYmFyLT50b3RhbFNpemUoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKSk7CisgICAgICAgIFdLU2Nyb2xsYmFyUGFpbnRlclJl ZiBzY3JvbGxiYXJQYWludGVyID0gc2Nyb2xsYmFyTWFwKCktPmdldChzY3JvbGxiYXIpLmdldCgp OworICAgICAgICB3a1Njcm9sbGJhclBhaW50ZXJQYWludFRyYWNrKHNjcm9sbGJhclBhaW50ZXIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsYmFyLT5lbmFibGVk KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsdWUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0YXRpY19jYXN0PENHRmxvYXQ+KHNjcm9s bGJhci0+dmlzaWJsZVNpemUoKSkgLSBvdmVyaGFuZykgLyBzY3JvbGxiYXItPnRvdGFsU2l6ZSgp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGJhci0+ZnJhbWVS ZWN0KCkpOworICAgICAgICBDR0Zsb2F0IHRyYWNrQWxwaGEgPSB3a1Njcm9sbGJhclBhaW50ZXJU cmFja0FscGhhKHNjcm9sbGJhclBhaW50ZXIpOworICAgICAgICBpZiAodHJhY2tBbHBoYSA+PSAw LjApCisgICAgICAgICAgICBwYWludFRpY2ttYXJrcyhzY3JvbGxiYXIsIGNvbnRleHQsIGZhbHNl LCB0cmFja0FscGhhKTsKKyAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRLbm9iKHNjcm9s bGJhclBhaW50ZXIpOwogCiAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT5zZXRJc0RyYXdpbmdJbnRv TGF5ZXIoZmFsc2UpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTU0NCwxMyArNTQ5LDQwIEBA IGJvb2wgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxi YXIsIEdyYXBoaWNzQ29udGV4dCogY29uCiAjZW5kaWYKICAgICBISVRoZW1lRHJhd1RyYWNrKCZ0 cmFja0luZm8sIDAsIGNnQ29udGV4dCwga0hJVGhlbWVPcmllbnRhdGlvbk5vcm1hbCk7CiAKKyAg ICBwYWludFRpY2ttYXJrcyhzY3JvbGxiYXIsIGRyYXdpbmdDb250ZXh0LCBjYW5EcmF3RGlyZWN0 bHksIDEuMCk7CisKKyAgICBpZiAoaGFzVGh1bWIoc2Nyb2xsYmFyKSkgeworICAgICAgICBQbGF0 Zm9ybUJyaWRnZTo6VGhlbWVQYWludFNjcm9sbGJhckluZm8gc2Nyb2xsYmFySW5mbzsKKyAgICAg ICAgc2Nyb2xsYmFySW5mby5vcmllbnRhdGlvbiA9IHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9 PSBIb3Jpem9udGFsU2Nyb2xsYmFyID8gUGxhdGZvcm1CcmlkZ2U6OlNjcm9sbGJhck9yaWVudGF0 aW9uSG9yaXpvbnRhbCA6IFBsYXRmb3JtQnJpZGdlOjpTY3JvbGxiYXJPcmllbnRhdGlvblZlcnRp Y2FsOworICAgICAgICBzY3JvbGxiYXJJbmZvLnBhcmVudCA9IHNjcm9sbGJhci0+cGFyZW50KCkg JiYgc2Nyb2xsYmFyLT5wYXJlbnQoKS0+aXNGcmFtZVZpZXcoKSAmJiBzdGF0aWNfY2FzdDxGcmFt ZVZpZXcqPihzY3JvbGxiYXItPnBhcmVudCgpKS0+aXNTY3JvbGxWaWV3U2Nyb2xsYmFyKHNjcm9s bGJhcikgPyBQbGF0Zm9ybUJyaWRnZTo6U2Nyb2xsYmFyUGFyZW50U2Nyb2xsVmlldyA6IFBsYXRm b3JtQnJpZGdlOjpTY3JvbGxiYXJQYXJlbnRSZW5kZXJMYXllcjsKKyAgICAgICAgc2Nyb2xsYmFy SW5mby5tYXhWYWx1ZSA9IHNjcm9sbGJhci0+bWF4aW11bSgpOworICAgICAgICBzY3JvbGxiYXJJ bmZvLmN1cnJlbnRWYWx1ZSA9IHNjcm9sbGJhci0+Y3VycmVudFBvcygpOworICAgICAgICBzY3Jv bGxiYXJJbmZvLnZpc2libGVTaXplID0gc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgpOworICAgICAg ICBzY3JvbGxiYXJJbmZvLnRvdGFsU2l6ZSA9IHNjcm9sbGJhci0+dG90YWxTaXplKCk7CisKKyAg ICAgICAgUGxhdGZvcm1CcmlkZ2U6OnBhaW50U2Nyb2xsYmFyVGh1bWIoCisgICAgICAgICAgICBk cmF3aW5nQ29udGV4dCwKKyAgICAgICAgICAgIHNjcm9sbGJhclN0YXRlVG9UaGVtZVN0YXRlKHNj cm9sbGJhciksCisgICAgICAgICAgICBzY3JvbGxiYXItPmNvbnRyb2xTaXplKCkgPT0gUmVndWxh clNjcm9sbGJhciA/IFBsYXRmb3JtQnJpZGdlOjpTaXplUmVndWxhciA6IFBsYXRmb3JtQnJpZGdl OjpTaXplU21hbGwsCisgICAgICAgICAgICBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLAorICAgICAg ICAgICAgc2Nyb2xsYmFySW5mbyk7CisgICAgfQorCisgICAgaWYgKCFjYW5EcmF3RGlyZWN0bHkp CisgICAgICAgIGNvbnRleHQtPmRyYXdJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlci5nZXQoKSwgQ29s b3JTcGFjZURldmljZVJHQiwgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKS5sb2NhdGlvbigpKTsKKwor ICAgIHJldHVybiB0cnVlOworfQorCit2b2lkIFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBh aW50VGlja21hcmtzKFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGRyYXdp bmdDb250ZXh0LCBib29sIGNhbkRyYXdEaXJlY3RseSwgZmxvYXQgYWxwaGEpIHsKICAgICBWZWN0 b3I8SW50UmVjdD4gdGlja21hcmtzOwogICAgIHNjcm9sbGJhci0+c2Nyb2xsYWJsZUFyZWEoKS0+ Z2V0VGlja21hcmtzKHRpY2ttYXJrcyk7CiAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24o KSA9PSBWZXJ0aWNhbFNjcm9sbGJhciAmJiB0aWNrbWFya3Muc2l6ZSgpKSB7CiAgICAgICAgIGRy YXdpbmdDb250ZXh0LT5zYXZlKCk7CiAgICAgICAgIGRyYXdpbmdDb250ZXh0LT5zZXRTaG91bGRB bnRpYWxpYXMoZmFsc2UpOwotICAgICAgICBkcmF3aW5nQ29udGV4dC0+c2V0U3Ryb2tlQ29sb3Io Q29sb3IoMHhDQywgMHhBQSwgMHgwMCwgMHhGRiksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotICAg ICAgICBkcmF3aW5nQ29udGV4dC0+c2V0RmlsbENvbG9yKENvbG9yKDB4RkYsIDB4REQsIDB4MDAs IDB4RkYpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyAgICAgICAgaW50IGFscGhhSW50ID0gMHhG RiAqIGFscGhhOworICAgICAgICBkcmF3aW5nQ29udGV4dC0+c2V0U3Ryb2tlQ29sb3IoQ29sb3Io MHhDQywgMHhBQSwgMHgwMCwgYWxwaGFJbnQpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyAgICAg ICAgZHJhd2luZ0NvbnRleHQtPnNldEZpbGxDb2xvcihDb2xvcigweEZGLCAweERELCAweDAwLCBh bHBoYUludCksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwogCiAgICAgICAgIEludFJlY3QgdGh1bWJB cmVhID0gdHJhY2tSZWN0KHNjcm9sbGJhciwgZmFsc2UpOwogICAgICAgICBpZiAoIWNhbkRyYXdE aXJlY3RseSkgewpAQCAtNTc4LDI4ICs2MTAsNiBAQCBib29sIFNjcm9sbGJhclRoZW1lQ2hyb21p dW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGNvbgog CiAgICAgICAgIGRyYXdpbmdDb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgfQotCi0gICAgaWYgKGhh c1RodW1iKHNjcm9sbGJhcikpIHsKLSAgICAgICAgUGxhdGZvcm1CcmlkZ2U6OlRoZW1lUGFpbnRT Y3JvbGxiYXJJbmZvIHNjcm9sbGJhckluZm87Ci0gICAgICAgIHNjcm9sbGJhckluZm8ub3JpZW50 YXRpb24gPSBzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhciA/ IFBsYXRmb3JtQnJpZGdlOjpTY3JvbGxiYXJPcmllbnRhdGlvbkhvcml6b250YWwgOiBQbGF0Zm9y bUJyaWRnZTo6U2Nyb2xsYmFyT3JpZW50YXRpb25WZXJ0aWNhbDsKLSAgICAgICAgc2Nyb2xsYmFy SW5mby5wYXJlbnQgPSBzY3JvbGxiYXItPnBhcmVudCgpICYmIHNjcm9sbGJhci0+cGFyZW50KCkt PmlzRnJhbWVWaWV3KCkgJiYgc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4oc2Nyb2xsYmFyLT5wYXJl bnQoKSktPmlzU2Nyb2xsVmlld1Njcm9sbGJhcihzY3JvbGxiYXIpID8gUGxhdGZvcm1CcmlkZ2U6 OlNjcm9sbGJhclBhcmVudFNjcm9sbFZpZXcgOiBQbGF0Zm9ybUJyaWRnZTo6U2Nyb2xsYmFyUGFy ZW50UmVuZGVyTGF5ZXI7Ci0gICAgICAgIHNjcm9sbGJhckluZm8ubWF4VmFsdWUgPSBzY3JvbGxi YXItPm1heGltdW0oKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby5jdXJyZW50VmFsdWUgPSBzY3Jv bGxiYXItPmN1cnJlbnRQb3MoKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby52aXNpYmxlU2l6ZSA9 IHNjcm9sbGJhci0+dmlzaWJsZVNpemUoKTsKLSAgICAgICAgc2Nyb2xsYmFySW5mby50b3RhbFNp emUgPSBzY3JvbGxiYXItPnRvdGFsU2l6ZSgpOwotCi0gICAgICAgIFBsYXRmb3JtQnJpZGdlOjpw YWludFNjcm9sbGJhclRodW1iKAotICAgICAgICAgICAgZHJhd2luZ0NvbnRleHQsCi0gICAgICAg ICAgICBzY3JvbGxiYXJTdGF0ZVRvVGhlbWVTdGF0ZShzY3JvbGxiYXIpLAotICAgICAgICAgICAg c2Nyb2xsYmFyLT5jb250cm9sU2l6ZSgpID09IFJlZ3VsYXJTY3JvbGxiYXIgPyBQbGF0Zm9ybUJy aWRnZTo6U2l6ZVJlZ3VsYXIgOiBQbGF0Zm9ybUJyaWRnZTo6U2l6ZVNtYWxsLAotICAgICAgICAg ICAgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKSwKLSAgICAgICAgICAgIHNjcm9sbGJhckluZm8pOwot ICAgIH0KLQotICAgIGlmICghY2FuRHJhd0RpcmVjdGx5KQotICAgICAgICBjb250ZXh0LT5kcmF3 SW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXIuZ2V0KCksIENvbG9yU3BhY2VEZXZpY2VSR0IsIHNjcm9s bGJhci0+ZnJhbWVSZWN0KCkubG9jYXRpb24oKSk7Ci0KLSAgICByZXR1cm4gdHJ1ZTsKIH0KIAog fQo= 97886 2011-06-20 16:34:05 -0700 2011-06-20 18:22:19 -0700 Patch bug-62783-20110620163404.patch text/plain 10627 sail U3VidmVyc2lvbiBSZXZpc2lvbjogODg5NzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjY2VhMGQ0ZjIxMWFiNTJj NTNhMjJhYTQ4ZGU2Njc2NTNkZDA1MzU0Li41Y2ZiZGUxZDZiZGI5MThhNWI0ODg1ZTYwYTAxYTY4 OWI3NGYzOTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMTUgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gRHJhdyBzZWFyY2ggdGlja21hcmtz IG9uIG92ZXJsYXkgc2Nyb2xsYmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjI3ODMKKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIHNlYXJjaCB0 aWNrbWFyayBzdXBwb3J0IGZvciBvdmVybGF5IHNjcm9sbGJhcnMuIFRpY2ttYXJrcyBhcmUgb25s eSBkcmF3biB3aGVuIHRoZSBzY3JvbGwgdHJhY2sgaXMgdmlzaWJsZS4KKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5oOlNw bGl0IHRoZSBzY3JvbGxiYXIgZHJhd2luZyBjb2RlIGludG8gYSB0cmFjayBhbmQga25vYiB2ZXJz aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRp ZXNDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50KToKKyAg ICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50VHJhY2spOgorICAgICAgICAod2tTY3JvbGxi YXJQYWludGVyUGFpbnRLbm9iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJUaGVtZUNocm9taXVtTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bU1hYy5tbTpGYWN0b3Igb3V0IHRoZSBwYWludCB0aWNrbWFyayBjb2Rl IGFuZCBjYWxsIGl0IGZyb20gdGhlIG92ZXJsYXkgc2Nyb2xsYmFyIGRyYXdpbmcgY29kZS4KKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50VGlja21hcmtzKToK KwogMjAxMS0wNi0xNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJP dmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAppbmRleCAwNTdlMmY3YmNlMGYwZWU4NzkwZTNh NmE2ODM5ZTMwYTNhYmY3MmJjLi4yMWM5OWNhMjdmODE0ZDU4MzMxY2RmMWFlYzYxNTUzMjM2M2M4 YzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxi YXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMuaApAQCAt NTcsNiArNTcsOCBAQCBib29sIHdrU2Nyb2xsYmFyUGFpbnRlcklzSG9yaXpvbnRhbChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogQ0dGbG9hdCB3a1Njcm9sbGJhclBhaW50ZXJLbm9iQWxwaGEoV0tT Y3JvbGxiYXJQYWludGVyUmVmKTsKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyU2V0T3ZlcmxheVN0 YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiwgaW50IG92ZXJsYXlTY3JvbGxlclN0YXRlKTsKIHZv aWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmLCBib29sIGVu YWJsZWQsIGRvdWJsZSB2YWx1ZSwgQ0dGbG9hdCBwcm9wb3J0aW9uLCBOU1JlY3QgZnJhbWVSZWN0 KTsKK3ZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJS ZWYsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5TUmVj dCBmcmFtZVJlY3QpOwordm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludEtub2IoV0tTY3JvbGxi YXJQYWludGVyUmVmKTsKIGludCB3a1Njcm9sbGJhck1pbmltdW1UaHVtYkxlbmd0aChXS1Njcm9s bGJhclBhaW50ZXJSZWYpOwogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJTZXREZWxlZ2F0ZShXS1Nj cm9sbGJhclBhaW50ZXJSZWYsIGlkIHNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSk7CiBDR0Zsb2F0 IHdrU2Nyb2xsYmFyUGFpbnRlclRyYWNrQWxwaGEoV0tTY3JvbGxiYXJQYWludGVyUmVmKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJs YXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbQppbmRleCA4MTZhYjM5 ZmI4YTBiODhhZmZkMGRmNTA1YWE1NGM4OWUxY2RiMzk2Li42YzY4MjM0ZmE1YzY5ZGJhNmIzYmMz ZjQ1MDhkNjVjNDVjNDRhYzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21pdW1NYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyT3ZlcmxheVV0aWxpdGllc0No cm9taXVtTWFjLm1tCkBAIC0xNTcsNiArMTU3LDEyIEBAIHZvaWQgd2tTY3JvbGxiYXJQYWludGVy U2V0T3ZlcmxheVN0YXRlKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyLCBpbnQgb3Zlcmxh CiAKIHZvaWQgd2tTY3JvbGxiYXJQYWludGVyUGFpbnQoV0tTY3JvbGxiYXJQYWludGVyUmVmIHBh aW50ZXIsIGJvb2wgZW5hYmxlZCwgZG91YmxlIHZhbHVlLCBDR0Zsb2F0IHByb3BvcnRpb24sIE5T UmVjdCBmcmFtZVJlY3QpCiB7CisgICAgd2tTY3JvbGxiYXJQYWludGVyUGFpbnRUcmFjayhwYWlu dGVyLCBlbmFibGVkLCB2YWx1ZSwgcHJvcG9ydGlvbiwgZnJhbWVSZWN0KTsKKyAgICB3a1Njcm9s bGJhclBhaW50ZXJQYWludEtub2IocGFpbnRlcik7Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRUcmFjayhXS1Njcm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVk LCBkb3VibGUgdmFsdWUsIENHRmxvYXQgcHJvcG9ydGlvbiwgTlNSZWN0IGZyYW1lUmVjdCkKK3sK ICAgICBbcGFpbnRlciBzZXRFbmFibGVkOmVuYWJsZWRdOwogICAgIFtwYWludGVyIHNldEJvdW5k c1NpemU6ZnJhbWVSZWN0LnNpemVdOwogICAgIFtwYWludGVyIHNldERvdWJsZVZhbHVlOnZhbHVl XTsKQEAgLTE2OSw2ICsxNzUsMTAgQEAgdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJQYWludChXS1Nj cm9sbGJhclBhaW50ZXJSZWYgcGFpbnRlciwgYm9vbCBlbmFibGVkLCBkb3VibGUKICAgICBmcmFt ZVJlY3Qub3JpZ2luID0gTlNaZXJvUG9pbnQ7CiAKICAgICBbcGFpbnRlciBkcmF3S25vYlNsb3RJ blJlY3Q6ZnJhbWVSZWN0IGhpZ2hsaWdodDpOT107Cit9CisKK3ZvaWQgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRLbm9iKFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBwYWludGVyKQorewogICAgIFtwYWlu dGVyIGRyYXdLbm9iXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IDZmNjQ1ZThj ZmU5M2Q5NDA2NTFlYzIzMjY5NGFhOTg3M2NkNzVkZGYuLjYzMmUzNjkyMzM5OTFkYWVkMzRkNzNi NjQ5NDEwMTcxZGU4Y2Q4ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTcxLDYgKzcx LDggQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJPblRodW1iKFNj cm9sbGJhciosIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwogICAgIHZpcnR1YWwgYm9vbCBz aG91bGREcmFnRG9jdW1lbnRJbnN0ZWFkT2ZUaHVtYihTY3JvbGxiYXIqLCBjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmKTsKIAorICAgIHZpcnR1YWwgdm9pZCBwYWludFRpY2ttYXJrcyhHcmFwaGlj c0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0Jik7CisKIHB1YmxpYzoKICAgICB2 b2lkIHByZWZlcmVuY2VzQ2hhbmdlZCgpOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjLm1tCmlu ZGV4IDBmZDgzZGI2MzZkZWVhMTRhYWViNTA3MTcyYTg0MDM5Zjk2ZjkwNDkuLmQ1NTJmMmI4MDAy ZDQwMWMwZTFiYjdlZDcwMGZlYmQ0NTIwMDBjYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1NYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYy5t bQpAQCAtNDc5LDExICs0NzksMjAgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpw YWludChTY3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb24KICAgICAgICAg Y29udGV4dC0+Y2xpcChkYW1hZ2VSZWN0KTsKICAgICAgICAgY29udGV4dC0+dHJhbnNsYXRlKHNj cm9sbGJhci0+ZnJhbWVSZWN0KCkueCgpLCBzY3JvbGxiYXItPmZyYW1lUmVjdCgpLnkoKSk7CiAg ICAgICAgIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQoY29udGV4dCk7 Ci0gICAgICAgIHdrU2Nyb2xsYmFyUGFpbnRlclBhaW50KHNjcm9sbGJhck1hcCgpLT5nZXQoc2Ny b2xsYmFyKS5nZXQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsYmFy LT5lbmFibGVkKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RhdGljX2Nhc3Q8Q0dGbG9hdD4oc2Nyb2xs YmFyLT52aXNpYmxlU2l6ZSgpKSAtIG92ZXJoYW5nKSAvIHNjcm9sbGJhci0+dG90YWxTaXplKCks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGJhci0+ZnJhbWVSZWN0KCkp OworICAgICAgICBXS1Njcm9sbGJhclBhaW50ZXJSZWYgc2Nyb2xsYmFyUGFpbnRlciA9IHNjcm9s bGJhck1hcCgpLT5nZXQoc2Nyb2xsYmFyKS5nZXQoKTsKKyAgICAgICAgd2tTY3JvbGxiYXJQYWlu dGVyUGFpbnRUcmFjayhzY3JvbGxiYXJQYWludGVyLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNjcm9sbGJhci0+ZW5hYmxlZCgpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChzdGF0aWNfY2FzdDxDR0Zsb2F0PihzY3JvbGxiYXItPnZpc2libGVTaXplKCkpIC0gb3Zl cmhhbmcpIC8gc2Nyb2xsYmFyLT50b3RhbFNpemUoKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzY3JvbGxiYXItPmZyYW1lUmVjdCgpKTsKKworICAgICAgICBJbnRSZWN0 IHRpY2ttYXJrVHJhY2tSZWN0KEludFBvaW50KCksIHRyYWNrUmVjdChzY3JvbGxiYXIsIGZhbHNl KS5zaXplKCkpOworICAgICAgICAvLyBJbnNldCBieSAyIG9uIHRoZSBsZWZ0IGFuZCAzIG9uIHRo ZSByaWdodC4KKyAgICAgICAgdGlja21hcmtUcmFja1JlY3Quc2V0WCh0aWNrbWFya1RyYWNrUmVj dC54KCkgKyAyKTsKKyAgICAgICAgdGlja21hcmtUcmFja1JlY3Quc2V0V2lkdGgodGlja21hcmtU cmFja1JlY3Qud2lkdGgoKSAtIDMpOworICAgICAgICBwYWludFRpY2ttYXJrcyhjb250ZXh0LCBz Y3JvbGxiYXIsIHRpY2ttYXJrVHJhY2tSZWN0KTsKKworICAgICAgICB3a1Njcm9sbGJhclBhaW50 ZXJQYWludEtub2Ioc2Nyb2xsYmFyUGFpbnRlcik7CiAKICAgICAgICAgc2Nyb2xsQW5pbWF0b3It PnNldElzRHJhd2luZ0ludG9MYXllcihmYWxzZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAt NTQ0LDQwICs1NTMsMTcgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNocm9taXVtTWFjOjpwYWludChT Y3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb24KICNlbmRpZgogICAgIEhJ VGhlbWVEcmF3VHJhY2soJnRyYWNrSW5mbywgMCwgY2dDb250ZXh0LCBrSElUaGVtZU9yaWVudGF0 aW9uTm9ybWFsKTsKIAotICAgIFZlY3RvcjxJbnRSZWN0PiB0aWNrbWFya3M7Ci0gICAgc2Nyb2xs YmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5nZXRUaWNrbWFya3ModGlja21hcmtzKTsKLSAgICBpZiAo c2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Nyb2xsYmFyICYmIHRpY2ttYXJr cy5zaXplKCkpIHsKLSAgICAgICAgZHJhd2luZ0NvbnRleHQtPnNhdmUoKTsKLSAgICAgICAgZHJh d2luZ0NvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhmYWxzZSk7Ci0gICAgICAgIGRyYXdpbmdD b250ZXh0LT5zZXRTdHJva2VDb2xvcihDb2xvcigweENDLCAweEFBLCAweDAwLCAweEZGKSwgQ29s b3JTcGFjZURldmljZVJHQik7Ci0gICAgICAgIGRyYXdpbmdDb250ZXh0LT5zZXRGaWxsQ29sb3Io Q29sb3IoMHhGRiwgMHhERCwgMHgwMCwgMHhGRiksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotCi0g ICAgICAgIEludFJlY3QgdGh1bWJBcmVhID0gdHJhY2tSZWN0KHNjcm9sbGJhciwgZmFsc2UpOwot ICAgICAgICBpZiAoIWNhbkRyYXdEaXJlY3RseSkgewotICAgICAgICAgICAgdGh1bWJBcmVhLnNl dFgoMCk7Ci0gICAgICAgICAgICB0aHVtYkFyZWEuc2V0WSgwKTsKLSAgICAgICAgfQotICAgICAg ICAvLyBUaGUgZW5kcyBhcmUgcm91bmRlZCBhbmQgdGhlIHRodW1iIGRvZXNuJ3QgZ28gdGhlcmUu Ci0gICAgICAgIHRodW1iQXJlYS5pbmZsYXRlWSgtdGh1bWJBcmVhLndpZHRoKCkpOwotCi0gICAg ICAgIGZvciAoVmVjdG9yPEludFJlY3Q+Ojpjb25zdF9pdGVyYXRvciBpID0gdGlja21hcmtzLmJl Z2luKCk7IGkgIT0gdGlja21hcmtzLmVuZCgpOyArK2kpIHsKLSAgICAgICAgICAgIC8vIENhbGN1 bGF0ZSBob3cgZmFyIGRvd24gKGluICUpIHRoZSB0aWNrLW1hcmsgc2hvdWxkIGFwcGVhci4KLSAg ICAgICAgICAgIGNvbnN0IGZsb2F0IHBlcmNlbnQgPSBzdGF0aWNfY2FzdDxmbG9hdD4oaS0+eSgp KSAvIHNjcm9sbGJhci0+dG90YWxTaXplKCk7Ci0gICAgICAgICAgICBpZiAocGVyY2VudCA8IDAu MCB8fCBwZXJjZW50ID4gMS4wKQotICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAg ICAgLy8gQ2FsY3VsYXRlIGhvdyBmYXIgZG93biAoaW4gcGl4ZWxzKSB0aGUgdGljay1tYXJrIHNo b3VsZCBhcHBlYXIuCi0gICAgICAgICAgICBjb25zdCBpbnQgeVBvcyA9IHN0YXRpY19jYXN0PGlu dD4oKHRodW1iQXJlYS55KCkgKyAodGh1bWJBcmVhLmhlaWdodCgpICogcGVyY2VudCkpKSAmIH4x OwotCi0gICAgICAgICAgICAvLyBQYWludC4KLSAgICAgICAgICAgIGNvbnN0IGludCBpbmRlbnQg PSAyOwotICAgICAgICAgICAgRmxvYXRSZWN0IHRpY2tSZWN0KHRodW1iQXJlYS54KCkgKyBpbmRl bnQsIHlQb3MsIHRodW1iQXJlYS53aWR0aCgpIC0gMiAqIGluZGVudCAtIDEsIDIpOwotICAgICAg ICAgICAgZHJhd2luZ0NvbnRleHQtPmZpbGxSZWN0KHRpY2tSZWN0KTsKLSAgICAgICAgICAgIGRy YXdpbmdDb250ZXh0LT5zdHJva2VSZWN0KHRpY2tSZWN0LCAxKTsKLSAgICAgICAgfQotCi0gICAg ICAgIGRyYXdpbmdDb250ZXh0LT5yZXN0b3JlKCk7CisgICAgSW50UmVjdCB0aWNrbWFya1RyYWNr UmVjdCA9IHRyYWNrUmVjdChzY3JvbGxiYXIsIGZhbHNlKTsKKyAgICBpZiAoIWNhbkRyYXdEaXJl Y3RseSkgeworICAgICAgICB0aWNrbWFya1RyYWNrUmVjdC5zZXRYKDApOworICAgICAgICB0aWNr bWFya1RyYWNrUmVjdC5zZXRZKDApOwogICAgIH0KKyAgICAvLyBUaGUgZW5kcyBhcmUgcm91bmRl ZCBhbmQgdGhlIHRodW1iIGRvZXNuJ3QgZ28gdGhlcmUuCisgICAgdGlja21hcmtUcmFja1JlY3Qu aW5mbGF0ZVkoLXRpY2ttYXJrVHJhY2tSZWN0LndpZHRoKCkpOworICAgIC8vIEluc2V0IGJ5IDIg b24gdGhlIGxlZnQgYW5kIDMgb24gdGhlIHJpZ2h0LgorICAgIHRpY2ttYXJrVHJhY2tSZWN0LnNl dFgodGlja21hcmtUcmFja1JlY3QueCgpICsgMik7CisgICAgdGlja21hcmtUcmFja1JlY3Quc2V0 V2lkdGgodGlja21hcmtUcmFja1JlY3Qud2lkdGgoKSAtIDMpOworICAgIHBhaW50VGlja21hcmtz KGRyYXdpbmdDb250ZXh0LCBzY3JvbGxiYXIsIHRpY2ttYXJrVHJhY2tSZWN0KTsKIAogICAgIGlm IChoYXNUaHVtYihzY3JvbGxiYXIpKSB7CiAgICAgICAgIFBsYXRmb3JtQnJpZGdlOjpUaGVtZVBh aW50U2Nyb2xsYmFySW5mbyBzY3JvbGxiYXJJbmZvOwpAQCAtNjAyLDQgKzU4OCw0OSBAQCBib29s IFNjcm9sbGJhclRoZW1lQ2hyb21pdW1NYWM6OnBhaW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBH cmFwaGljc0NvbnRleHQqIGNvbgogICAgIHJldHVybiB0cnVlOwogfQogCit2b2lkIFNjcm9sbGJh clRoZW1lQ2hyb21pdW1NYWM6OnBhaW50VGlja21hcmtzKEdyYXBoaWNzQ29udGV4dCogY29udGV4 dCwgU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIGNvbnN0IEludFJlY3QmIHJlY3QpIHsKKyAgICBpZiAo c2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpICE9IFZlcnRpY2FsU2Nyb2xsYmFyKQorICAgICAgICBy ZXR1cm47CisKKyAgICBpZiAocmVjdC5oZWlnaHQoKSA8PSAwIHx8IHJlY3Qud2lkdGgoKSA8PSAw KQorICAgICAgICByZXR1cm47ICAvLyBub3RoaW5nIHRvIGRyYXcgb24uCisKKyAgICAvLyBHZXQg dGhlIHRpY2ttYXJrcyBmb3IgdGhlIGZyYW1ldmlldy4KKyAgICBWZWN0b3I8SW50UmVjdD4gdGlj a21hcmtzOworICAgIHNjcm9sbGJhci0+c2Nyb2xsYWJsZUFyZWEoKS0+Z2V0VGlja21hcmtzKHRp Y2ttYXJrcyk7CisgICAgaWYgKCF0aWNrbWFya3Muc2l6ZSgpKQorICAgICAgICByZXR1cm47CisK KyAgICBpbnQgYWxwaGFJbnQgPSAweEZGOworICAgIGlmIChzY3JvbGxiYXJNYXAoKS0+Y29udGFp bnMoc2Nyb2xsYmFyKSkgeworICAgICAgICBXS1Njcm9sbGJhclBhaW50ZXJSZWYgc2Nyb2xsYmFy UGFpbnRlciA9IHNjcm9sbGJhck1hcCgpLT5nZXQoc2Nyb2xsYmFyKS5nZXQoKTsKKyAgICAgICAg aWYgKHNjcm9sbGJhclBhaW50ZXIpCisgICAgICAgICAgICBhbHBoYUludCA9IDB4RkYgKiB3a1Nj cm9sbGJhclBhaW50ZXJUcmFja0FscGhhKHNjcm9sbGJhclBhaW50ZXIpOworICAgIH0KKyAgICBp ZiAoYWxwaGFJbnQgPT0gMCkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGV4dC0+c2F2ZSgp OworICAgIGNvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhmYWxzZSk7CisgICAgY29udGV4dC0+ c2V0U3Ryb2tlQ29sb3IoQ29sb3IoMHhDQywgMHhBQSwgMHgwMCwgYWxwaGFJbnQpLCBDb2xvclNw YWNlRGV2aWNlUkdCKTsKKyAgICBjb250ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3IoMHhGRiwgMHhE RCwgMHgwMCwgYWxwaGFJbnQpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKworICAgIGZvciAoVmVj dG9yPEludFJlY3Q+Ojpjb25zdF9pdGVyYXRvciBpID0gdGlja21hcmtzLmJlZ2luKCk7IGkgIT0g dGlja21hcmtzLmVuZCgpOyArK2kpIHsKKyAgICAgICAgLy8gQ2FsY3VsYXRlIGhvdyBmYXIgZG93 biAoaW4gJSkgdGhlIHRpY2stbWFyayBzaG91bGQgYXBwZWFyLgorICAgICAgICBjb25zdCBmbG9h dCBwZXJjZW50ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGktPnkoKSkgLyBzY3JvbGxiYXItPnRvdGFs U2l6ZSgpOworICAgICAgICBpZiAocGVyY2VudCA8IDAuMCB8fCBwZXJjZW50ID4gMS4wKQorICAg ICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgLy8gQ2FsY3VsYXRlIGhvdyBmYXIgZG93biAo aW4gcGl4ZWxzKSB0aGUgdGljay1tYXJrIHNob3VsZCBhcHBlYXIuCisgICAgICAgIGNvbnN0IGlu dCB5UG9zID0gcmVjdC55KCkgKyAocmVjdC5oZWlnaHQoKSAqIHBlcmNlbnQpOworCisgICAgICAg IC8vIFBhaW50LgorICAgICAgICBGbG9hdFJlY3QgdGlja1JlY3QocmVjdC54KCksIHlQb3MsIHJl Y3Qud2lkdGgoKSwgMik7CisgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KHRpY2tSZWN0KTsKKyAg ICAgICAgY29udGV4dC0+c3Ryb2tlUmVjdCh0aWNrUmVjdCwgMSk7CisgICAgfQorCisgICAgY29u dGV4dC0+cmVzdG9yZSgpOworfQorCiB9Cg==