63356 2011-06-24 14:54:11 -0700 Not possible for plug-ins to override the internal PDF viewer 2011-06-24 15:35:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ap oldest_to_newest 427168 0 andersca 2011-06-24 14:54:11 -0700 Not possible for plug-ins to override the internal PDF viewer 427177 1 98546 andersca 2011-06-24 15:00:17 -0700 Created attachment 98546 Patch 427178 2 andersca 2011-06-24 15:03:59 -0700 Committed r89706: <http://trac.webkit.org/changeset/89706> 427200 3 98546 ap 2011-06-24 15:25:36 -0700 Comment on attachment 98546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98546&action=review > Source/WebKit2/WebProcess/WebProcess.cpp:739 > + // If a plug-in exists that claims to support this response, it should take precedence over the custom representation. Why? Is that the case in WebKit1? See e.g. bug 10015 comment 7. 427207 4 andersca 2011-06-24 15:35:57 -0700 (In reply to comment #3) > Why? Is that the case in WebKit1? > > See e.g. bug 10015 comment 7. With full-frame plug-ins yes. 98546 2011-06-24 15:00:17 -0700 2011-06-24 15:25:36 -0700 Patch bug-63356-20110624150016.patch text/plain 5561 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5NzA1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDYtMjQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBOb3QgcG9zc2libGUgZm9yIHBsdWctaW5zIHRvIG92ZXJy aWRlIHRoZSBpbnRlcm5hbCBQREYgdmlld2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MzM1NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTY3MzM4 Mj4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNp dGlvblRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UpOgorICAgICAg ICBQYXNzIHRoZSBlbnRpcmUgcmVzb3VyY2UgcmVzcG9uc2UgdG8gc2hvdWxkVXNlQ3VzdG9tUmVw cmVzZW50YXRpb25Gb3JSZXNwb25zZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNhblBsdWdpbkhhbmRsZVJlc3BvbnNlKToKKyAgICAg ICAgQXNrIGZvciB0aGUgcGx1Zy1pbiBwYXRoIGZvciBhIHBsdWctaW4gdGhhdCBjYW4gaGFuZGxl IHRoZSBnaXZlbiByZXNvdXJjZSByZXNwb25zZS4KKyAgICAgICAgSWYgd2UgZmFpbCB0byBzZW5k IHRoZSBtZXNzYWdlLCBvciBpZiB0aGUgcGF0aCBjb21lcyBiYWNrIGVtcHR5LCB3ZSBhc3N1bWUg dGhhdCB0aGVyZSdzIG5vIHBsdWctaW4KKyAgICAgICAgdGhhdCBjYW4gaGFuZGxlIGl0LgorCisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnNob3VsZFVzZUN1c3RvbVJlcHJlc2VudGF0aW9u Rm9yUmVzcG9uc2UpOgorICAgICAgICBJZiB0aGUgcmVzcG9uc2UgTUlNRSB0eXBlIGlzIGluIHRo ZSBtX21pbWVUeXBlc1dpdGhDdXN0b21SZXByZXNlbnRhdGlvbnMgbWFwLCBjaGVjayBpZiB0aGVy ZSdzCisgICAgICAgIGEgcGx1Zy1pbiB0aGF0IGNhbiBoYW5kbGUgdGhlIGdpdmVuIHJlc3BvbnNl LiBJZiB0aGF0IGlzIHRoZSBjYXNlLCBpdCBzaG91bGQgaGF2ZSBwcmVjZWRlbmNlIG92ZXIKKyAg ICAgICAgdGhlIGN1c3RvbSByZXByZXNlbnRhdGlvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5oOgorICAgICAgICBSZW5hbWUgc2hvdWxkVXNlQ3VzdG9tUmVwcmVzZW50YXRp b25Gb3JNSU1FVHlwZSB0byBzaG91bGRVc2VDdXN0b21SZXByZXNlbnRhdGlvbkZvclJlc3BvbnNl LgorCiAyMDExLTA2LTI0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAg ICBNYWMgYnVpbGQgZml4IGFmdGVyIHI4OTY4NQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiA4OTcwMykKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyMSw2ICs3MjEsMjUg QEAgV2ViUGFnZUdyb3VwUHJveHkqIFdlYlByb2Nlc3M6OndlYlBhZ2VHcgogICAgIHJldHVybiBy ZXN1bHQuZmlyc3QtPnNlY29uZC5nZXQoKTsKIH0KIAorc3RhdGljIGJvb2wgY2FuUGx1Z2luSGFu ZGxlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit7CisgICAgU3Ry aW5nIHBsdWdpblBhdGg7CisKKyAgICBpZiAoIVdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rp b24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYkNvbnRleHQ6OkdldFBsdWdpblBhdGgocmVzcG9u c2UubWltZVR5cGUoKSwgcmVzcG9uc2UudXJsKCkuc3RyaW5nKCkpLCBNZXNzYWdlczo6V2ViQ29u dGV4dDo6R2V0UGx1Z2luUGF0aDo6UmVwbHkocGx1Z2luUGF0aCksIDApKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICByZXR1cm4gIXBsdWdpblBhdGguaXNFbXB0eSgpOworfQorCitib29s IFdlYlByb2Nlc3M6OnNob3VsZFVzZUN1c3RvbVJlcHJlc2VudGF0aW9uRm9yUmVzcG9uc2UoY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpIGNvbnN0Cit7CisgICAgaWYgKCFtX21pbWVU eXBlc1dpdGhDdXN0b21SZXByZXNlbnRhdGlvbnMuY29udGFpbnMocmVzcG9uc2UubWltZVR5cGUo KSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIElmIGEgcGx1Zy1pbiBleGlzdHMg dGhhdCBjbGFpbXMgdG8gc3VwcG9ydCB0aGlzIHJlc3BvbnNlLCBpdCBzaG91bGQgdGFrZSBwcmVj ZWRlbmNlIG92ZXIgdGhlIGN1c3RvbSByZXByZXNlbnRhdGlvbi4KKyAgICByZXR1cm4gIWNhblBs dWdpbkhhbmRsZVJlc3BvbnNlKHJlc3BvbnNlKTsKK30KKwogdm9pZCBXZWJQcm9jZXNzOjpjbGVh clJlc291cmNlQ2FjaGVzKFJlc291cmNlQ2FjaGVzVG9DbGVhciByZXNvdXJjZUNhY2hlc1RvQ2xl YXIpCiB7CiAgICAgcGxhdGZvcm1DbGVhclJlc291cmNlQ2FjaGVzKHJlc291cmNlQ2FjaGVzVG9D bGVhcik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNp b24gODk3MDMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29y a2luZyBjb3B5KQpAQCAtNTQsNiArNTQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xh c3MgSW50U2l6ZTsKICAgICBjbGFzcyBQYWdlR3JvdXA7CiAgICAgY2xhc3MgUmVzb3VyY2VSZXF1 ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQg ewpAQCAtMTExLDcgKzExMiw3IEBAIHB1YmxpYzoKICAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIq IG5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkgeyByZXR1cm4gbV9uZXR3b3JrQWNjZXNzTWFuYWdlcjsg fQogI2VuZGlmCiAKLSAgICBib29sIHNob3VsZFVzZUN1c3RvbVJlcHJlc2VudGF0aW9uRm9yTUlN RVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3QgeyByZXR1cm4gbV9taW1lVHlwZXNX aXRoQ3VzdG9tUmVwcmVzZW50YXRpb25zLmNvbnRhaW5zKG1pbWVUeXBlKTsgfQorICAgIGJvb2wg c2hvdWxkVXNlQ3VzdG9tUmVwcmVzZW50YXRpb25Gb3JSZXNwb25zZShjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlJikgY29uc3Q7CiAKICAgICAvLyBUZXh0IENoZWNraW5nCiAgICAgY29u c3QgVGV4dENoZWNrZXJTdGF0ZSYgdGV4dENoZWNrZXJTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1f dGV4dENoZWNrZXJTdGF0ZTsgfQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAJKHJldmlzaW9uIDg5NzAzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMjEs OCArMTEyMSw4IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0MKICAg ICBXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOwogICAgIGJvb2wgaXNNYWluRnJh bWUgPSB3ZWJQYWdlLT5tYWluRnJhbWUoKSA9PSBtX2ZyYW1lOwogICAgIAotICAgIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50 TG9hZGVyKCktPnJlc3BvbnNlKCkubWltZVR5cGUoKTsKLSAgICBtX2ZyYW1lSGFzQ3VzdG9tUmVw cmVzZW50YXRpb24gPSBpc01haW5GcmFtZSAmJiBXZWJQcm9jZXNzOjpzaGFyZWQoKS5zaG91bGRV c2VDdXN0b21SZXByZXNlbnRhdGlvbkZvck1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSA9IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIo KS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKTsKKyAgICBtX2ZyYW1lSGFzQ3VzdG9tUmVw cmVzZW50YXRpb24gPSBpc01haW5GcmFtZSAmJiBXZWJQcm9jZXNzOjpzaGFyZWQoKS5zaG91bGRV c2VDdXN0b21SZXByZXNlbnRhdGlvbkZvclJlc3BvbnNlKHJlc3BvbnNlKTsKIH0KIAogdm9pZCBX ZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgpCkBA IC0xMTQ0LDggKzExNDQsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9u VG9DCiAgICAgLy8gVGhlIEhpc3RvcnlDb250cm9sbGVyIHdpbGwgdXBkYXRlIHRoZSBzY3JvbGwg cG9zaXRpb24gbGF0ZXIgaWYgbmVlZGVkLgogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3 KCktPnNldEFjdHVhbFZpc2libGVDb250ZW50UmVjdChJbnRSZWN0KEludFBvaW50Ojp6ZXJvKCks IGN1cnJlbnRWaXNpYmxlQ29udGVudFNpemUpKTsKICNlbHNlCi0gICAgY29uc3QgU3RyaW5nJiBt aW1lVHlwZSA9IG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIo KS0+cmVzcG9uc2UoKS5taW1lVHlwZSgpOwotICAgIG1fZnJhbWVIYXNDdXN0b21SZXByZXNlbnRh dGlvbiA9IGlzTWFpbkZyYW1lICYmIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnNob3VsZFVzZUN1c3Rv bVJlcHJlc2VudGF0aW9uRm9yTUlNRVR5cGUobWltZVR5cGUpOworICAgIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlID0gbV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpLT5yZXNwb25zZSgpOworICAgIG1fZnJhbWVIYXNDdXN0b21SZXByZXNlbnRh dGlvbiA9IGlzTWFpbkZyYW1lICYmIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnNob3VsZFVzZUN1c3Rv bVJlcHJlc2VudGF0aW9uRm9yUmVzcG9uc2UocmVzcG9uc2UpOwogCiAgICAgbV9mcmFtZS0+Y29y ZUZyYW1lKCktPmNyZWF0ZVZpZXcod2ViUGFnZS0+c2l6ZSgpLCBiYWNrZ3JvdW5kQ29sb3IsIGZh bHNlLCBJbnRTaXplKCksIGZhbHNlKTsKICNlbmRpZgo=