34613 2010-02-04 13:22:59 -0800 [WinCairo] Properly Handle Margin Settings For Plugins 2010-02-04 14:11:26 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 187913 0 bfulgham 2010-02-04 13:22:59 -0800 The changes made in Bug 34545 corrected margin handling for standard text and graphics, but did not address the handling of plugins during print operations. The attached patch correctly adjusts the World Context used during the 'paintContents' call so that Plugins are rendered in the proper location. 187917 1 48164 bfulgham 2010-02-04 13:29:47 -0800 Created attachment 48164 Adjusts global context used by plugin printing to account for margin settings. 187920 2 48164 aroben 2010-02-04 13:33:08 -0800 Comment on attachment 48164 Adjusts global context used by plugin printing to account for margin settings. r=me 187937 3 bfulgham 2010-02-04 14:11:26 -0800 Landed in https://trac.webkit.org/changeset/54370. 48164 2010-02-04 13:29:47 -0800 2010-02-04 13:33:08 -0800 Adjusts global context used by plugin printing to account for margin settings. plugin_margin.patch text/plain 2604 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1NDM2NSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDItMDQgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByb3Blcmx5IGhhbmRsZSBtYXJnaW4gc2V0dGluZ3Mgd2hlbiBwcmludGluZyBQ bHVnaW5zIGluIFdpbkNhaXJvLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzQ2MTMKKworICAgICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdl YkZyYW1lOjpzcG9vbFBhZ2UpOiBBZGp1c3QgdGhlIEdyYXBoaWNzQ29udGV4dCBwYXNzZWQgdG8g dGhlCisgICAgICAgICAgcGFpbnRDb250ZW50cyBtZXRob2Qgc28gdGhhdCB0aGUgV29ybGQgVHJh bnNmb3JtIGlzIHByb3Blcmx5CisgICAgICAgICAgcG9zaXRpb25lZCB0byBhY2NvdW50IGZvciBt YXJnaW4gc2V0dGluZ3MgYXQgdGhlIHRpbWUgdGhhdAorICAgICAgICAgIFBsdWdpblZpZXdXaW4u Y3BwIHByb2Nlc3NlcyB0aGUgZHJhd2luZyBvcGVyYXRpb25zLgorCiAyMDEwLTAyLTA0ICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIFJvYmVuLgpJbmRleDogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAJKHJldmlzaW9uIDU0MzYzKQorKysgV2ViS2l0L3dpbi9X ZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNzUsMjEgKzIwNzUsMjggQEAgdm9pZCBX ZWJGcmFtZTo6c3Bvb2xQYWdlKFBsYXRmb3JtR3JhcGhpYwogICAgIGNvbnN0IEludFJlY3QmIG1h cmdpblJlY3QgPSBwcmludGVyTWFyZ2luUmVjdChwcmludERDKTsKIAogICAgIGNhaXJvX3NhdmUo cGN0eCk7CisgICAgc3Bvb2xDdHgtPnNhdmUoKTsKICAgICBmbG9hdCBzY2FsZSA9IHNjYWxlRmFj dG9yKHByaW50REMsIG1hcmdpblJlY3QsIHBhZ2VSZWN0KTsKICAgICBjYWlyb19zY2FsZShwY3R4 LCBzY2FsZSwgc2NhbGUpOwogCiAgICAgSW50UmVjdCBjYWlyb01hcmdpblJlY3QgKG1hcmdpblJl Y3QpOwogICAgIGNhaXJvTWFyZ2luUmVjdC5zY2FsZSAoMSAvIHNjYWxlKTsKIAotICAgIGNhaXJv X3RyYW5zbGF0ZShwY3R4LCAtcGFnZVJlY3QueCgpICsgY2Fpcm9NYXJnaW5SZWN0LngoKSwgLXBh Z2VSZWN0LnkoKSArIGNhaXJvTWFyZ2luUmVjdC55KCkgKyBoZWFkZXJIZWlnaHQpOworICAgIC8v IE1vZGlmeSBDYWlybyBhbmQgR0RJIFdvcmxkIFRyYW5zZm9ybSB0byBhY2NvdW50IGZvciBtYXJn aW4gaW4gdGhlCisgICAgLy8gc3Vic2VxdWVudCBXZWJLaXQtY29udHJvbGxlZCAncGFpbnRDb250 ZW50cycgZHJhd2luZyBvcGVyYXRpb25zOgorICAgIHNwb29sQ3R4LT50cmFuc2xhdGUoY2Fpcm9N YXJnaW5SZWN0LngoKSwgY2Fpcm9NYXJnaW5SZWN0LnkoKSk7CisKKyAgICAvLyBNb2RpZnkgQ2Fp cm8gKG9ubHkpIHRvIGFjY291bnQgZm9yIHBhZ2UgcG9zaXRpb24uCisgICAgY2Fpcm9fdHJhbnNs YXRlKHBjdHgsIC1wYWdlUmVjdC54KCksIC1wYWdlUmVjdC55KCkgKyBoZWFkZXJIZWlnaHQpOwog ICAgIGNvcmVGcmFtZS0+dmlldygpLT5wYWludENvbnRlbnRzKHNwb29sQ3R4LCBwYWdlUmVjdCk7 CiAKLSAgICBjYWlyb190cmFuc2xhdGUocGN0eCwgcGFnZVJlY3QueCgpIC0gY2Fpcm9NYXJnaW5S ZWN0LngoKSwgcGFnZVJlY3QueSgpIC0gY2Fpcm9NYXJnaW5SZWN0LnkoKSAtIGhlYWRlckhlaWdo dCk7CisgICAgY2Fpcm9fdHJhbnNsYXRlKHBjdHgsIHBhZ2VSZWN0LngoKSwgcGFnZVJlY3QueSgp IC0gaGVhZGVySGVpZ2h0KTsKIAogICAgIFhGT1JNIG9yaWdpbmFsV29ybGQ7CiAgICAgOjpHZXRX b3JsZFRyYW5zZm9ybShwcmludERDLCAmb3JpZ2luYWxXb3JsZCk7CiAKLSAgICAvLyBQb3NpdGlv biB3b3JsZCB0cmFuc2Zvcm0gdG8gYWNjb3VudCBmb3IgbWFyZ2luCisgICAgLy8gUG9zaXRpb24g R0RJIHdvcmxkIHRyYW5zZm9ybSB0byBhY2NvdW50IGZvciBtYXJnaW4gaW4gR0RJLW9ubHkKKyAg ICAvLyBoZWFkZXIvZm9vdGVyIGNhbGxzCiAgICAgWEZPUk0gbmV3V29ybGQgPSBvcmlnaW5hbFdv cmxkOwogICAgIG5ld1dvcmxkLmVEeCA9IG1hcmdpblJlY3QueCgpOwogICAgIG5ld1dvcmxkLmVE eSA9IG1hcmdpblJlY3QueSgpOwpAQCAtMjEwNiw2ICsyMTEzLDcgQEAgdm9pZCBXZWJGcmFtZTo6 c3Bvb2xQYWdlKFBsYXRmb3JtR3JhcGhpYwogCiAgICAgY2Fpcm9fc2hvd19wYWdlKHBjdHgpOwog ICAgIEFTU0VSVCghY2Fpcm9fc3RhdHVzKHBjdHgpKTsKKyAgICBzcG9vbEN0eC0+cmVzdG9yZSgp OwogICAgIGNhaXJvX3Jlc3RvcmUocGN0eCk7CiB9CiAjZW5kaWYK