72262 2011-11-14 05:41:33 -0800 [Qt] Clean up the remaining duplicate code after the RenderThemeQt refactoring. 2011-11-15 05:43:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pierre.rossi pierre.rossi hausmann webkit.review.bot oldest_to_newest 501824 0 pierre.rossi 2011-11-14 05:41:33 -0800 [Qt] Clean up the remaining duplicate code after the RenderThemeQt refactoring. 501828 1 114924 pierre.rossi 2011-11-14 05:44:57 -0800 Created attachment 114924 Patch 501859 2 114932 pierre.rossi 2011-11-14 06:23:19 -0800 Created attachment 114932 Patch 502796 3 114932 webkit.review.bot 2011-11-15 04:16:29 -0800 Comment on attachment 114932 Patch Rejecting attachment 114932 from commit-queue. pierre.rossi@gmail.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 502836 4 114932 webkit.review.bot 2011-11-15 05:43:51 -0800 Comment on attachment 114932 Patch Clearing flags on attachment: 114932 Committed r100270: <http://trac.webkit.org/changeset/100270> 502837 5 webkit.review.bot 2011-11-15 05:43:55 -0800 All reviewed patches have been landed. Closing bug. 114924 2011-11-14 05:44:57 -0800 2011-11-14 06:23:12 -0800 Patch bug-72262-20111114144625.patch text/plain 7355 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzcyMjIzMzcxZWIxZWQ3 ZDY1NzE1YmU0MDEzNjdjZTk3YTMxMjY1Yy4uZjc3NmQ0YjU3NTg4NDk0ZmU4MGEzNmU5NmQ1NjEw Zjg0Mzg5Njk2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTExLTE0ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF0gQ2xlYW4g dXAgdGhlIHJlbWFpbmluZyBkdXBsaWNhdGUgY29kZSBhZnRlciB0aGUgUmVuZGVyVGhlbWVRdCBy ZWZhY3RvcmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyMjYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIG5lZWRlZCwgdGhpcyBpcyBwdXJlbHkgY29zbWV0aWMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZVFTdHlsZTo6YWRqdXN0TWVudUxpc3RCdXR0b25TdHlsZSk6CisgICAgICAg ICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC9SZW5kZXJUaGVtZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OmFk anVzdE1lbnVMaXN0QnV0dG9uU3R5bGUpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1JlbmRlclRo ZW1lUXRNb2JpbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRdE1vYmlsZTo6 YWRqdXN0TWVudUxpc3RTdHlsZSk6CisKIDIwMTEtMTEtMTQgIFRvciBBcm5lIFZlc3Riw7ggIDx0 b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gVW5icmVhayB0aGUgYnVp bGQgb24gTWFjIE9TIFgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Jl bmRlclRoZW1lUVN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRo ZW1lUVN0eWxlLmNwcAppbmRleCBkZDA5ZTIwN2M2ZWQ1NmNkNmE5N2FhMDRiN2Y2MWQ0MTZiZjgx ZGM0Li4xMmUyNWM3M2MxYjdlYjdjYTgyMThkOTEwNGNjYTYwZWUyOWM5MDNlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwCkBAIC0zODIs MTkgKzM4Miw2IEBAIGJvb2wgUmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50QnV0dG9uKFJlbmRlck9i amVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBpLCBjb25zdCBJCiAgICAgcmV0dXJuIGZhbHNlOwog fQogCi12b2lkIFJlbmRlclRoZW1lUVN0eWxlOjphZGp1c3RUZXh0RmllbGRTdHlsZShDU1NTdHls ZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3QKLXsKLSAgICAv LyBSZXNldHRpbmcgdGhlIHN0eWxlIGxpa2UgdGhpcyBsZWFkcyB0byBkaWZmZXJlbmNlcyBsaWtl OgotICAgIC8vIC0gUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSBhdCAoMiwyKSBzaXplIDE2OHgy NSBbYmdjb2xvcj0jRkZGRkZGXSBib3JkZXI6ICgycHggaW5zZXQgIzAwMDAwMCldCi0gICAgLy8g KyBSZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9IGF0ICgyLDIpIHNpemUgMTY2eDI2Ci0gICAgLy8g aW4gbGF5b3V0IHRlc3RzIHdoZW4gYSBDU1Mgc3R5bGUgaXMgYXBwbGllZCB0aGF0IGRvZXNuJ3Qg YWZmZWN0IGJhY2tncm91bmQgY29sb3IsIGJvcmRlciBvcgotICAgIC8vIHBhZGRpbmcuIEp1c3Qg d29ydGgga2VlcGluZyBpbiBtaW5kIQotICAgIHN0eWxlLT5zZXRCYWNrZ3JvdW5kQ29sb3IoQ29s b3I6OnRyYW5zcGFyZW50KTsKLSAgICBzdHlsZS0+cmVzZXRCb3JkZXIoKTsKLSAgICBzdHlsZS0+ cmVzZXRQYWRkaW5nKCk7Ci0gICAgY29tcHV0ZVNpemVCYXNlZE9uU3R5bGUoc3R5bGUpOwotfQot CiBib29sIFJlbmRlclRoZW1lUVN0eWxlOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIG8s IGNvbnN0IFBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcikKIHsKICAgICBTdHlsZVBhaW50 ZXJRU3R5bGUgcCh0aGlzLCBpKTsKQEAgLTQ3NywyMiArNDY0LDEzIEBAIGJvb2wgUmVuZGVyVGhl bWVRU3R5bGU6OnBhaW50TWVudUxpc3QoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8m IGksIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlbmRlclRoZW1lUVN0eWxl OjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHls ZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdAordm9pZCBSZW5kZXJUaGVtZVFTdHlsZTo6YWRqdXN0 TWVudUxpc3RCdXR0b25TdHlsZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgUmVuZGVyU3R5 bGUqIHN0eWxlLCBFbGVtZW50KiBlKSBjb25zdAogewogICAgIC8vIFdPUktBUk9VTkQgYmVjYXVz ZSBodG1sLmNzcyBzcGVjaWZpZXMgLXdlYmtpdC1ib3JkZXItcmFkaXVzIGZvciA8c2VsZWN0PiBz byB3ZSBvdmVycmlkZSBpdCBoZXJlCiAgICAgLy8gc2VlIGFsc28gaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTkKICAgICBzdHlsZS0+cmVzZXRCb3JkZXJSYWRpdXMo KTsKIAotICAgIC8vIEhlaWdodCBpcyBsb2NrZWQgdG8gYXV0by4KLSAgICBzdHlsZS0+c2V0SGVp Z2h0KExlbmd0aChBdXRvKSk7Ci0KLSAgICAvLyBXaGl0ZS1zcGFjZSBpcyBsb2NrZWQgdG8gcHJl Ci0gICAgc3R5bGUtPnNldFdoaXRlU3BhY2UoUFJFKTsKLQotICAgIGNvbXB1dGVTaXplQmFzZWRP blN0eWxlKHN0eWxlKTsKLQotICAgIC8vIEFkZCBpbiB0aGUgcGFkZGluZyB0aGF0IHdlJ2QgbGlr ZSB0byB1c2UuCi0gICAgc2V0UG9wdXBQYWRkaW5nKHN0eWxlKTsKKyAgICBSZW5kZXJUaGVtZVF0 OjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxlKHNlbGVjdG9yLCBzdHlsZSwgZSk7CiB9CiAKIGJv b2wgUmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50TWVudUxpc3RCdXR0b24oUmVuZGVyT2JqZWN0KiBv LCBjb25zdCBQYWludEluZm8mIGksCkBAIC02NDAsMjAgKzYxOCw2IEBAIGJvb2wgUmVuZGVyVGhl bWVRU3R5bGU6OnBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludElu Zm8mIHBpLAogICAgIHJldHVybiBwYWludFRleHRGaWVsZChvLCBwaSwgcik7CiB9CiAKLXZvaWQg UmVuZGVyVGhlbWVRU3R5bGU6OmFkanVzdFNlYXJjaEZpZWxkU3R5bGUoQ1NTU3R5bGVTZWxlY3Rv ciogc2VsZWN0b3IsIFJlbmRlclN0eWxlKiBzdHlsZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBFbGVtZW50KiBlKSBjb25zdAotewotICAgIC8vIFJlc2V0dGlu ZyB0aGUgc3R5bGUgbGlrZSB0aGlzIGxlYWRzIHRvIGRpZmZlcmVuY2VzIGxpa2U6Ci0gICAgLy8g LSBSZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9IGF0ICgyLDIpIHNpemUgMTY4eDI1IFtiZ2NvbG9y PSNGRkZGRkZdIGJvcmRlcjogKDJweCBpbnNldCAjMDAwMDAwKV0KLSAgICAvLyArIFJlbmRlclRl eHRDb250cm9sIHtJTlBVVH0gYXQgKDIsMikgc2l6ZSAxNjZ4MjYKLSAgICAvLyBpbiBsYXlvdXQg dGVzdHMgd2hlbiBhIENTUyBzdHlsZSBpcyBhcHBsaWVkIHRoYXQgZG9lc24ndCBhZmZlY3QgYmFj a2dyb3VuZCBjb2xvciwgYm9yZGVyIG9yCi0gICAgLy8gcGFkZGluZy4gSnVzdCB3b3J0aCBrZWVw aW5nIGluIG1pbmQhCi0gICAgc3R5bGUtPnNldEJhY2tncm91bmRDb2xvcihDb2xvcjo6dHJhbnNw YXJlbnQpOwotICAgIHN0eWxlLT5yZXNldEJvcmRlcigpOwotICAgIHN0eWxlLT5yZXNldFBhZGRp bmcoKTsKLSAgICBjb21wdXRlU2l6ZUJhc2VkT25TdHlsZShzdHlsZSk7Ci19Ci0KIHZvaWQgUmVu ZGVyVGhlbWVRU3R5bGU6OmFkanVzdFNlYXJjaEZpZWxkRGVjb3JhdGlvblN0eWxlKENTU1N0eWxl U2VsZWN0b3IqIHNlbGVjdG9yLCBSZW5kZXJTdHlsZSogc3R5bGUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVsZW1lbnQqIGUpIGNvbnN0CiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHls ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuaAppbmRl eCA1NzQ3ZmU0N2VkZGQ0MmNjOTRiNjlmOGYzOWFkYmRiNWNkMTQ0Mzk5Li5mYTQzNjIxYmZmMTAy ZjBkYTZlYWE1MWQzOTMzNmU5YTAyMmU4YmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3F0L1JlbmRlclRoZW1lUVN0eWxlLmgKQEAgLTU1LDcgKzU1LDYgQEAgcHJvdGVjdGVkOgog ICAgIHZpcnR1YWwgYm9vbCBwYWludEJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludElu Zm8mLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRUZXh0RmllbGQo UmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwotICAgIHZp cnR1YWwgdm9pZCBhZGp1c3RUZXh0RmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVy U3R5bGUqLCBFbGVtZW50KikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRUZXh0QXJl YShSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAgICAg dmlydHVhbCB2b2lkIGFkanVzdFRleHRBcmVhU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRl clN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwpAQCAtNzgsNyArNzcsNiBAQCBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU3R5bGUoQ1NTU3R5bGVTZWxlY3Rvcios IFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIHBhaW50 U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVj dCYpOwotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTZWFyY2hGaWVsZFN0eWxlKENTU1N0eWxlU2Vs ZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQqKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9p ZCBhZGp1c3RTZWFyY2hGaWVsZERlY29yYXRpb25TdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVu ZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNo RmllbGREZWNvcmF0aW9uKFJlbmRlck9iamVjdCosIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IElu dFJlY3QmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRo ZW1lUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAK aW5kZXggMjQ4NGRhMDA1OGYzZGQzOGNiZWMwMWNiODEwODU1ZGRhNmJkYjNiNS4uYjY1ZGUzMzcy Mzk3MGM3YjQ0ZTEyZTMwYWNjNzdiYzNjMDM2MDZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKQEAgLTMzMiwxMCArMzMyLDYgQEAgdm9pZCBSZW5k ZXJUaGVtZVF0OjphZGp1c3RNZW51TGlzdFN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJT dHlsZSogc3R5bGUsIEUKIAogdm9pZCBSZW5kZXJUaGVtZVF0OjphZGp1c3RNZW51TGlzdEJ1dHRv blN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBj b25zdAogewotICAgIC8vIFdPUktBUk9VTkQgYmVjYXVzZSBodG1sLmNzcyBzcGVjaWZpZXMgLXdl YmtpdC1ib3JkZXItcmFkaXVzIGZvciA8c2VsZWN0PiBzbyB3ZSBvdmVycmlkZSBpdCBoZXJlCi0g ICAgLy8gc2VlIGFsc28gaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgz OTkKLSAgICBzdHlsZS0+cmVzZXRCb3JkZXJSYWRpdXMoKTsKLQogICAgIC8vIEhlaWdodCBpcyBs b2NrZWQgdG8gYXV0by4KICAgICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChBdXRvKSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXRNb2JpbGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdE1vYmlsZS5jcHAK aW5kZXggMjlkYWFjYTRmYzhjZTk5N2ZmZGZlODFlOGM4MmZjMzhmMTkzNWM5Yi4uZGVmNWY1YmI5 NjAwODMxZDhlZTZmMTEyOGQ1ZTFlYWJmY2RhY2E5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdE1vYmlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdE1vYmlsZS5jcHAKQEAgLTU1MywyMCArNTUzLDkg QEAgYm9vbCBSZW5kZXJUaGVtZVF0TW9iaWxlOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3Qq IG8sIGNvbnN0IFBhaW50SW5mbyYgaSwgY28KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQg UmVuZGVyVGhlbWVRdE1vYmlsZTo6YWRqdXN0TWVudUxpc3RTdHlsZShDU1NTdHlsZVNlbGVjdG9y KiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3QKK3ZvaWQgUmVuZGVyVGhlbWVR dE1vYmlsZTo6YWRqdXN0TWVudUxpc3RTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3Rvciwg UmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlKSBjb25zdAogewotICAgIHN0eWxlLT5yZXNl dEJvcmRlcigpOwotCi0gICAgLy8gSGVpZ2h0IGlzIGxvY2tlZCB0byBhdXRvLgotICAgIHN0eWxl LT5zZXRIZWlnaHQoTGVuZ3RoKEF1dG8pKTsKLQotICAgIC8vIFdoaXRlLXNwYWNlIGlzIGxvY2tl ZCB0byBwcmUKLSAgICBzdHlsZS0+c2V0V2hpdGVTcGFjZShQUkUpOwotCi0gICAgY29tcHV0ZVNp emVCYXNlZE9uU3R5bGUoc3R5bGUpOwotCi0gICAgLy8gQWRkIGluIHRoZSBwYWRkaW5nIHRoYXQg d2UnZCBsaWtlIHRvIHVzZS4KLSAgICBzZXRQb3B1cFBhZGRpbmcoc3R5bGUpOworICAgIFJlbmRl clRoZW1lUXQ6OmFkanVzdE1lbnVMaXN0U3R5bGUoc2VsZWN0b3IsIHN0eWxlLCBlKTsKICAgICBz dHlsZS0+c2V0UGFkZGluZ0xlZnQoTGVuZ3RoKG1lbnVMaXN0UGFkZGluZywgRml4ZWQpKTsKIH0K IAo= 114932 2011-11-14 06:23:19 -0800 2011-11-15 05:43:50 -0800 Patch bug-72262-20111114152447.patch text/plain 7451 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzcyMjIzMzcxZWIxZWQ3 ZDY1NzE1YmU0MDEzNjdjZTk3YTMxMjY1Yy4uZmU3MzY2N2QwMzNmN2UzYWM4ZGVmOGJiMzMzMzk3 MTI1Y2FjMjBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTE0ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF0gQ2xlYW4g dXAgdGhlIHJlbWFpbmluZyBkdXBsaWNhdGUgY29kZSBhZnRlciB0aGUgUmVuZGVyVGhlbWVRdCBy ZWZhY3RvcmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyMjYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIG5lZWRlZCwgdGhpcyBpcyBwdXJlbHkgY29zbWV0aWMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZVFTdHlsZTo6YWRqdXN0TWVudUxpc3RCdXR0b25TdHlsZSk6CisgICAgICAg ICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC9SZW5kZXJUaGVtZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OmFk anVzdE1lbnVMaXN0QnV0dG9uU3R5bGUpOiByZW1vdmUgdGhlIGNhbGwgdG8gcmVzZXRCb3JkZXJS YWRpdXMoKQorICAgICAgICBzaW5jZSB0aGUgbW9iaWxlIHRoZW1lIGFjdHVhbGx5IGRpZG4ndCBk byB0aGlzLgorICAgICAgICAqIHBsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXRNb2JpbGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVRdE1vYmlsZTo6YWRqdXN0TWVudUxpc3RTdHls ZSk6CisKIDIwMTEtMTEtMTQgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9r aWEuY29tPgogCiAgICAgICAgIFtRdF0gVW5icmVhayB0aGUgYnVpbGQgb24gTWFjIE9TIFgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUVN0eWxlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUVN0eWxlLmNwcAppbmRl eCBkZDA5ZTIwN2M2ZWQ1NmNkNmE5N2FhMDRiN2Y2MWQ0MTZiZjgxZGM0Li4xMmUyNWM3M2MxYjdl YjdjYTgyMThkOTEwNGNjYTYwZWUyOWM5MDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuY3BwCkBAIC0zODIsMTkgKzM4Miw2IEBAIGJvb2wg UmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50QnV0dG9uKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFp bnRJbmZvJiBpLCBjb25zdCBJCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlbmRlclRo ZW1lUVN0eWxlOjphZGp1c3RUZXh0RmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVy U3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3QKLXsKLSAgICAvLyBSZXNldHRpbmcgdGhlIHN0 eWxlIGxpa2UgdGhpcyBsZWFkcyB0byBkaWZmZXJlbmNlcyBsaWtlOgotICAgIC8vIC0gUmVuZGVy VGV4dENvbnRyb2wge0lOUFVUfSBhdCAoMiwyKSBzaXplIDE2OHgyNSBbYmdjb2xvcj0jRkZGRkZG XSBib3JkZXI6ICgycHggaW5zZXQgIzAwMDAwMCldCi0gICAgLy8gKyBSZW5kZXJUZXh0Q29udHJv bCB7SU5QVVR9IGF0ICgyLDIpIHNpemUgMTY2eDI2Ci0gICAgLy8gaW4gbGF5b3V0IHRlc3RzIHdo ZW4gYSBDU1Mgc3R5bGUgaXMgYXBwbGllZCB0aGF0IGRvZXNuJ3QgYWZmZWN0IGJhY2tncm91bmQg Y29sb3IsIGJvcmRlciBvcgotICAgIC8vIHBhZGRpbmcuIEp1c3Qgd29ydGgga2VlcGluZyBpbiBt aW5kIQotICAgIHN0eWxlLT5zZXRCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6OnRyYW5zcGFyZW50KTsK LSAgICBzdHlsZS0+cmVzZXRCb3JkZXIoKTsKLSAgICBzdHlsZS0+cmVzZXRQYWRkaW5nKCk7Ci0g ICAgY29tcHV0ZVNpemVCYXNlZE9uU3R5bGUoc3R5bGUpOwotfQotCiBib29sIFJlbmRlclRoZW1l UVN0eWxlOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYg aSwgY29uc3QgSW50UmVjdCYgcikKIHsKICAgICBTdHlsZVBhaW50ZXJRU3R5bGUgcCh0aGlzLCBp KTsKQEAgLTQ3NywyMiArNDY0LDEzIEBAIGJvb2wgUmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50TWVu dUxpc3QoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIGksIGNvbnN0CiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCi12b2lkIFJlbmRlclRoZW1lUVN0eWxlOjphZGp1c3RNZW51TGlzdEJ1 dHRvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQq KSBjb25zdAordm9pZCBSZW5kZXJUaGVtZVFTdHlsZTo6YWRqdXN0TWVudUxpc3RCdXR0b25TdHls ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50 KiBlKSBjb25zdAogewogICAgIC8vIFdPUktBUk9VTkQgYmVjYXVzZSBodG1sLmNzcyBzcGVjaWZp ZXMgLXdlYmtpdC1ib3JkZXItcmFkaXVzIGZvciA8c2VsZWN0PiBzbyB3ZSBvdmVycmlkZSBpdCBo ZXJlCiAgICAgLy8gc2VlIGFsc28gaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTgzOTkKICAgICBzdHlsZS0+cmVzZXRCb3JkZXJSYWRpdXMoKTsKIAotICAgIC8vIEhlaWdo dCBpcyBsb2NrZWQgdG8gYXV0by4KLSAgICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChBdXRvKSk7 Ci0KLSAgICAvLyBXaGl0ZS1zcGFjZSBpcyBsb2NrZWQgdG8gcHJlCi0gICAgc3R5bGUtPnNldFdo aXRlU3BhY2UoUFJFKTsKLQotICAgIGNvbXB1dGVTaXplQmFzZWRPblN0eWxlKHN0eWxlKTsKLQot ICAgIC8vIEFkZCBpbiB0aGUgcGFkZGluZyB0aGF0IHdlJ2QgbGlrZSB0byB1c2UuCi0gICAgc2V0 UG9wdXBQYWRkaW5nKHN0eWxlKTsKKyAgICBSZW5kZXJUaGVtZVF0OjphZGp1c3RNZW51TGlzdEJ1 dHRvblN0eWxlKHNlbGVjdG9yLCBzdHlsZSwgZSk7CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVRU3R5 bGU6OnBhaW50TWVudUxpc3RCdXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8m IGksCkBAIC02NDAsMjAgKzYxOCw2IEBAIGJvb2wgUmVuZGVyVGhlbWVRU3R5bGU6OnBhaW50U2Vh cmNoRmllbGQoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIHBpLAogICAgIHJldHVy biBwYWludFRleHRGaWVsZChvLCBwaSwgcik7CiB9CiAKLXZvaWQgUmVuZGVyVGhlbWVRU3R5bGU6 OmFkanVzdFNlYXJjaEZpZWxkU3R5bGUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IsIFJlbmRl clN0eWxlKiBzdHlsZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBFbGVtZW50KiBlKSBjb25zdAotewotICAgIC8vIFJlc2V0dGluZyB0aGUgc3R5bGUgbGlrZSB0 aGlzIGxlYWRzIHRvIGRpZmZlcmVuY2VzIGxpa2U6Ci0gICAgLy8gLSBSZW5kZXJUZXh0Q29udHJv bCB7SU5QVVR9IGF0ICgyLDIpIHNpemUgMTY4eDI1IFtiZ2NvbG9yPSNGRkZGRkZdIGJvcmRlcjog KDJweCBpbnNldCAjMDAwMDAwKV0KLSAgICAvLyArIFJlbmRlclRleHRDb250cm9sIHtJTlBVVH0g YXQgKDIsMikgc2l6ZSAxNjZ4MjYKLSAgICAvLyBpbiBsYXlvdXQgdGVzdHMgd2hlbiBhIENTUyBz dHlsZSBpcyBhcHBsaWVkIHRoYXQgZG9lc24ndCBhZmZlY3QgYmFja2dyb3VuZCBjb2xvciwgYm9y ZGVyIG9yCi0gICAgLy8gcGFkZGluZy4gSnVzdCB3b3J0aCBrZWVwaW5nIGluIG1pbmQhCi0gICAg c3R5bGUtPnNldEJhY2tncm91bmRDb2xvcihDb2xvcjo6dHJhbnNwYXJlbnQpOwotICAgIHN0eWxl LT5yZXNldEJvcmRlcigpOwotICAgIHN0eWxlLT5yZXNldFBhZGRpbmcoKTsKLSAgICBjb21wdXRl U2l6ZUJhc2VkT25TdHlsZShzdHlsZSk7Ci19Ci0KIHZvaWQgUmVuZGVyVGhlbWVRU3R5bGU6OmFk anVzdFNlYXJjaEZpZWxkRGVjb3JhdGlvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9y LCBSZW5kZXJTdHlsZSogc3R5bGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEVsZW1lbnQqIGUpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVFTdHlsZS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRU3R5bGUuaAppbmRleCA1NzQ3ZmU0N2VkZGQ0MmNj OTRiNjlmOGYzOWFkYmRiNWNkMTQ0Mzk5Li5mYTQzNjIxYmZmMTAyZjBkYTZlYWE1MWQzOTMzNmU5 YTAyMmU4YmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJU aGVtZVFTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1l UVN0eWxlLmgKQEAgLTU1LDcgKzU1LDYgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBw YWludEJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0 Jik7CiAKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRUZXh0RmllbGQoUmVuZGVyT2JqZWN0KiwgY29u c3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RU ZXh0RmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50Kikg Y29uc3Q7CiAKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRUZXh0QXJlYShSZW5kZXJPYmplY3QqLCBj b25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIGFkanVz dFRleHRBcmVhU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCop IGNvbnN0OwpAQCAtNzgsNyArNzcsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGFk anVzdFNsaWRlclRodW1iU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiwgRWxl bWVudCopIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoUmVuZGVy T2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwotICAgIHZpcnR1YWwg dm9pZCBhZGp1c3RTZWFyY2hGaWVsZFN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHls ZSosIEVsZW1lbnQqKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RTZWFyY2hGaWVs ZERlY29yYXRpb25TdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50 KikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGREZWNvcmF0aW9uKFJl bmRlck9iamVjdCosIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKaW5kZXggMjQ4NGRhMDA1OGYz ZGQzOGNiZWMwMWNiODEwODU1ZGRhNmJkYjNiNS4uYjY1ZGUzMzcyMzk3MGM3YjQ0ZTEyZTMwYWNj NzdiYzNjMDM2MDZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVu ZGVyVGhlbWVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhl bWVRdC5jcHAKQEAgLTMzMiwxMCArMzMyLDYgQEAgdm9pZCBSZW5kZXJUaGVtZVF0OjphZGp1c3RN ZW51TGlzdFN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEUKIAog dm9pZCBSZW5kZXJUaGVtZVF0OjphZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxlKENTU1N0eWxlU2Vs ZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdAogewotICAgIC8vIFdP UktBUk9VTkQgYmVjYXVzZSBodG1sLmNzcyBzcGVjaWZpZXMgLXdlYmtpdC1ib3JkZXItcmFkaXVz IGZvciA8c2VsZWN0PiBzbyB3ZSBvdmVycmlkZSBpdCBoZXJlCi0gICAgLy8gc2VlIGFsc28gaHR0 cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzOTkKLSAgICBzdHlsZS0+cmVz ZXRCb3JkZXJSYWRpdXMoKTsKLQogICAgIC8vIEhlaWdodCBpcyBsb2NrZWQgdG8gYXV0by4KICAg ICBzdHlsZS0+c2V0SGVpZ2h0KExlbmd0aChBdXRvKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXRNb2JpbGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdE1vYmlsZS5jcHAKaW5kZXggMjlkYWFjYTRmYzhj ZTk5N2ZmZGZlODFlOGM4MmZjMzhmMTkzNWM5Yi4uZGVmNWY1YmI5NjAwODMxZDhlZTZmMTEyOGQ1 ZTFlYWJmY2RhY2E5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVu ZGVyVGhlbWVRdE1vYmlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUmVu ZGVyVGhlbWVRdE1vYmlsZS5jcHAKQEAgLTU1MywyMCArNTUzLDkgQEAgYm9vbCBSZW5kZXJUaGVt ZVF0TW9iaWxlOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5m byYgaSwgY28KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgUmVuZGVyVGhlbWVRdE1vYmls ZTo6YWRqdXN0TWVudUxpc3RTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqIHN0 eWxlLCBFbGVtZW50KikgY29uc3QKK3ZvaWQgUmVuZGVyVGhlbWVRdE1vYmlsZTo6YWRqdXN0TWVu dUxpc3RTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgUmVuZGVyU3R5bGUqIHN0eWxl LCBFbGVtZW50KiBlKSBjb25zdAogewotICAgIHN0eWxlLT5yZXNldEJvcmRlcigpOwotCi0gICAg Ly8gSGVpZ2h0IGlzIGxvY2tlZCB0byBhdXRvLgotICAgIHN0eWxlLT5zZXRIZWlnaHQoTGVuZ3Ro KEF1dG8pKTsKLQotICAgIC8vIFdoaXRlLXNwYWNlIGlzIGxvY2tlZCB0byBwcmUKLSAgICBzdHls ZS0+c2V0V2hpdGVTcGFjZShQUkUpOwotCi0gICAgY29tcHV0ZVNpemVCYXNlZE9uU3R5bGUoc3R5 bGUpOwotCi0gICAgLy8gQWRkIGluIHRoZSBwYWRkaW5nIHRoYXQgd2UnZCBsaWtlIHRvIHVzZS4K LSAgICBzZXRQb3B1cFBhZGRpbmcoc3R5bGUpOworICAgIFJlbmRlclRoZW1lUXQ6OmFkanVzdE1l bnVMaXN0U3R5bGUoc2VsZWN0b3IsIHN0eWxlLCBlKTsKICAgICBzdHlsZS0+c2V0UGFkZGluZ0xl ZnQoTGVuZ3RoKG1lbnVMaXN0UGFkZGluZywgRml4ZWQpKTsKIH0KIAo=