34635 2010-02-05 01:44:01 -0800 [Qt] When QWebView has a different style set on it then the scrollbars are not rendered correctly 2011-05-25 07:28:06 -0700 1 1 1 Unclassified WebKit New Bugs 525.x (Safari 3.2) PC OS X 10.5 RESOLVED FIXED Qt, QtTriaged P3 Normal --- 1 qt-info menard ademar kent.hansen menard vestbo oldest_to_newest 188113 0 48211 qt-info 2010-02-05 01:44:01 -0800 Created attachment 48211 Fix for the problem When QWebView has a different style set on it then the scrollbars are not rendered correctly on the Mac, only the buttons are rendered but not the actual slider. This can reproduced with the demo Qt browser and running it with a style such as plastique. 198091 1 vestbo 2010-03-10 06:40:42 -0800 Please follow the QtWebKit bug reporting guidelines when reporting bugs. See http://trac.webkit.org/wiki/QtWebKitBugs Specifically: - The 'QtWebKit' component should only be used for bugs/features in the public QtWebKit API layer, not to signify that the bug is specific to the Qt port of WebKit http://trac.webkit.org/wiki/QtWebKitBugs#Component - Add the keyword 'Qt' to signal that it's a Qt-related bug http://trac.webkit.org/wiki/QtWebKitBugs#Keywords 408174 2 94467 menard 2011-05-23 12:54:29 -0700 Created attachment 94467 Patch 408179 3 menard 2011-05-23 12:57:44 -0700 *** Bug 35681 has been marked as a duplicate of this bug. *** 408906 4 94467 benjamin 2011-05-24 09:09:35 -0700 Comment on attachment 94467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94467&action=review > Source/WebCore/platform/qt/ScrollbarThemeQt.cpp:159 > + if (qobject_cast<QMacStyle *>(QApplication::style())) Application::style()? What if the widget has a different style than the default style? 408926 5 94628 menard 2011-05-24 09:38:05 -0700 Created attachment 94628 Patch 408976 6 94641 menard 2011-05-24 10:33:02 -0700 Created attachment 94641 Patch 409463 7 94641 tonikitoo 2011-05-24 21:58:11 -0700 Comment on attachment 94641 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94641&action=review > Source/WebCore/ChangeLog:9 > + two paths one for Mac and one for any other styles. The problem is that on Mac you can still run the needs a comma after "two paths" > Source/WebCore/platform/qt/ScrollbarThemeQt.cpp:161 > + if (qobject_cast<QMacStyle *>(style())) unneeded space. > Source/WebCore/platform/qt/ScrollbarThemeQt.cpp:170 > + // The QStyle expects the background to be already filled missing dot in the end. 409582 8 menard 2011-05-25 04:39:53 -0700 Committed r87290: <http://trac.webkit.org/changeset/87290> 409625 9 ademar 2011-05-25 07:28:06 -0700 Revision r87290 cherry-picked into qtwebkit-2.2 with commit 5087eaa <http://gitorious.org/webkit/qtwebkit/commit/5087eaa> 48211 2010-02-05 01:44:01 -0800 2011-05-23 12:54:19 -0700 Fix for the problem patch.diff text/plain 1485 qt-info LS0tIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRo ZW1lUXQuY3BwDQorKysgYi9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNvcmUvcGxhdGZvcm0vcXQv U2Nyb2xsYmFyVGhlbWVRdC5jcHANCkBAIC00MCw2ICs0MCw5IEBADQogI2luY2x1ZGUgPFFTdHls ZT4NCiAjaW5jbHVkZSA8UVN0eWxlT3B0aW9uU2xpZGVyPg0KICNpbmNsdWRlIDxRTWVudT4NCisj aWZkZWYgUV9XU19NQUMNCisjaW5jbHVkZSA8UU1hY1N0eWxlPg0KKyNlbmRpZg0KDQogbmFtZXNw YWNlIFdlYkNvcmUgew0KDQpAQCAtMTUwLDE4ICsxNTMsMjEgQEAgYm9vbCBTY3JvbGxiYXJUaGVt ZVF0OjpwYWludChTY3JvbGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBncmFwaGlj c0NvbnQNCiAgICAgcC5wYWludGVyLT5zZXRDbGlwUmVjdChvcHQtPnJlY3QuaW50ZXJzZWN0ZWQo ZGFtYWdlUmVjdCkpOw0KDQogI2lmZGVmIFFfV1NfTUFDDQotICAgIHAuZHJhd0NvbXBsZXhDb250 cm9sKFFTdHlsZTo6Q0NfU2Nyb2xsQmFyLCAqb3B0KTsNCi0jZWxzZQ0KLSAgICBjb25zdCBRUG9p bnQgdG9wTGVmdCA9IG9wdC0+cmVjdC50b3BMZWZ0KCk7DQotICAgIHAucGFpbnRlci0+dHJhbnNs YXRlKHRvcExlZnQpOw0KLSAgICBvcHQtPnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7DQorICAg IGlmIChxb2JqZWN0X2Nhc3Q8UU1hY1N0eWxlICo+KFFBcHBsaWNhdGlvbjo6c3R5bGUoKSkpDQor ICAgICAgICBwLmRyYXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkNDX1Njcm9sbEJhciwgKm9wdCk7 DQorICAgIGVsc2UNCisjZW5kaWYNCisgICAgew0KKyAgICAgICAgY29uc3QgUVBvaW50IHRvcExl ZnQgPSBvcHQtPnJlY3QudG9wTGVmdCgpOw0KKyAgICAgICAgcC5wYWludGVyLT50cmFuc2xhdGUo dG9wTGVmdCk7DQorICAgICAgICBvcHQtPnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7DQoNCi0g ICAgLy8gVGhlIFFTdHlsZSBleHBlY3RzIHRoZSBiYWNrZ3JvdW5kIHRvIGJlIGFscmVhZHkgZmls bGVkDQotICAgIHAucGFpbnRlci0+ZmlsbFJlY3Qob3B0LT5yZWN0LCBvcHQtPnBhbGV0dGUuYmFj a2dyb3VuZCgpKTsNCisgICAgICAgIC8vIFRoZSBRU3R5bGUgZXhwZWN0cyB0aGUgYmFja2dyb3Vu ZCB0byBiZSBhbHJlYWR5IGZpbGxlZA0KKyAgICAgICAgcC5wYWludGVyLT5maWxsUmVjdChvcHQt PnJlY3QsIG9wdC0+cGFsZXR0ZS5iYWNrZ3JvdW5kKCkpOw0KDQotICAgIHAuZHJhd0NvbXBsZXhD b250cm9sKFFTdHlsZTo6Q0NfU2Nyb2xsQmFyLCAqb3B0KTsNCi0gICAgb3B0LT5yZWN0Lm1vdmVU byh0b3BMZWZ0KTsNCi0jZW5kaWYNCisgICAgICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHls ZTo6Q0NfU2Nyb2xsQmFyLCAqb3B0KTsNCisgICAgICAgIG9wdC0+cmVjdC5tb3ZlVG8odG9wTGVm dCk7DQorICAgIH0NCiAgICAgcC5wYWludGVyLT5yZXN0b3JlKCk7DQoNCiAgICAgcmV0dXJuIHRy dWU7 94467 2011-05-23 12:54:29 -0700 2011-05-24 09:37:57 -0700 Patch bug-34635-20110523165426.patch text/plain 2633 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MDg5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMjMgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBXaGVuIFFXZWJWaWV3IGhhcyBhIGRp ZmZlcmVudCBzdHlsZSBzZXQgb24gaXQgdGhlbiB0aGUgc2Nyb2xsYmFycyBhcmUgbm90IHJlbmRl cmVkIGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzQ2MzUKKworICAgICAgICBNYWtlIHN1cmUgdGhlIHNjcm9sbGJhciBpcyBwcm9wZXJs eSByZW5kZXJlZCBvbiBNYWMgd2l0aCBhbm90aGVyIHN0eWxlIHRoYW4gdGhlIE1hYyBzdHlsZS4g VGhlIGNvZGUgaGFkCisgICAgICAgIHR3byBwYXRocyBvbmUgZm9yIE1hYyBhbmQgb25lIGZvciBh bnkgb3RoZXIgc3R5bGVzLiBUaGUgcHJvYmxlbSBpcyB0aGF0IG9uIE1hYyB5b3UgY2FuIHN0aWxs IHJ1biB0aGUKKyAgICAgICAgYXBwbGljYXRpb24gd2l0aCAtc3R5bGUgcGxhc3RpcXVlIGZvciBl eGFtcGxlLCB0aGVyZWZvcmUgdGhlIGNvZGUgdXNlZCBmb3Igb3RoZXIgc3R5bGVzIHNob3VsZCBh bHNvIGJlCisgICAgICAgIHVzZWQgd2hlbmV2ZXIgdGhlIGN1cnJlbnQgc3R5bGUgaXMgbm90IHRo ZSBNYWMgc3R5bGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lUXQ6OnBhaW50KToKKwogMjAxMS0w NS0yMyAgUnViZW4gIDxjaHJvbWl1bUBoeWJyaWRzb3VyY2Uub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFRvbnkgQ2hhbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3Jv bGxiYXJUaGVtZVF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9x dC9TY3JvbGxiYXJUaGVtZVF0LmNwcAkocmV2aXNpb24gODcwODkpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUs NyArMzUsOSBAQAogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgogCiAjaW5jbHVkZSA8UUFwcGxpY2F0 aW9uPgotI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpZmRlZiBRX1dTX01BQworI2luY2x1ZGUgPFFNYWNT dHlsZT4KKyNlbmRpZgogI2luY2x1ZGUgPFFNZW51PgogI2luY2x1ZGUgPFFQYWludGVyPgogI2lu Y2x1ZGUgPFFTdHlsZT4KQEAgLTE1NCwxOCArMTU2LDIxIEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVR dDo6cGFpbnQoU2Nyb2xsYmFyKiAKICAgICBwLnBhaW50ZXItPnNldENsaXBSZWN0KG9wdC0+cmVj dC5pbnRlcnNlY3RlZChkYW1hZ2VSZWN0KSwgUXQ6OkludGVyc2VjdENsaXApOwogCiAjaWZkZWYg UV9XU19NQUMKLSAgICBwLmRyYXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkNDX1Njcm9sbEJhciwg Km9wdCk7Ci0jZWxzZQotICAgIGNvbnN0IFFQb2ludCB0b3BMZWZ0ID0gb3B0LT5yZWN0LnRvcExl ZnQoKTsKLSAgICBwLnBhaW50ZXItPnRyYW5zbGF0ZSh0b3BMZWZ0KTsKLSAgICBvcHQtPnJlY3Qu bW92ZVRvKFFQb2ludCgwLCAwKSk7CisgICAgaWYgKHFvYmplY3RfY2FzdDxRTWFjU3R5bGUgKj4o UUFwcGxpY2F0aW9uOjpzdHlsZSgpKSkKKyAgICAgICAgcC5kcmF3Q29tcGxleENvbnRyb2woUVN0 eWxlOjpDQ19TY3JvbGxCYXIsICpvcHQpOworICAgIGVsc2UKKyNlbmRpZgorICAgIHsKKyAgICAg ICAgY29uc3QgUVBvaW50IHRvcExlZnQgPSBvcHQtPnJlY3QudG9wTGVmdCgpOworICAgICAgICBw LnBhaW50ZXItPnRyYW5zbGF0ZSh0b3BMZWZ0KTsKKyAgICAgICAgb3B0LT5yZWN0Lm1vdmVUbyhR UG9pbnQoMCwgMCkpOwogCi0gICAgLy8gVGhlIFFTdHlsZSBleHBlY3RzIHRoZSBiYWNrZ3JvdW5k IHRvIGJlIGFscmVhZHkgZmlsbGVkCi0gICAgcC5wYWludGVyLT5maWxsUmVjdChvcHQtPnJlY3Qs IG9wdC0+cGFsZXR0ZS5iYWNrZ3JvdW5kKCkpOworICAgICAgICAvLyBUaGUgUVN0eWxlIGV4cGVj dHMgdGhlIGJhY2tncm91bmQgdG8gYmUgYWxyZWFkeSBmaWxsZWQKKyAgICAgICAgcC5wYWludGVy LT5maWxsUmVjdChvcHQtPnJlY3QsIG9wdC0+cGFsZXR0ZS5iYWNrZ3JvdW5kKCkpOwogCi0gICAg cC5kcmF3Q29tcGxleENvbnRyb2woUVN0eWxlOjpDQ19TY3JvbGxCYXIsICpvcHQpOwotICAgIG9w dC0+cmVjdC5tb3ZlVG8odG9wTGVmdCk7Ci0jZW5kaWYKKyAgICAgICAgcC5kcmF3Q29tcGxleENv bnRyb2woUVN0eWxlOjpDQ19TY3JvbGxCYXIsICpvcHQpOworICAgICAgICBvcHQtPnJlY3QubW92 ZVRvKHRvcExlZnQpOworICAgIH0KICAgICBwLnBhaW50ZXItPnJlc3RvcmUoKTsKIAogICAgIHJl dHVybiB0cnVlOwo= 94628 2011-05-24 09:38:05 -0700 2011-05-24 10:32:53 -0700 Patch bug-34635-20110524133803.patch text/plain 2781 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MTYwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMjQgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBXaGVuIFFXZWJWaWV3IGhhcyBhIGRp ZmZlcmVudCBzdHlsZSBzZXQgb24gaXQgdGhlbiB0aGUgc2Nyb2xsYmFycyBhcmUgbm90IHJlbmRl cmVkIGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzQ2MzUKKworICAgICAgICBNYWtlIHN1cmUgdGhlIHNjcm9sbGJhciBpcyBwcm9wZXJs eSByZW5kZXJlZCBvbiBNYWMgd2l0aCBhbm90aGVyIHN0eWxlIHRoYW4gdGhlIE1hYyBzdHlsZS4g VGhlIGNvZGUgaGFkCisgICAgICAgIHR3byBwYXRocyBvbmUgZm9yIE1hYyBhbmQgb25lIGZvciBh bnkgb3RoZXIgc3R5bGVzLiBUaGUgcHJvYmxlbSBpcyB0aGF0IG9uIE1hYyB5b3UgY2FuIHN0aWxs IHJ1biB0aGUKKyAgICAgICAgYXBwbGljYXRpb24gd2l0aCAtc3R5bGUgcGxhc3RpcXVlIGZvciBl eGFtcGxlLCB0aGVyZWZvcmUgdGhlIGNvZGUgdXNlZCBmb3Igb3RoZXIgc3R5bGVzIHNob3VsZCBh bHNvIGJlCisgICAgICAgIHVzZWQgd2hlbmV2ZXIgdGhlIGN1cnJlbnQgc3R5bGUgaXMgbm90IHRo ZSBNYWMgc3R5bGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lUXQ6OnBhaW50KToKKwogMjAxMS0w NS0yNCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAg ICBOb3QgcmV2aWV3ZWQsIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCShyZXZpc2lvbiA4NzE2MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNSw3ICszNSw5IEBACiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAKICNpbmNsdWRlIDxR QXBwbGljYXRpb24+Ci0jaW5jbHVkZSA8UURlYnVnPgorI2lmZGVmIFFfV1NfTUFDCisjaW5jbHVk ZSA8UU1hY1N0eWxlPgorI2VuZGlmCiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8UVBhaW50 ZXI+CiAjaW5jbHVkZSA8UVN0eWxlPgpAQCAtMTU0LDE4ICsxNTYsMjMgQEAgYm9vbCBTY3JvbGxi YXJUaGVtZVF0OjpwYWludChTY3JvbGxiYXIqIAogICAgIHAucGFpbnRlci0+c2V0Q2xpcFJlY3Qo b3B0LT5yZWN0LmludGVyc2VjdGVkKGRhbWFnZVJlY3QpLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CiAK ICNpZmRlZiBRX1dTX01BQwotICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2Ny b2xsQmFyLCAqb3B0KTsKLSNlbHNlCi0gICAgY29uc3QgUVBvaW50IHRvcExlZnQgPSBvcHQtPnJl Y3QudG9wTGVmdCgpOwotICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKHRvcExlZnQpOwotICAgIG9w dC0+cmVjdC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKKyAgICAvLyBGSVhNRTogV2UgYWxzbyBuZWVk IHRvIGNoZWNrIHRoZSB3aWRnZXQgc3R5bGUgYnV0IHRvZGF5IFNjcm9sbGJhclRoZW1lIGlzIG5v dCBhd2FyZSBvZiB0aGUgcGFnZSBzbyB3ZQorICAgIC8vIGNhbid0IGdldCB0aGUgd2lkZ2V0Lgor ICAgIGlmIChxb2JqZWN0X2Nhc3Q8UU1hY1N0eWxlICo+KFFBcHBsaWNhdGlvbjo6c3R5bGUoKSkp CisgICAgICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2Nyb2xsQmFyLCAqb3B0 KTsKKyAgICBlbHNlCisjZW5kaWYKKyAgICB7CisgICAgICAgIGNvbnN0IFFQb2ludCB0b3BMZWZ0 ID0gb3B0LT5yZWN0LnRvcExlZnQoKTsKKyAgICAgICAgcC5wYWludGVyLT50cmFuc2xhdGUodG9w TGVmdCk7CisgICAgICAgIG9wdC0+cmVjdC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKIAotICAgIC8v IFRoZSBRU3R5bGUgZXhwZWN0cyB0aGUgYmFja2dyb3VuZCB0byBiZSBhbHJlYWR5IGZpbGxlZAot ICAgIHAucGFpbnRlci0+ZmlsbFJlY3Qob3B0LT5yZWN0LCBvcHQtPnBhbGV0dGUuYmFja2dyb3Vu ZCgpKTsKKyAgICAgICAgLy8gVGhlIFFTdHlsZSBleHBlY3RzIHRoZSBiYWNrZ3JvdW5kIHRvIGJl IGFscmVhZHkgZmlsbGVkCisgICAgICAgIHAucGFpbnRlci0+ZmlsbFJlY3Qob3B0LT5yZWN0LCBv cHQtPnBhbGV0dGUuYmFja2dyb3VuZCgpKTsKIAotICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFT dHlsZTo6Q0NfU2Nyb2xsQmFyLCAqb3B0KTsKLSAgICBvcHQtPnJlY3QubW92ZVRvKHRvcExlZnQp OwotI2VuZGlmCisgICAgICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2Nyb2xs QmFyLCAqb3B0KTsKKyAgICAgICAgb3B0LT5yZWN0Lm1vdmVUbyh0b3BMZWZ0KTsKKyAgICB9CiAg ICAgcC5wYWludGVyLT5yZXN0b3JlKCk7CiAKICAgICByZXR1cm4gdHJ1ZTsK 94641 2011-05-24 10:33:02 -0700 2011-05-24 21:58:11 -0700 Patch bug-34635-20110524143259.patch text/plain 2767 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MTYwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMjQgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBXaGVuIFFXZWJWaWV3IGhhcyBhIGRp ZmZlcmVudCBzdHlsZSBzZXQgb24gaXQgdGhlbiB0aGUgc2Nyb2xsYmFycyBhcmUgbm90IHJlbmRl cmVkIGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzQ2MzUKKworICAgICAgICBNYWtlIHN1cmUgdGhlIHNjcm9sbGJhciBpcyBwcm9wZXJs eSByZW5kZXJlZCBvbiBNYWMgd2l0aCBhbm90aGVyIHN0eWxlIHRoYW4gdGhlIE1hYyBzdHlsZS4g VGhlIGNvZGUgaGFkCisgICAgICAgIHR3byBwYXRocyBvbmUgZm9yIE1hYyBhbmQgb25lIGZvciBh bnkgb3RoZXIgc3R5bGVzLiBUaGUgcHJvYmxlbSBpcyB0aGF0IG9uIE1hYyB5b3UgY2FuIHN0aWxs IHJ1biB0aGUKKyAgICAgICAgYXBwbGljYXRpb24gd2l0aCAtc3R5bGUgcGxhc3RpcXVlIGZvciBl eGFtcGxlLCB0aGVyZWZvcmUgdGhlIGNvZGUgdXNlZCBmb3Igb3RoZXIgc3R5bGVzIHNob3VsZCBh bHNvIGJlCisgICAgICAgIHVzZWQgd2hlbmV2ZXIgdGhlIGN1cnJlbnQgc3R5bGUgaXMgbm90IHRo ZSBNYWMgc3R5bGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JvbGxiYXJUaGVtZVF0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lUXQ6OnBhaW50KToKKwogMjAxMS0w NS0yNCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAg ICBOb3QgcmV2aWV3ZWQsIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCShyZXZpc2lvbiA4NzE2MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9sbGJhclRoZW1lUXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNSw3ICszNSw5IEBACiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAKICNpbmNsdWRlIDxR QXBwbGljYXRpb24+Ci0jaW5jbHVkZSA8UURlYnVnPgorI2lmZGVmIFFfV1NfTUFDCisjaW5jbHVk ZSA8UU1hY1N0eWxlPgorI2VuZGlmCiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8UVBhaW50 ZXI+CiAjaW5jbHVkZSA8UVN0eWxlPgpAQCAtMTU0LDE4ICsxNTYsMjMgQEAgYm9vbCBTY3JvbGxi YXJUaGVtZVF0OjpwYWludChTY3JvbGxiYXIqIAogICAgIHAucGFpbnRlci0+c2V0Q2xpcFJlY3Qo b3B0LT5yZWN0LmludGVyc2VjdGVkKGRhbWFnZVJlY3QpLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CiAK ICNpZmRlZiBRX1dTX01BQwotICAgIHAuZHJhd0NvbXBsZXhDb250cm9sKFFTdHlsZTo6Q0NfU2Ny b2xsQmFyLCAqb3B0KTsKLSNlbHNlCi0gICAgY29uc3QgUVBvaW50IHRvcExlZnQgPSBvcHQtPnJl Y3QudG9wTGVmdCgpOwotICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKHRvcExlZnQpOwotICAgIG9w dC0+cmVjdC5tb3ZlVG8oUVBvaW50KDAsIDApKTsKKyAgICAvLyBGSVhNRTogV2UgYWxzbyBuZWVk IHRvIGNoZWNrIHRoZSB3aWRnZXQgc3R5bGUgYnV0IHRvZGF5IFNjcm9sbGJhclRoZW1lIGlzIG5v dCBhd2FyZSBvZiB0aGUgcGFnZSBzbyB3ZQorICAgIC8vIGNhbid0IGdldCB0aGUgd2lkZ2V0Lgor ICAgIGlmIChxb2JqZWN0X2Nhc3Q8UU1hY1N0eWxlICo+KHN0eWxlKCkpKQorICAgICAgICBwLmRy YXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkNDX1Njcm9sbEJhciwgKm9wdCk7CisgICAgZWxzZQor I2VuZGlmCisgICAgeworICAgICAgICBjb25zdCBRUG9pbnQgdG9wTGVmdCA9IG9wdC0+cmVjdC50 b3BMZWZ0KCk7CisgICAgICAgIHAucGFpbnRlci0+dHJhbnNsYXRlKHRvcExlZnQpOworICAgICAg ICBvcHQtPnJlY3QubW92ZVRvKFFQb2ludCgwLCAwKSk7CiAKLSAgICAvLyBUaGUgUVN0eWxlIGV4 cGVjdHMgdGhlIGJhY2tncm91bmQgdG8gYmUgYWxyZWFkeSBmaWxsZWQKLSAgICBwLnBhaW50ZXIt PmZpbGxSZWN0KG9wdC0+cmVjdCwgb3B0LT5wYWxldHRlLmJhY2tncm91bmQoKSk7CisgICAgICAg IC8vIFRoZSBRU3R5bGUgZXhwZWN0cyB0aGUgYmFja2dyb3VuZCB0byBiZSBhbHJlYWR5IGZpbGxl ZAorICAgICAgICBwLnBhaW50ZXItPmZpbGxSZWN0KG9wdC0+cmVjdCwgb3B0LT5wYWxldHRlLmJh Y2tncm91bmQoKSk7CiAKLSAgICBwLmRyYXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkNDX1Njcm9s bEJhciwgKm9wdCk7Ci0gICAgb3B0LT5yZWN0Lm1vdmVUbyh0b3BMZWZ0KTsKLSNlbmRpZgorICAg ICAgICBwLmRyYXdDb21wbGV4Q29udHJvbChRU3R5bGU6OkNDX1Njcm9sbEJhciwgKm9wdCk7Cisg ICAgICAgIG9wdC0+cmVjdC5tb3ZlVG8odG9wTGVmdCk7CisgICAgfQogICAgIHAucGFpbnRlci0+ cmVzdG9yZSgpOwogCiAgICAgcmV0dXJuIHRydWU7Cg==