38896 2010-05-11 03:56:56 -0700 [GTK] Theme does not render when printing 2010-05-13 02:40:35 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 alex webkit-unassigned webkit.review.bot oldest_to_newest 223858 0 alex 2010-05-11 03:56:56 -0700 The theme rendering is using the gdkdrawable from the expose event, when printing there is no expose event rendering, the result is the theme (buttons, combos, etc.) are not printed. WebCore/platform/gtk/RenderThemeGtk.cpp: ... if (!i.context->gdkDrawable()) return true; ... 224494 1 55822 alex 2010-05-12 03:03:02 -0700 Created attachment 55822 Proposed patch 224495 2 webkit.review.bot 2010-05-12 03:05:26 -0700 Attachment 55822 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/gtk/RenderThemeGtk.cpp:288: Declaration has space between type name and * in GdkDrawable *pixmap [whitespace/declaration] [3] WebCore/platform/gtk/RenderThemeGtk.cpp:293: Use 0 instead of NULL. [readability/null] [5] WebCore/platform/gtk/RenderThemeGtk.cpp:330: Declaration has space between type name and * in cairo_t *cr [whitespace/declaration] [3] WebCore/platform/gtk/RenderThemeGtk.cpp:322: An else statement can be removed when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 224499 3 55825 alex 2010-05-12 03:13:20 -0700 Created attachment 55825 Proposed patch 224537 4 55825 xan.lopez 2010-05-12 05:13:57 -0700 Comment on attachment 55825 Proposed patch We can use GRefPtr for the pixmap, so r- to do that. It also seems when there's no expose event and printing is disabled we'll create a pixmap just to immediately destroy it, which seems a bit pointless. 225195 5 55955 alex 2010-05-13 01:02:45 -0700 Created attachment 55955 Patch 225200 6 55955 xan.lopez 2010-05-13 01:19:58 -0700 Comment on attachment 55955 Patch Looks good to me. 225212 7 alex 2010-05-13 02:40:35 -0700 Landed on commit 59356. 55822 2010-05-12 03:03:02 -0700 2010-05-12 03:13:20 -0700 Proposed patch print_fix.patch text/plain 5489 alex Y29tbWl0IDQ1MzYzMzQ4ODJmN2Q2ZDExOTM3NGEzOTQ0NjhlMGYxNGI4YzMzOGIKQXV0aG9yOiBB bGVqYW5kcm8gRy4gQ2FzdHJvIDxhbGV4QGlnYWxpYS5jb20+CkRhdGU6ICAgVHVlIE1heSAxMSAx MzowMTowMCAyMDEwICswMjAwCgogICAgMjAxMC0wNS0xMSAgQWxlamFuZHJvIEcuIENhc3RybyAg PGFsZXhAaWdhbGlhLmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KICAgIAogICAgICAgICAgICBJbiBjYXNlIHRoZXJlIGlzIG5vIGV4cG9zZSBldmVudCB3 ZSByZW5kZXIgdGhlIHRoZW1lIGluIGEgcGl4bWFwCiAgICAgICAgICAgIGFuZCBjb3B5IGl0IHRv IHRoZSBjYWlybyBjb250ZXh0LiBUaGlzIGlzIHNsb3cgYnV0IGl0IGlzIHVzZWQganVzdAogICAg ICAgICAgICBpbiBjYXNlIHdlIGFyZSBwcmludGluZyBub3dhZGF5cy4KICAgIAogICAgICAgICAg ICBbR1RLXSBUaGVtZSBkb2VzIG5vdCByZW5kZXIgd2hlbiBwcmludGluZwogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4OTYKICAgIAogICAgICAg ICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CiAgICAgICAgICAgIChXZWJD b3JlOjpwYWludE1vemlsbGFHdGtXaWRnZXQpOgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgxZjBlMC4uYzg5NjUwZCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxMC0wNS0xMSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNl IHRoZXJlIGlzIG5vIGV4cG9zZSBldmVudCB3ZSByZW5kZXIgdGhlIHRoZW1lIGluIGEgcGl4bWFw CisgICAgICAgIGFuZCBjb3B5IGl0IHRvIHRoZSBjYWlybyBjb250ZXh0LiBUaGlzIGlzIHNsb3cg YnV0IGl0IGlzIHVzZWQganVzdAorICAgICAgICBpbiBjYXNlIHdlIGFyZSBwcmludGluZyBub3dh ZGF5cy4KKworICAgICAgICBbR1RLXSBUaGVtZSBkb2VzIG5vdCByZW5kZXIgd2hlbiBwcmludGlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4OTYK KworICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpwYWludE1vemlsbGFHdGtXaWRnZXQpOgorCiAyMDEwLTA1LTEyICBMdWNhcyBEZSBN YXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAK aW5kZXggMzFhZjFhOS4uNGQ4NzhlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1l R3RrLmNwcApAQCAtMjg1LDEzICsyODUsMTggQEAgc3RhdGljIHZvaWQgc2V0TW96aWxsYVN0YXRl KGNvbnN0IFJlbmRlclRoZW1lKiB0aGVtZSwgR3RrV2lkZ2V0U3RhdGUqIHN0YXRlLCBSZW4KIAog c3RhdGljIGJvb2wgcGFpbnRNb3ppbGxhR3RrV2lkZ2V0KGNvbnN0IFJlbmRlclRoZW1lR3RrKiB0 aGVtZSwgR3RrVGhlbWVXaWRnZXRUeXBlIHR5cGUsIFJlbmRlck9iamVjdCogbywgY29uc3QgUmVu ZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CisgICAgR2Rr RHJhd2FibGUgKnBpeG1hcCA9IDA7CisKICAgICAvLyBObyBHZGtXaW5kb3cgdG8gcmVuZGVyIHRv LCBzbyByZXR1cm4gdHJ1ZSB0byBmYWxsIGJhY2sKICAgICBpZiAoIWkuY29udGV4dC0+Z2RrRHJh d2FibGUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIC8vIFRoaXMgaXMgc2xvdywg dXNlZCBvbmx5IGR1cmluZyBwcmludGluZyBwcm9jZXNzCisgICAgICAgIHBpeG1hcCA9IGdka19w aXhtYXBfbmV3KE5VTEwsIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwgZ2RrX3Zpc3VhbF9n ZXRfc3lzdGVtKCktPmRlcHRoKTsKIAogICAgIC8vIFBhaW50aW5nIGlzIGRpc2FibGVkIHNvIGp1 c3QgY2xhaW0gdG8gaGF2ZSBzdWNjZWVkZWQKLSAgICBpZiAoaS5jb250ZXh0LT5wYWludGluZ0Rp c2FibGVkKCkpCisgICAgaWYgKGkuY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKSB7CisgICAg ICAgIGdfb2JqZWN0X3VucmVmKHBpeG1hcCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 CiAKICAgICBHdGtXaWRnZXRTdGF0ZSBtb3pTdGF0ZTsKICAgICBzZXRNb3ppbGxhU3RhdGUodGhl bWUsICZtb3pTdGF0ZSwgbyk7CkBAIC0zMTIsMzAgKzMxNyw0OSBAQCBzdGF0aWMgYm9vbCBwYWlu dE1vemlsbGFHdGtXaWRnZXQoY29uc3QgUmVuZGVyVGhlbWVHdGsqIHRoZW1lLCBHdGtUaGVtZVdp ZGdldFR5cAogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBBZmZpbmVUcmFuc2Zvcm0gY3Rt ID0gaS5jb250ZXh0LT5nZXRDVE0oKTsKLQotICAgIEludFBvaW50IHBvcyA9IGN0bS5tYXBQb2lu dChyZWN0LmxvY2F0aW9uKCkpOwotICAgIEdka1JlY3RhbmdsZSBnZGtSZWN0ID0gSW50UmVjdChw b3MueCgpLCBwb3MueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogICAgIEd0a1Rl eHREaXJlY3Rpb24gZGlyZWN0aW9uID0gZ3RrVGV4dERpcmVjdGlvbihvLT5zdHlsZSgpLT5kaXJl Y3Rpb24oKSk7CiAKLSAgICAvLyBGaW5kIHRoZSBjbGlwIHJlY3RhbmdsZQotICAgIGNhaXJvX3Qq IGNyID0gaS5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBkb3VibGUgY2xpcFgxLCBj bGlwWDIsIGNsaXBZMSwgY2xpcFkyOwotICAgIGNhaXJvX2NsaXBfZXh0ZW50cyhjciwgJmNsaXBY MSwgJmNsaXBZMSwgJmNsaXBYMiwgJmNsaXBZMik7CisgICAgaWYgKHBpeG1hcCkgeworICAgICAg ICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9IEludFJlY3QoMCwgMCwgcmVjdC53aWR0aCgpLCByZWN0 LmhlaWdodCgpKTsKIAotICAgIEdka1JlY3RhbmdsZSBnZGtDbGlwUmVjdDsKLSAgICBnZGtDbGlw UmVjdC53aWR0aCA9IGNsaXBYMiAtIGNsaXBYMTsKLSAgICBnZGtDbGlwUmVjdC5oZWlnaHQgPSBj bGlwWTIgLSBjbGlwWTE7Ci0gICAgSW50UG9pbnQgY2xpcFBvcyA9IGN0bS5tYXBQb2ludChJbnRQ b2ludChjbGlwWDEsIGNsaXBZMSkpOwotICAgIGdka0NsaXBSZWN0LnggPSBjbGlwUG9zLngoKTsK LSAgICBnZGtDbGlwUmVjdC55ID0gY2xpcFBvcy55KCk7CisgICAgICAgIG1vel9ndGtfdXNlX3Ro ZW1lX3BhcnRzKHRoZW1lLT5wYXJ0c0ZvckRyYXdhYmxlKHBpeG1hcCkpOwogCi0gICAgZ2RrX3Jl Y3RhbmdsZV9pbnRlcnNlY3QoJmdka1JlY3QsICZnZGtDbGlwUmVjdCwgJmdka0NsaXBSZWN0KTsK KyAgICAgICAgYm9vbCByZXN1bHQgPSBtb3pfZ3RrX3dpZGdldF9wYWludCh0eXBlLCBwaXhtYXAs ICZnZGtSZWN0LCAmZ2RrUmVjdCwgJm1velN0YXRlLCBmbGFncywgZGlyZWN0aW9uKSAhPSBNT1pf R1RLX1NVQ0NFU1M7CiAKLSAgICAvLyBTaW5jZSB0aGUgdGhlbWUgcmVuZGVyZXIgaXMgZ29pbmcg dG8gYmUgZHJhd2luZyBvbnRvIHRoaXMgR2RrRHJhd2FibGUsCi0gICAgLy8gc2VsZWN0IHRoZSBh cHByb3ByaWF0ZSB3aWRnZXRzIGZvciB0aGUgZHJhd2FibGUgZGVwdGguCi0gICAgbW96X2d0a191 c2VfdGhlbWVfcGFydHModGhlbWUtPnBhcnRzRm9yRHJhd2FibGUoaS5jb250ZXh0LT5nZGtEcmF3 YWJsZSgpKSk7Ci0gICAgcmV0dXJuIG1vel9ndGtfd2lkZ2V0X3BhaW50KHR5cGUsIGkuY29udGV4 dC0+Z2RrRHJhd2FibGUoKSwgJmdka1JlY3QsICZnZGtDbGlwUmVjdCwgJm1velN0YXRlLCBmbGFn cywgZGlyZWN0aW9uKSAhPSBNT1pfR1RLX1NVQ0NFU1M7CisgICAgICAgIGlmICghcmVzdWx0KSB7 CisgICAgICAgICAgICBjYWlyb190ICpjciA9IGkuY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7 CisgICAgICAgICAgICBnZGtfY2Fpcm9fc2V0X3NvdXJjZV9waXhtYXAoY3IsIHBpeG1hcCwgcmVj dC54KCksIHJlY3QueSgpKTsKKyAgICAgICAgICAgIGNhaXJvX3BhaW50KGNyKTsKKyAgICAgICAg fQorCisgICAgICAgIGdfb2JqZWN0X3VucmVmKHBpeG1hcCk7CisKKyAgICAgICAgcmV0dXJuIHJl c3VsdDsKKyAgICB9IGVsc2UgeworICAgICAgICBBZmZpbmVUcmFuc2Zvcm0gY3RtID0gaS5jb250 ZXh0LT5nZXRDVE0oKTsKKworICAgICAgICBJbnRQb2ludCBwb3MgPSBjdG0ubWFwUG9pbnQocmVj dC5sb2NhdGlvbigpKTsKKyAgICAgICAgR2RrUmVjdGFuZ2xlIGdka1JlY3QgPSBJbnRSZWN0KHBv cy54KCksIHBvcy55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisKKyAgICAgICAg Ly8gRmluZCB0aGUgY2xpcCByZWN0YW5nbGUKKyAgICAgICAgY2Fpcm9fdCogY3IgPSBpLmNvbnRl eHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgICAgICBkb3VibGUgY2xpcFgxLCBjbGlwWDIsIGNs aXBZMSwgY2xpcFkyOworICAgICAgICBjYWlyb19jbGlwX2V4dGVudHMoY3IsICZjbGlwWDEsICZj bGlwWTEsICZjbGlwWDIsICZjbGlwWTIpOworCisgICAgICAgIEdka1JlY3RhbmdsZSBnZGtDbGlw UmVjdDsKKyAgICAgICAgZ2RrQ2xpcFJlY3Qud2lkdGggPSBjbGlwWDIgLSBjbGlwWDE7CisgICAg ICAgIGdka0NsaXBSZWN0LmhlaWdodCA9IGNsaXBZMiAtIGNsaXBZMTsKKyAgICAgICAgSW50UG9p bnQgY2xpcFBvcyA9IGN0bS5tYXBQb2ludChJbnRQb2ludChjbGlwWDEsIGNsaXBZMSkpOworICAg ICAgICBnZGtDbGlwUmVjdC54ID0gY2xpcFBvcy54KCk7CisgICAgICAgIGdka0NsaXBSZWN0Lnkg PSBjbGlwUG9zLnkoKTsKKworICAgICAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmZ2RrUmVj dCwgJmdka0NsaXBSZWN0LCAmZ2RrQ2xpcFJlY3QpOworCisgICAgICAgIC8vIFNpbmNlIHRoZSB0 aGVtZSByZW5kZXJlciBpcyBnb2luZyB0byBiZSBkcmF3aW5nIG9udG8gdGhpcyBHZGtEcmF3YWJs ZSwKKyAgICAgICAgLy8gc2VsZWN0IHRoZSBhcHByb3ByaWF0ZSB3aWRnZXRzIGZvciB0aGUgZHJh d2FibGUgZGVwdGguCisgICAgICAgIG1vel9ndGtfdXNlX3RoZW1lX3BhcnRzKHRoZW1lLT5wYXJ0 c0ZvckRyYXdhYmxlKGkuY29udGV4dC0+Z2RrRHJhd2FibGUoKSkpOworICAgICAgICByZXR1cm4g bW96X2d0a193aWRnZXRfcGFpbnQodHlwZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLCAmZ2Rr UmVjdCwgJmdka0NsaXBSZWN0LCAmbW96U3RhdGUsIGZsYWdzLCBkaXJlY3Rpb24pICE9IE1PWl9H VEtfU1VDQ0VTUzsKKyAgICB9CiB9CiAKIHN0YXRpYyB2b2lkIHNldEJ1dHRvblBhZGRpbmcoUmVu ZGVyU3R5bGUqIHN0eWxlKQo= 55825 2010-05-12 03:13:20 -0700 2010-05-13 01:02:37 -0700 Proposed patch print_fix.patch text/plain 3580 alex Y29tbWl0IDY0MDBkYWQ4NGYwNzc1N2Y0NmI5ZTNmZTQ5Yjg0ZjhhODlhNDI0ZDcKQXV0aG9yOiBB bGVqYW5kcm8gRy4gQ2FzdHJvIDxhbGV4QGlnYWxpYS5jb20+CkRhdGU6ICAgVHVlIE1heSAxMSAx MzowMTowMCAyMDEwICswMjAwCgogICAgMjAxMC0wNS0xMiAgQWxlamFuZHJvIEcuIENhc3RybyAg PGFsZXhAaWdhbGlhLmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KICAgIAogICAgICAgICAgICBJbiBjYXNlIHRoZXJlIGlzIG5vIGV4cG9zZSBldmVudCB3 ZSByZW5kZXIgdGhlIHRoZW1lIGluIGEgcGl4bWFwCiAgICAgICAgICAgIGFuZCBjb3B5IGl0IHRv IHRoZSBjYWlybyBjb250ZXh0LiBUaGlzIGlzIHNsb3cgYnV0IGl0IGlzIHVzZWQganVzdAogICAg ICAgICAgICBpbiBjYXNlIHdlIGFyZSBwcmludGluZyBub3dhZGF5cy4KICAgIAogICAgICAgICAg ICBbR1RLXSBUaGVtZSBkb2VzIG5vdCByZW5kZXIgd2hlbiBwcmludGluZwogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4OTYKICAgIAogICAgICAg ICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CiAgICAgICAgICAgIChXZWJD b3JlOjpwYWludE1vemlsbGFHdGtXaWRnZXQpOgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgxZjBlMC4uNGI0ZDhlYSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxMC0wNS0xMiAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNl IHRoZXJlIGlzIG5vIGV4cG9zZSBldmVudCB3ZSByZW5kZXIgdGhlIHRoZW1lIGluIGEgcGl4bWFw CisgICAgICAgIGFuZCBjb3B5IGl0IHRvIHRoZSBjYWlybyBjb250ZXh0LiBUaGlzIGlzIHNsb3cg YnV0IGl0IGlzIHVzZWQganVzdAorICAgICAgICBpbiBjYXNlIHdlIGFyZSBwcmludGluZyBub3dh ZGF5cy4KKworICAgICAgICBbR1RLXSBUaGVtZSBkb2VzIG5vdCByZW5kZXIgd2hlbiBwcmludGlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4OTYK KworICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpwYWludE1vemlsbGFHdGtXaWRnZXQpOgorCiAyMDEwLTA1LTEyICBMdWNhcyBEZSBN YXJjaGkgIDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAK aW5kZXggMzFhZjFhOS4uNDZhN2ZhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1l R3RrLmNwcApAQCAtMjg1LDEzICsyODUsMTggQEAgc3RhdGljIHZvaWQgc2V0TW96aWxsYVN0YXRl KGNvbnN0IFJlbmRlclRoZW1lKiB0aGVtZSwgR3RrV2lkZ2V0U3RhdGUqIHN0YXRlLCBSZW4KIAog c3RhdGljIGJvb2wgcGFpbnRNb3ppbGxhR3RrV2lkZ2V0KGNvbnN0IFJlbmRlclRoZW1lR3RrKiB0 aGVtZSwgR3RrVGhlbWVXaWRnZXRUeXBlIHR5cGUsIFJlbmRlck9iamVjdCogbywgY29uc3QgUmVu ZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CisgICAgR2Rr RHJhd2FibGUqIHBpeG1hcCA9IDA7CisKICAgICAvLyBObyBHZGtXaW5kb3cgdG8gcmVuZGVyIHRv LCBzbyByZXR1cm4gdHJ1ZSB0byBmYWxsIGJhY2sKICAgICBpZiAoIWkuY29udGV4dC0+Z2RrRHJh d2FibGUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIC8vIFRoaXMgaXMgc2xvdywg dXNlZCBvbmx5IGR1cmluZyBwcmludGluZyBwcm9jZXNzCisgICAgICAgIHBpeG1hcCA9IGdka19w aXhtYXBfbmV3KDAsIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwgZ2RrX3Zpc3VhbF9nZXRf c3lzdGVtKCktPmRlcHRoKTsKIAogICAgIC8vIFBhaW50aW5nIGlzIGRpc2FibGVkIHNvIGp1c3Qg Y2xhaW0gdG8gaGF2ZSBzdWNjZWVkZWQKLSAgICBpZiAoaS5jb250ZXh0LT5wYWludGluZ0Rpc2Fi bGVkKCkpCisgICAgaWYgKGkuY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKSB7CisgICAgICAg IGdfb2JqZWN0X3VucmVmKHBpeG1hcCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAK ICAgICBHdGtXaWRnZXRTdGF0ZSBtb3pTdGF0ZTsKICAgICBzZXRNb3ppbGxhU3RhdGUodGhlbWUs ICZtb3pTdGF0ZSwgbyk7CkBAIC0zMTIsMTEgKzMxNywzMCBAQCBzdGF0aWMgYm9vbCBwYWludE1v emlsbGFHdGtXaWRnZXQoY29uc3QgUmVuZGVyVGhlbWVHdGsqIHRoZW1lLCBHdGtUaGVtZVdpZGdl dFR5cAogICAgICAgICBicmVhazsKICAgICB9CiAKKyAgICBHdGtUZXh0RGlyZWN0aW9uIGRpcmVj dGlvbiA9IGd0a1RleHREaXJlY3Rpb24oby0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkpOworCisgICAg aWYgKHBpeG1hcCkgeworICAgICAgICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9IEludFJlY3QoMCwg MCwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKKworICAgICAgICBtb3pfZ3RrX3VzZV90 aGVtZV9wYXJ0cyh0aGVtZS0+cGFydHNGb3JEcmF3YWJsZShwaXhtYXApKTsKKworICAgICAgICBi b29sIHJlc3VsdCA9IG1vel9ndGtfd2lkZ2V0X3BhaW50KHR5cGUsIHBpeG1hcCwgJmdka1JlY3Qs ICZnZGtSZWN0LCAmbW96U3RhdGUsIGZsYWdzLCBkaXJlY3Rpb24pICE9IE1PWl9HVEtfU1VDQ0VT UzsKKworICAgICAgICBpZiAoIXJlc3VsdCkgeworICAgICAgICAgICAgY2Fpcm9fdCogY3IgPSBp LmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgICAgICAgICAgZ2RrX2NhaXJvX3NldF9z b3VyY2VfcGl4bWFwKGNyLCBwaXhtYXAsIHJlY3QueCgpLCByZWN0LnkoKSk7CisgICAgICAgICAg ICBjYWlyb19wYWludChjcik7CisgICAgICAgIH0KKworICAgICAgICBnX29iamVjdF91bnJlZihw aXhtYXApOworCisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQorCiAgICAgQWZmaW5lVHJh bnNmb3JtIGN0bSA9IGkuY29udGV4dC0+Z2V0Q1RNKCk7CiAKICAgICBJbnRQb2ludCBwb3MgPSBj dG0ubWFwUG9pbnQocmVjdC5sb2NhdGlvbigpKTsKICAgICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9 IEludFJlY3QocG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsK LSAgICBHdGtUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiA9IGd0a1RleHREaXJlY3Rpb24oby0+c3R5 bGUoKS0+ZGlyZWN0aW9uKCkpOwogCiAgICAgLy8gRmluZCB0aGUgY2xpcCByZWN0YW5nbGUKICAg ICBjYWlyb190KiBjciA9IGkuY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7Cg== 55955 2010-05-13 01:02:45 -0700 2010-05-13 01:20:20 -0700 Patch bug-38896-20100513100241.patch text/plain 3056 alex ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWE0YmJkY2QzMmM0OWRkZjY0MWViODRmYzBmMWI5ZmEwMzI2NzZhZS4uNDRiMmZhMTI5YThjMzcx YjcxZjAyZjQ4ZGM3OGEzY2IwZjNiM2I2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNS0xMyAgQWxl amFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNlIHRoZXJlIGlzIG5vIGV4cG9zZSBl dmVudCB3ZSByZW5kZXIgdGhlIHRoZW1lIGluIGEgcGl4bWFwCisgICAgICAgIGFuZCBjb3B5IGl0 IHRvIHRoZSBjYWlybyBjb250ZXh0LiBUaGlzIGlzIHNsb3cgYnV0IGl0IGlzIHVzZWQganVzdAor ICAgICAgICBpbiBjYXNlIHdlIGFyZSBwcmludGluZyBub3dhZGF5cy4KKworICAgICAgICBbR1RL XSBUaGVtZSBkb2VzIG5vdCByZW5kZXIgd2hlbiBwcmludGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4OTYKKworICAgICAgICAqIHBsYXRmb3Jt L2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYWludE1vemlsbGFH dGtXaWRnZXQpOgorCiAyMDEwLTA1LTEyICBZdXpvIEZ1amlzaGltYSAgPHl1em9AZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrLmNwcAppbmRleCAzMWFmMWE5NDk2N2Q3MWI2MGIxZDY2ZWMwZWVjN2Q2 YTRiMTM2NWQ3Li5hZWM1MGY2MGZkZWFkNjZiZTk3ZDQ3ZTU3NDRmNmVmOTk0Y2YwMzI1IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0yODUsMTQgKzI4NSwxNyBA QCBzdGF0aWMgdm9pZCBzZXRNb3ppbGxhU3RhdGUoY29uc3QgUmVuZGVyVGhlbWUqIHRoZW1lLCBH dGtXaWRnZXRTdGF0ZSogc3RhdGUsIFJlbgogCiBzdGF0aWMgYm9vbCBwYWludE1vemlsbGFHdGtX aWRnZXQoY29uc3QgUmVuZGVyVGhlbWVHdGsqIHRoZW1lLCBHdGtUaGVtZVdpZGdldFR5cGUgdHlw ZSwgUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwgY29u c3QgSW50UmVjdCYgcmVjdCkKIHsKLSAgICAvLyBObyBHZGtXaW5kb3cgdG8gcmVuZGVyIHRvLCBz byByZXR1cm4gdHJ1ZSB0byBmYWxsIGJhY2sKLSAgICBpZiAoIWkuY29udGV4dC0+Z2RrRHJhd2Fi bGUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgR1JlZlB0cjxHZGtEcmF3YWJsZT4gcGl4 bWFwOwogCiAgICAgLy8gUGFpbnRpbmcgaXMgZGlzYWJsZWQgc28ganVzdCBjbGFpbSB0byBoYXZl IHN1Y2NlZWRlZAogICAgIGlmIChpLmNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gTm8gR2RrV2luZG93IHRvIHJlbmRlciB0bywgc28g cmV0dXJuIHRydWUgdG8gZmFsbCBiYWNrCisgICAgaWYgKCFpLmNvbnRleHQtPmdka0RyYXdhYmxl KCkpCisgICAgICAgIC8vIFRoaXMgaXMgc2xvdywgdXNlZCBvbmx5IGR1cmluZyBwcmludGluZyBw cm9jZXNzCisgICAgICAgIHBpeG1hcCA9IGFkb3B0R1JlZihnZGtfcGl4bWFwX25ldygwLCByZWN0 LndpZHRoKCksIHJlY3QuaGVpZ2h0KCksIGdka192aXN1YWxfZ2V0X3N5c3RlbSgpLT5kZXB0aCkp OworCiAgICAgR3RrV2lkZ2V0U3RhdGUgbW96U3RhdGU7CiAgICAgc2V0TW96aWxsYVN0YXRlKHRo ZW1lLCAmbW96U3RhdGUsIG8pOwogCkBAIC0zMTIsMTEgKzMxNSwyOCBAQCBzdGF0aWMgYm9vbCBw YWludE1vemlsbGFHdGtXaWRnZXQoY29uc3QgUmVuZGVyVGhlbWVHdGsqIHRoZW1lLCBHdGtUaGVt ZVdpZGdldFR5cAogICAgICAgICBicmVhazsKICAgICB9CiAKKyAgICBHdGtUZXh0RGlyZWN0aW9u IGRpcmVjdGlvbiA9IGd0a1RleHREaXJlY3Rpb24oby0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkpOwor CisgICAgaWYgKHBpeG1hcCkgeworICAgICAgICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9IEludFJl Y3QoMCwgMCwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKKworICAgICAgICBtb3pfZ3Rr X3VzZV90aGVtZV9wYXJ0cyh0aGVtZS0+cGFydHNGb3JEcmF3YWJsZShwaXhtYXAuZ2V0KCkpKTsK KworICAgICAgICBib29sIHJlc3VsdCA9IG1vel9ndGtfd2lkZ2V0X3BhaW50KHR5cGUsIHBpeG1h cC5nZXQoKSwgJmdka1JlY3QsICZnZGtSZWN0LCAmbW96U3RhdGUsIGZsYWdzLCBkaXJlY3Rpb24p ICE9IE1PWl9HVEtfU1VDQ0VTUzsKKworICAgICAgICBpZiAoIXJlc3VsdCkgeworICAgICAgICAg ICAgY2Fpcm9fdCogY3IgPSBpLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgICAgICAg ICAgZ2RrX2NhaXJvX3NldF9zb3VyY2VfcGl4bWFwKGNyLCBwaXhtYXAuZ2V0KCksIHJlY3QueCgp LCByZWN0LnkoKSk7CisgICAgICAgICAgICBjYWlyb19wYWludChjcik7CisgICAgICAgIH0KKwor ICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0KKwogICAgIEFmZmluZVRyYW5zZm9ybSBjdG0g PSBpLmNvbnRleHQtPmdldENUTSgpOwogCiAgICAgSW50UG9pbnQgcG9zID0gY3RtLm1hcFBvaW50 KHJlY3QubG9jYXRpb24oKSk7CiAgICAgR2RrUmVjdGFuZ2xlIGdka1JlY3QgPSBJbnRSZWN0KHBv cy54KCksIHBvcy55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7Ci0gICAgR3RrVGV4 dERpcmVjdGlvbiBkaXJlY3Rpb24gPSBndGtUZXh0RGlyZWN0aW9uKG8tPnN0eWxlKCktPmRpcmVj dGlvbigpKTsKIAogICAgIC8vIEZpbmQgdGhlIGNsaXAgcmVjdGFuZ2xlCiAgICAgY2Fpcm9fdCog Y3IgPSBpLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwo=