15766 2007-10-30 12:46:26 -0700 [GTK] WebKit sometimes spews binary data as text/plain into iframes 2007-11-06 16:05:23 -0800 1 1 1 Unclassified WebKit WebKitGTK 523.x (Safari 3) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 dobey webkit-unassigned jhoneycutt oldest_to_newest 59862 0 dobey 2007-10-30 12:46:26 -0700 When a plug-in is not available for a type, webkit creates a new frame and appears to dump a textual representation of the file data into it, when plug-ins are enabled. The attached patch resolves this by checking the MIME type to see if we should be creating a frame or defaulting back to ObjectTypeNone. 59863 1 16950 dobey 2007-10-30 12:47:03 -0700 Created attachment 16950 Patch to validate mime type before dumping in an iframe 59933 2 16966 dobey 2007-10-31 08:01:50 -0700 Created attachment 16966 Updated patch to match the win32 port This is an updated version of the patch to match the win32 port, with a small change to return use ObjectContentNone if the type is empty, so that we don't assume we might be able to display the content, as we don't know what it is. It also lacks the check for an available plug-in, which will be added back when plug-ins are available and working. 60004 3 16982 dobey 2007-11-01 08:28:17 -0700 Created attachment 16982 Updated patch to fix one style issue and include a ChangeLog entry in header 60068 4 16982 mrowe 2007-11-02 10:44:18 -0700 Comment on attachment 16982 Updated patch to fix one style issue and include a ChangeLog entry in header For sake of compatibility I think you should match Windows and Mac in the return value when the MIME type is empty. A minor coding style nit that should be fixed is the lack of whitespace around the + operator. You should also include your ChangeLog entry, with spaces instead of tabs for indentation, as part of the diff. 60081 5 16997 dobey 2007-11-02 14:00:17 -0700 Created attachment 16997 Update patch to match win32/osx and include ChangeLog as patch 60122 6 16997 alp 2007-11-02 18:07:51 -0700 Comment on attachment 16997 Update patch to match win32/osx and include ChangeLog as patch >Index: WebKit/gtk/ChangeLog >=================================================================== >--- WebKit/gtk/ChangeLog (revision 27376) >+++ WebKit/gtk/ChangeLog (working copy) >@@ -1,3 +1,11 @@ >+2007-11-02 Rodney Dawes <dobey@wayofthemonkey.com> >+ >+ Do some MIME type comparisons to avoid spewing flash/etc... into >+ an iframe as text/plain because the HTTP connection told us it was >+ >+ * WebCoreSupport/FrameLoaderClientGtk.cpp: >+ (FrameLoaderClient::objectContentType): >+ > 2007-10-29 Alp Toker <alp@atoker.com> > > Reviewed by Maciej. >Index: WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp >=================================================================== >--- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (revision 27376) >+++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (working copy) >@@ -226,14 +247,23 @@ Widget* FrameLoaderClient::createJavaApp > > ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType) > { >- if (url.isEmpty()) >- return ObjectContentType(); >+ String type = mimeType; >+ if (type.isEmpty()) >+ type = MIMETypeRegistry::getMIMETypeForExtension(url.path().mid(url.path().findRev('.')+1)); >+ >+ if (type.isEmpty()) >+ return WebCore::ObjectContentFrame; // Match win32/OSX behavior for now I guess we can't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" instead of an error status? That would explain why Win did the path parsing themselves. > >- // TODO: use more than just the extension to determine the content type? >- String rtype = MIMETypeRegistry::getMIMETypeForPath(url.path()); >- if (!rtype.isEmpty()) >- return ObjectContentFrame; >- return ObjectContentType(); >+ if (MIMETypeRegistry::isSupportedImageMIMEType(type)) >+ return WebCore::ObjectContentImage; >+ >+ if (PluginDatabaseGtk::installedPlugins()->isMIMETypeRegistered(mimeType)) >+ return WebCore::ObjectContentNetscapePlugin; Careful. There is no PluginDatabaseGtk yet, so this will break the build. I appreciate that you're juggling a lot of changes. Perhaps it'll be OK to comment this out along with a TODO. >+ >+ if (MIMETypeRegistry::isSupportedNonImageMIMEType(type)) >+ return WebCore::ObjectContentFrame; >+ >+ return WebCore::ObjectContentNone; > } > > String FrameLoaderClient::overrideMediaType() const 60297 7 dobey 2007-11-05 09:12:33 -0800 (In reply to comment #6) > Careful. There is no PluginDatabaseGtk yet, so this will break the build. I > appreciate that you're juggling a lot of changes. Perhaps it'll be OK to > comment this out along with a TODO. D'oh. Forgot to remove that bit. This is what happens when you do too many things at once in the same tree. :) Attaching an updated patch now. 60298 8 17043 dobey 2007-11-05 09:13:44 -0800 Created attachment 17043 Updated patch to remove the plugin-specific bit for now 60350 9 alp 2007-11-05 16:20:54 -0800 My understanding is that under this condition: url="http://www.example.com/foo.unknownextension" mimeType="" This code will return ObjectContentFrame. And under this condition: url="http://www.example.com/foo" mimeType="" It'll return ObjectContentNone. I'm not sure if this is good behaviour. Problem also seems to exist in the Win port. What do you think? 60352 10 dobey 2007-11-05 17:15:22 -0800 Yes. I think the behavior in this patch is the same for win32 and osx. It was suggested by bdash that we do the same as those for now, and then make a separate change proposal to have them all return ObjectContentNone, when we don't know what the type is. This seems to be how gecko behaves, by just ignoring the content, rather than dumping it in a frame. 60405 11 17043 darin 2007-11-06 07:51:50 -0800 Comment on attachment 17043 Updated patch to remove the plugin-specific bit for now + return WebCore::ObjectContentFrame; // Match win32/OSX behavior for now I think that's a confusing comment. What's "now"? Will this need to change in the future? If so, why? 60406 12 darin 2007-11-06 07:53:31 -0800 (In reply to comment #9) > My understanding is that under this condition: > > url="http://www.example.com/foo.unknownextension" > mimeType="" > > This code will return ObjectContentFrame. > > And under this condition: > > url="http://www.example.com/foo" > mimeType="" > > It'll return ObjectContentNone. > > I'm not sure if this is good behaviour. Problem also seems to exist in the Win > port. What do you think? I'd like to see more of the high level algorithm here in platform-independent code; that way we could correct this mistake (assuming it is one) once, rather than having multiple copies of it. We could consider changing the client function to do a smaller piece of the work. 60410 13 dobey 2007-11-06 08:37:05 -0800 (In reply to comment #11) > (From update of attachment 17043 [edit]) > + return WebCore::ObjectContentFrame; // Match win32/OSX behavior for > now > > I think that's a confusing comment. What's "now"? Will this need to change in > the future? If so, why? "Now" would be "the immediate future." As soon as this patch lands, the plan was to patch all the platforms to return ObjectContentNone in this case, to avoid dumping things into frames when we have no idea what they are, matching the behavior in Gecko. 60411 14 dobey 2007-11-06 08:41:16 -0800 (In reply to comment #12) > I'd like to see more of the high level algorithm here in platform-independent > code; that way we could correct this mistake (assuming it is one) once, rather > than having multiple copies of it. We could consider changing the client > function to do a smaller piece of the work. Does it make sense to do this? The portion to check if a plug-in is available is platform-dependent. Would the method then have to check the parent method's return value, and then see if a plug-in is available, and return the parent method's return if not? We'd have to duplicate the bits to get the MIME type String still though, in the child function, I think. 60441 15 mrowe 2007-11-06 16:05:23 -0800 Landed in r27491. 16950 2007-10-30 12:47:03 -0700 2007-10-31 08:01:50 -0700 Patch to validate mime type before dumping in an iframe webkit-frameloader-fix.patch text/plain 1664 dobey MjAwNy0xMC0zMCAgUm9kbmV5IERhd2VzICA8ZG9iZXlAd2F5b2Z0aGVtb25rZXkuY29tPgoKCURv IHNvbWUgTUlNRSB0eXBlIGNvbXBhcmlzb25zIHRvIGF2b2lkIHNwZXdpbmcgZmxhc2gvZXRjLi4u IGludG8KCWFuIGlmcmFtZSBhcyB0ZXh0L3BsYWluIGJlY2F1c2UgdGhlIEhUVFAgY29ubmVjdGlv biB0b2xkIHVzIGl0IHdhcwoKCSogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwOgoJKEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CgpJbmRleDogV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAJ KHJldmlzaW9uIDI3MjIzKQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudEd0ay5oIgogI2luY2x1ZGUg IkRvY3VtZW50TG9hZGVyLmgiCisjaW5jbHVkZSAiRE9NSW1wbGVtZW50YXRpb24uaCIKICNpbmNs dWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkZy YW1lVHJlZS5oIgpAQCAtMjI3LDEzICsyNDksMjEgQEAgV2lkZ2V0KiBGcmFtZUxvYWRlckNsaWVu dDo6Y3JlYXRlSmF2YUFwcAogT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXJDbGllbnQ6Om9i amVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkK IHsKICAgICBpZiAodXJsLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRU eXBlKCk7CisgICAgICAgIHJldHVybiBPYmplY3RDb250ZW50Tm9uZTsKIAogICAgIC8vIFRPRE86 IHVzZSBtb3JlIHRoYW4ganVzdCB0aGUgZXh0ZW5zaW9uIHRvIGRldGVybWluZSB0aGUgY29udGVu dCB0eXBlPwogICAgIFN0cmluZyBydHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBl Rm9yUGF0aCh1cmwucGF0aCgpKTsKLSAgICBpZiAoIXJ0eXBlLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuIE9iamVjdENvbnRlbnRGcmFtZTsKLSAgICByZXR1cm4gT2JqZWN0Q29udGVudFR5cGUo KTsKKyAgICBpZiAoIXJ0eXBlLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoRE9NSW1wbGVtZW50 YXRpb246OmlzWE1MTUlNRVR5cGUocnR5cGUpIHx8CisJICAgIHJ0eXBlID09ICJ0ZXh0L2h0bWwi IHx8IHJ0eXBlID09ICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiIHx8CisJICAgIHJ0eXBlID09ICJp bWFnZS9zdmcreG1sIikKKwkgICAgcmV0dXJuIE9iamVjdENvbnRlbnRGcmFtZTsKKwlpZiAocnR5 cGUuc3RhcnRzV2l0aCgiaW1hZ2UvIikpCisJICByZXR1cm4gT2JqZWN0Q29udGVudEltYWdlOwor CisJcmV0dXJuIE9iamVjdENvbnRlbnROb25lOworICAgIH0KKyAgICByZXR1cm4gT2JqZWN0Q29u dGVudE5vbmU7CiB9CiAKIFN0cmluZyBGcmFtZUxvYWRlckNsaWVudDo6b3ZlcnJpZGVNZWRpYVR5 cGUoKSBjb25zdAo= 16966 2007-10-31 08:01:50 -0700 2007-11-01 08:28:17 -0700 Updated patch to match the win32 port webkit-frameloader-fix.patch text/plain 1310 dobey SW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuY3BwCShyZXZpc2lvbiAyNzIyMykKKysrIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjYsMTQgKzI0OCwy MCBAQCBXaWRnZXQqIEZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBwCiAKIE9iamVjdENv bnRlbnRUeXBlIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJM JiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgaWYgKHVybC5pc0VtcHR5KCkp Ci0gICAgICAgIHJldHVybiBPYmplY3RDb250ZW50VHlwZSgpOworICAgIFN0cmluZyB0eXBlID0g bWltZVR5cGU7CisgICAgaWYgKHR5cGUuaXNFbXB0eSgpKQorICAgICAgICB0eXBlID0gTUlNRVR5 cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24odXJsLnBhdGgoKS5taWQodXJsLnBh dGgoKS5maW5kUmV2KCcuJykrMSkpOworCisgICAgaWYgKHR5cGUuaXNFbXB0eSgpKQorICAgICAg cmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROb25lOyAvLyBEb24ndCBhc3N1bWUgd2UgY2Fu IGVtYmVkIGl0CiAKLSAgICAvLyBUT0RPOiB1c2UgbW9yZSB0aGFuIGp1c3QgdGhlIGV4dGVuc2lv biB0byBkZXRlcm1pbmUgdGhlIGNvbnRlbnQgdHlwZT8KLSAgICBTdHJpbmcgcnR5cGUgPSBNSU1F VHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgoKSk7Ci0gICAgaWYgKCFy dHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBPYmplY3RDb250ZW50RnJhbWU7Ci0gICAg cmV0dXJuIE9iamVjdENvbnRlbnRUeXBlKCk7CisgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6Omlz U3VwcG9ydGVkSW1hZ2VNSU1FVHlwZSh0eXBlKSkKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9i amVjdENvbnRlbnRJbWFnZTsKKworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRl ZE5vbkltYWdlTUlNRVR5cGUodHlwZSkpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RD b250ZW50RnJhbWU7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7CiB9 CiAKIFN0cmluZyBGcmFtZUxvYWRlckNsaWVudDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdAo= 16982 2007-11-01 08:28:17 -0700 2007-11-02 14:00:17 -0700 Updated patch to fix one style issue and include a ChangeLog entry in header webkit-frameloader-fix.patch text/plain 1587 dobey MjAwNy0xMC0zMCAgUm9kbmV5IERhd2VzICA8ZG9iZXlAd2F5b2Z0aGVtb25rZXkuY29tPgoKCURv IHNvbWUgTUlNRSB0eXBlIGNvbXBhcmlzb25zIHRvIGF2b2lkIHNwZXdpbmcgZmxhc2gvZXRjLi4u IGludG8KCWFuIGlmcmFtZSBhcyB0ZXh0L3BsYWluIGJlY2F1c2UgdGhlIEhUVFAgY29ubmVjdGlv biB0b2xkIHVzIGl0IHdhcwoKCSogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwOgoJKEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CgpJbmRleDogV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAJ KHJldmlzaW9uIDI3MjIzKQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNiwxNCArMjQ4LDIwIEBAIFdpZGdl dCogRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUphdmFBcHAKIAogT2JqZWN0Q29udGVudFR5cGUg RnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsKLSAgICBpZiAodXJsLmlzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuIE9iamVjdENvbnRlbnRUeXBlKCk7CisgICAgU3RyaW5nIHR5cGUgPSBtaW1lVHlwZTsK KyAgICBpZiAodHlwZS5pc0VtcHR5KCkpCisgICAgICAgIHR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5 OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1cmwucGF0aCgpLm1pZCh1cmwucGF0aCgpLmZpbmRS ZXYoJy4nKSsxKSk7CisKKyAgICBpZiAodHlwZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBX ZWJDb3JlOjpPYmplY3RDb250ZW50Tm9uZTsgLy8gRG9uJ3QgYXNzdW1lIHdlIGNhbiBlbWJlZCBp dAogCi0gICAgLy8gVE9ETzogdXNlIG1vcmUgdGhhbiBqdXN0IHRoZSBleHRlbnNpb24gdG8gZGV0 ZXJtaW5lIHRoZSBjb250ZW50IHR5cGU/Ci0gICAgU3RyaW5nIHJ0eXBlID0gTUlNRVR5cGVSZWdp c3RyeTo6Z2V0TUlNRVR5cGVGb3JQYXRoKHVybC5wYXRoKCkpOwotICAgIGlmICghcnR5cGUuaXNF bXB0eSgpKQotICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOwotICAgIHJldHVybiBP YmplY3RDb250ZW50VHlwZSgpOworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRl ZEltYWdlTUlNRVR5cGUodHlwZSkpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250 ZW50SW1hZ2U7CisKKyAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWROb25JbWFn ZU1JTUVUeXBlKHR5cGUpKQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudEZy YW1lOworCisgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROb25lOwogfQogCiBTdHJp bmcgRnJhbWVMb2FkZXJDbGllbnQ6Om92ZXJyaWRlTWVkaWFUeXBlKCkgY29uc3QK 16997 2007-11-02 14:00:17 -0700 2007-11-05 09:13:44 -0800 Update patch to match win32/osx and include ChangeLog as patch webkit-frameloader-fix.patch text/plain 2003 dobey SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNzM3NikKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDctMTEtMDIgIFJvZG5leSBEYXdlcyAgPGRvYmV5 QHdheW9mdGhlbW9ua2V5LmNvbT4KKworCURvIHNvbWUgTUlNRSB0eXBlIGNvbXBhcmlzb25zIHRv IGF2b2lkIHNwZXdpbmcgZmxhc2gvZXRjLi4uIGludG8KKwlhbiBpZnJhbWUgYXMgdGV4dC9wbGFp biBiZWNhdXNlIHRoZSBIVFRQIGNvbm5lY3Rpb24gdG9sZCB1cyBpdCB3YXMKKworCSogV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgorCShGcmFtZUxvYWRlckNsaWVudDo6 b2JqZWN0Q29udGVudFR5cGUpOgorCiAyMDA3LTEwLTI5ICBBbHAgVG9rZXIgIDxhbHBAYXRva2Vy LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWouCkluZGV4OiBXZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAkocmV2aXNpb24g MjczNzYpCisrKyBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2LDE0ICsyNDcsMjMgQEAgV2lkZ2V0KiBGcmFtZUxv YWRlckNsaWVudDo6Y3JlYXRlSmF2YUFwcAogCiBPYmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRl ckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlKQogewotICAgIGlmICh1cmwuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gT2Jq ZWN0Q29udGVudFR5cGUoKTsKKyAgICBTdHJpbmcgdHlwZSA9IG1pbWVUeXBlOworICAgIGlmICh0 eXBlLmlzRW1wdHkoKSkKKyAgICAgICAgdHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVU eXBlRm9yRXh0ZW5zaW9uKHVybC5wYXRoKCkubWlkKHVybC5wYXRoKCkuZmluZFJldignLicpKzEp KTsKKworICAgIGlmICh0eXBlLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9i amVjdENvbnRlbnRGcmFtZTsgLy8gTWF0Y2ggd2luMzIvT1NYIGJlaGF2aW9yIGZvciBub3cKIAot ICAgIC8vIFRPRE86IHVzZSBtb3JlIHRoYW4ganVzdCB0aGUgZXh0ZW5zaW9uIHRvIGRldGVybWlu ZSB0aGUgY29udGVudCB0eXBlPwotICAgIFN0cmluZyBydHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6 OmdldE1JTUVUeXBlRm9yUGF0aCh1cmwucGF0aCgpKTsKLSAgICBpZiAoIXJ0eXBlLmlzRW1wdHko KSkKLSAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRGcmFtZTsKLSAgICByZXR1cm4gT2JqZWN0 Q29udGVudFR5cGUoKTsKKyAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFn ZU1JTUVUeXBlKHR5cGUpKQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudElt YWdlOworCisgICAgaWYgKFBsdWdpbkRhdGFiYXNlR3RrOjppbnN0YWxsZWRQbHVnaW5zKCktPmlz TUlNRVR5cGVSZWdpc3RlcmVkKG1pbWVUeXBlKSkKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9i amVjdENvbnRlbnROZXRzY2FwZVBsdWdpbjsKKworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojpp c1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUodHlwZSkpCisgICAgICAgIHJldHVybiBXZWJDb3Jl OjpPYmplY3RDb250ZW50RnJhbWU7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVu dE5vbmU7CiB9CiAKIFN0cmluZyBGcmFtZUxvYWRlckNsaWVudDo6b3ZlcnJpZGVNZWRpYVR5cGUo KSBjb25zdAo= 17043 2007-11-05 09:13:44 -0800 2007-11-06 07:51:50 -0800 Updated patch to remove the plugin-specific bit for now webkit-frameloader-fix.patch text/plain 1884 dobey SW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuY3BwCShyZXZpc2lvbiAyNzQzOSkKKysrIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjQsMTQgKzIyNCwy MCBAQCBXaWRnZXQqIEZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBwCiAKIE9iamVjdENv bnRlbnRUeXBlIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJM JiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgaWYgKHVybC5pc0VtcHR5KCkp Ci0gICAgICAgIHJldHVybiBPYmplY3RDb250ZW50VHlwZSgpOworICAgIFN0cmluZyB0eXBlID0g bWltZVR5cGU7CisgICAgaWYgKHR5cGUuaXNFbXB0eSgpKQorICAgICAgICB0eXBlID0gTUlNRVR5 cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24odXJsLnBhdGgoKS5taWQodXJsLnBh dGgoKS5maW5kUmV2KCcuJykrMSkpOwogCi0gICAgLy8gVE9ETzogdXNlIG1vcmUgdGhhbiBqdXN0 IHRoZSBleHRlbnNpb24gdG8gZGV0ZXJtaW5lIHRoZSBjb250ZW50IHR5cGU/Ci0gICAgU3RyaW5n IHJ0eXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JQYXRoKHVybC5wYXRoKCkp OwotICAgIGlmICghcnR5cGUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVu dEZyYW1lOwotICAgIHJldHVybiBPYmplY3RDb250ZW50VHlwZSgpOworICAgIGlmICh0eXBlLmlz RW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRGcmFtZTsgLy8g TWF0Y2ggd2luMzIvT1NYIGJlaGF2aW9yIGZvciBub3cKKworICAgIGlmIChNSU1FVHlwZVJlZ2lz dHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUodHlwZSkpCisgICAgICAgIHJldHVybiBXZWJD b3JlOjpPYmplY3RDb250ZW50SW1hZ2U7CisKKyAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNT dXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlKHR5cGUpKQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6 T2JqZWN0Q29udGVudEZyYW1lOworCisgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRO b25lOwogfQogCiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnQ6Om92ZXJyaWRlTWVkaWFUeXBlKCkg Y29uc3QKSW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9n dGsvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzQzOSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDctMTEtMDUgIFJvZG5leSBEYXdlcyAg PGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBEbyBzb21lIE1JTUUgdHlwZSBj b21wYXJpc29ucyB0byBhdm9pZCBzcGV3aW5nIGZsYXNoL2V0Yy4uLiBpbnRvCisJYW4gaWZyYW1l IGFzIHRleHQvcGxhaW4gYmVjYXVzZSB0aGUgSFRUUCBjb25uZWN0aW9uIHRvbGQgdXMgaXQgd2Fz CisKKwkqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKKwkoRnJhbWVM b2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKToKKwogMjAwNy0xMS0wNSAgTWFyayBSb3dl ICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFscCBUb2tl ci4K