17220 2008-02-08 13:41:01 -0800 Illogical dependency between PluginView and PluginDatabase 2008-02-13 09:29:08 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 dobey webkit-unassigned mrowe oldest_to_newest 69789 0 dobey 2008-02-08 13:41:01 -0800 Currently createPluginView is a class method in PluginDatabase, presumably because findPlugin was a private class method there. This is unnecessary and causes an unneeded dependency between the two classes. The attached patch makes findPlugin a public method, and moves createPluginView to the PluginView class, as well as updates the instances where it is called, to reflect this change. 69791 1 19007 dobey 2008-02-08 13:42:08 -0800 Created attachment 19007 Patch to move createPluginView method to PluginView class 69853 2 19007 aroben 2008-02-08 14:38:39 -0800 Comment on attachment 19007 Patch to move createPluginView method to PluginView class If this method is moving to the PluginView class then the method should be named simply "create" instead of "createPluginView". 69875 3 19010 dobey 2008-02-08 16:35:16 -0800 Created attachment 19010 Update to rename to PluginView::create Oops. Also forgot to change PluginDatabase:: when copying the method over. Renamed the method to PluginView::create and updated the ChangeLog entries to reflect that. 69876 4 19010 andersca 2008-02-08 16:41:21 -0800 Comment on attachment 19010 Update to rename to PluginView::create r=me 69879 5 19010 jhoneycutt 2008-02-08 17:25:50 -0800 Comment on attachment 19010 Update to rename to PluginView::create The call to PluginDatabase::installedPlugins() in PluginView::create() can't be made without making PluginView aware of PluginDatabase. Doesn't that just move the dependency around? I think the change is still OK to make, but this needs some work: + PluginView* create(Frame* parentFrame, const IntSize&, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); This needs to be static. PluginView should include PluginDatabase.h. PluginDatabase.h shouldn't include PluginView.h, but will then require KURL.h. You can then remove the "class KURL;" declaration. The ChangeLog entry should be updated. 69882 6 19012 mrowe 2008-02-08 18:41:48 -0800 Created attachment 19012 Updated patch that compiles on Windows 69883 7 mrowe 2008-02-08 18:42:40 -0800 > The call to PluginDatabase::installedPlugins() in PluginView::create() can't be > made without making PluginView aware of PluginDatabase. Doesn't that just move > the dependency around? I'm not landing this yet as I think this question still needs to be addressed. 70254 8 dobey 2008-02-11 08:16:54 -0800 (In reply to comment #7) > > The call to PluginDatabase::installedPlugins() in PluginView::create() can't be > > made without making PluginView aware of PluginDatabase. Doesn't that just move > > the dependency around? Ah, unnecessary/unneeded was the wrong term to use. Illogical is more accurate. Yes, this makes the dependency logical. PluginDatabase should only manage the PluginPackage instances, and PluginView then requests the appropriate PluginPackage from PluginDatabase, to use in the PluginView creation. 70255 9 19067 dobey 2008-02-11 08:20:23 -0800 Created attachment 19067 Updated patch with Jon's suggestions 70261 10 19067 darin 2008-02-11 09:20:47 -0800 Comment on attachment 19067 Updated patch with Jon's suggestions r=me, although I'm not entirely happy with these changes. 79 static PluginView* create(Frame* parentFrame, const IntSize&, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); We'd normally omit the name for the Element* and const KURL& parameters, because the type names make it clear what they are. 141 PluginView(Frame* parentFrame, const IntSize&, PluginPackage* plugin, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); We'd normally omit the name for the PluginPackage* parameter, because the type name makes it clear what it is. 32 #include "KURL.h" It does not seem good to add KURL.h to the PluginDatabase.h header. Why are you doing that? Please don't add more includes if you can avoid it! 55 PluginPackage* findPlugin(const KURL& url, String& mimeType); 5556 private: Please leave a blank line before the private: line. I don't think it's clear what you mean by "illogical dependency". I don't see anything illogical here. It'll be easier to understand your changes if you use more-precise language. 70273 11 dobey 2008-02-11 11:02:58 -0800 (In reply to comment #10) > (From update of attachment 19067 [edit]) > r=me, although I'm not entirely happy with these changes. I presume you meant to set review+ instead of clearing the review flag? Seems odd to say r=me, and clear the flag. :) > We'd normally omit the name for the Element* and const KURL& parameters, > because the type names make it clear what they are. > We'd normally omit the name for the PluginPackage* parameter, because the type > name makes it clear what it is. These can easily be removed. They were already there however, and I merely just copied the API between files, and changed the method name. :) > 32 #include "KURL.h" > > It does not seem good to add KURL.h to the PluginDatabase.h header. Why are you > doing that? Please don't add more includes if you can avoid it! PluginDatabase.h still uses KURL in findPlugin(). As per comment #5 from Jon: PluginDatabase.h shouldn't include PluginView.h, but will then require KURL.h. You can then remove the "class KURL;" declaration. > I don't think it's clear what you mean by "illogical dependency". I don't see > anything illogical here. It'll be easier to understand your changes if you use > more-precise language. PluginDatabase does not manage a database of PluginViews. It manages a database of PluginPackages. Asking it for a PluginView is therefore illogical, as explained in comment #8. It lacks the logical hierarchy of a well-designed API. This change makes PluginView API consistent with the PluginPackage API, where we call PluginPackage::createPackage. 70529 12 19067 aroben 2008-02-13 08:14:59 -0800 Comment on attachment 19067 Updated patch with Jon's suggestions +#include "KURL.h" #include "PlatformString.h" #include "PluginPackage.h" #include "StringHash.h" @@ -37,7 +38,6 @@ namespace WebCore { class Element; class Frame; class IntSize; - class KURL; I know Jon said to include KURL.h, but I think he was mistaken and it's not really needed. Everything should compile fine with just a forward declaration, so you should be able to undo this change. r=me 70538 13 19114 dobey 2008-02-13 09:19:54 -0800 Created attachment 19114 Updated to revert the KURL.h change in PluginDatabase.h 70539 14 aroben 2008-02-13 09:29:08 -0800 Landed in r30203 19007 2008-02-08 13:42:08 -0800 2008-02-08 16:35:16 -0800 Patch to move createPluginView method to PluginView class webkit-createpluginview.patch text/plain 7846 dobey SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiAzMDA5NikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDItMDggIFJvZG5leSBEYXdlcyAgPGRvYmV5 QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh ISkKKworICAgICAgICBVcGRhdGUgZm9yIHRoZSBtb3ZlIG9mIGNyZWF0ZVBsdWdpblZpZXcgdG8g UGx1Z2luVmlldyBmcm9tCisgICAgICAgIFBsdWdpbkRhdGFiYXNlCisKKyAgICAgICAgKiBXZWJG cmFtZS5jcHA6CisKIDIwMDgtMDItMDcgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyOTI0MzM+IGNlcnRpZmljYXRlIGF1dGhlbnRpY2F0 aW9uIHN1cHBvcnQgYnJva2VuIGluIFNhZmFyaSAzLjAKSW5kZXg6IFdlYktpdC93aW4vV2ViRnJh bWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCShyZXZpc2lvbiAz MDA5NikKKysrIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQw LDcgKzIzNDAsNyBAQCBQYXNzUmVmUHRyPEZyYW1lPiBXZWJGcmFtZTo6Y3JlYXRlRnJhbWUoCiAK IFdpZGdldCogV2ViRnJhbWU6OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBwbHVnaW5TaXpl LCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KQogewotICAgIFBsdWdpblZpZXcqIHBs dWdpblZpZXcgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5jcmVhdGVQbHVn aW5WaWV3KGNvcmUodGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1OYW1lcywg cGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOworICAgIFBsdWdpblZpZXcqIHBs dWdpblZpZXcgPSBQbHVnaW5WaWV3OjpjcmVhdGVQbHVnaW5WaWV3KGNvcmUodGhpcyksIHBsdWdp blNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBs b2FkTWFudWFsbHkpOwogCiAgICAgaWYgKHBsdWdpblZpZXctPnN0YXR1cygpID09IFBsdWdpblN0 YXR1c0xvYWRlZFN1Y2Nlc3NmdWxseSkKICAgICAgICAgcmV0dXJuIHBsdWdpblZpZXc7CkBAIC0y NDEwLDggKzI0MTAsNyBAQCB2b2lkIFdlYkZyYW1lOjpyZWRpcmVjdERhdGFUb1BsdWdpbihXaWRn CiAKIFdpZGdldCogV2ViRnJhbWU6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6 ZSYgcGx1Z2luU2l6ZSwgRWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgLypiYXNlVVJMKi8s IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg cGFyYW1WYWx1ZXMpCiB7Ci0gICAgUGx1Z2luVmlldyogcGx1Z2luVmlldyA9IFBsdWdpbkRhdGFi YXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPgotICAgICAgICBjcmVhdGVQbHVnaW5WaWV3KGNvcmUo dGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIEtVUkwoKSwgcGFyYW1OYW1lcywgcGFyYW1WYWx1 ZXMsICJhcHBsaWNhdGlvbi94LWphdmEtYXBwbGV0IiwgZmFsc2UpOworICAgIFBsdWdpblZpZXcq IHBsdWdpblZpZXcgPSBQbHVnaW5WaWV3OjpjcmVhdGVQbHVnaW5WaWV3KGNvcmUodGhpcyksIHBs dWdpblNpemUsIGVsZW1lbnQsIEtVUkwoKSwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsICJhcHBs aWNhdGlvbi94LWphdmEtYXBwbGV0IiwgZmFsc2UpOwogCiAgICAgLy8gQ2hlY2sgaWYgdGhlIHBs dWdpbiBjYW4gYmUgbG9hZGVkIHN1Y2Nlc3NmdWxseQogICAgIGlmIChwbHVnaW5WaWV3LT5wbHVn aW4oKSAmJiBwbHVnaW5WaWV3LT5wbHVnaW4oKS0+bG9hZCgpKQpJbmRleDogV2ViQ29yZS9wbHVn aW5zL1BsdWdpblZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmll dy5oCShyZXZpc2lvbiAzMDA5NikKKysrIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdv cmtpbmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGZy aWVuZCBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBQbHVnaW5WaWV3V25kUHJvYyhIV05ELCBVSU5U LCBXUEFSQU0sIExQQVJBTSk7CiAKICAgICBwdWJsaWM6Ci0gICAgICAgIFBsdWdpblZpZXcoRnJh bWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiwgUGx1Z2luUGFja2FnZSogcGx1Z2luLCBF bGVtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBj b25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGJvb2wgbG9hZE1hbnVhbGx5KTsKKyAgICAgICAgUGx1Z2luVmlldyogY3JlYXRlUGx1Z2luVmll dyhGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmLCBFbGVtZW50KiBlbGVtZW50LCBj b25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wg bG9hZE1hbnVhbGx5KTsKICAgICAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwogCiAgICAgICAg IFBsdWdpblBhY2thZ2UqIHBsdWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luLmdldCgpOyB9 CkBAIC0xMzgsNiArMTM4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMg Ym9vbCBpc0NhbGxpbmdQbHVnaW4oKTsKIAogICAgIHByaXZhdGU6CisgICAgICAgIFBsdWdpblZp ZXcoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiwgUGx1Z2luUGFja2FnZSogcGx1 Z2luLCBFbGVtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5h bWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKKwogICAgICAgICB2b2lkIHNldFBhcmFtZXRlcnMo Y29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBw YXJhbVZhbHVlcyk7CiAgICAgICAgIHZvaWQgaW5pdCgpOwogICAgICAgICBib29sIHN0YXJ0KCk7 CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuaAkocmV2aXNpb24gMzAwOTYpCisrKyBXZWJD b3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsMTcgKzQ2 LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBQbHVnaW5EYXRhYmFzZSB7CiAg ICAgcHVibGljOgogICAgICAgICBzdGF0aWMgUGx1Z2luRGF0YWJhc2UqIGluc3RhbGxlZFBsdWdp bnMoKTsKLSAgICAgICAgUGx1Z2luVmlldyogY3JlYXRlUGx1Z2luVmlldyhGcmFtZSogcGFyZW50 RnJhbWUsIGNvbnN0IEludFNpemUmLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmws IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg cGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsK IAogICAgICAgICBib29sIHJlZnJlc2goKTsKICAgICAgICAgVmVjdG9yPFBsdWdpblBhY2thZ2Uq PiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNNSU1FVHlwZVJlZ2lzdGVyZWQoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQgYWRkRXh0cmFQbHVnaW5QYXRoKGNv bnN0IFN0cmluZyYpOworCisgICAgICAgIFBsdWdpblBhY2thZ2UqIGZpbmRQbHVnaW4oY29uc3Qg S1VSTCYgdXJsLCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICBwcml2YXRlOgogICAgICAgICB2b2lk IHNldFBsdWdpblBhdGhzKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXRocykgeyBtX3BsdWdpblBh dGhzID0gcGF0aHM7IH0KICAgICAgICAgUGx1Z2luU2V0IGdldFBsdWdpbnNJblBhdGhzKCkgY29u c3Q7CiAKLSAgICAgICAgUGx1Z2luUGFja2FnZSogZmluZFBsdWdpbihjb25zdCBLVVJMJiB1cmws IFN0cmluZyYgbWltZVR5cGUpOwogICAgICAgICBQbHVnaW5QYWNrYWdlKiBwbHVnaW5Gb3JNSU1F VHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICAgICAgU3RyaW5nIE1JTUVUeXBlRm9y RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKSBjb25zdDsKIApJbmRleDogV2ViQ29y ZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5jcHAJKHJldmlzaW9uIDMwMDk2KQorKysg V2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdpbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUyMSwyMCArNTIxLDQgQEAgUGx1Z2luUGFja2FnZSogUGx1Z2luRGF0YWJhc2U6OmZpbmRQ bHVnaQogICAgIHJldHVybiBwbHVnaW47CiB9CiAKLVBsdWdpblZpZXcqIFBsdWdpbkRhdGFiYXNl OjpjcmVhdGVQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRGcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6 ZSwgRWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkKLXsKLSAgICAvLyBpZiB3ZSBmYWls IHRvIGZpbmQgYSBwbHVnaW4gZm9yIHRoaXMgTUlNRSB0eXBlLCBmaW5kUGx1Z2luIHdpbGwgc2Vh cmNoIGZvcgotICAgIC8vIGEgcGx1Z2luIGJ5IHRoZSBmaWxlIGV4dGVuc2lvbiBhbmQgdXBkYXRl IHRoZSBNSU1FIHR5cGUsIHNvIHBhc3MgYSBtdXRhYmxlIFN0cmluZwotICAgIFN0cmluZyBtaW1l VHlwZUNvcHkgPSBtaW1lVHlwZTsKLSAgICBQbHVnaW5QYWNrYWdlKiBwbHVnaW4gPSBmaW5kUGx1 Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKLSAgICAKLSAgICAvLyBObyBwbHVnaW4gd2FzIGZvdW5k LCB0cnkgcmVmcmVzaGluZyB0aGUgZGF0YWJhc2UgYW5kIHNlYXJjaGluZyBhZ2FpbgotICAgIGlm ICghcGx1Z2luICYmIHJlZnJlc2goKSkgewotICAgICAgICBtaW1lVHlwZUNvcHkgPSBtaW1lVHlw ZTsKLSAgICAgICAgcGx1Z2luID0gZmluZFBsdWdpbih1cmwsIG1pbWVUeXBlQ29weSk7Ci0gICAg fQotICAgICAgICAKLSAgICByZXR1cm4gbmV3IFBsdWdpblZpZXcocGFyZW50RnJhbWUsIHNpemUs IHBsdWdpbiwgZWxlbWVudCwgdXJsLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGVD b3B5LCBsb2FkTWFudWFsbHkpOwotfQotCiB9CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvd2luL1Bs dWdpblZpZXdXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2lu Vmlld1dpbi5jcHAJKHJldmlzaW9uIDMwMDk2KQorKysgV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVn aW5WaWV3V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcwMCw0ICsxNzAwLDIwIEBAIGJvb2wg UGx1Z2luVmlldzo6aXNDYWxsaW5nUGx1Z2luKCkKICAgICByZXR1cm4gc19jYWxsaW5nUGx1Z2lu ID4gMDsKIH0KIAorUGx1Z2luVmlldyogUGx1Z2luRGF0YWJhc2U6OmNyZWF0ZVBsdWdpblZpZXco RnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBFbGVtZW50KiBlbGVtZW50 LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJv b2wgbG9hZE1hbnVhbGx5KQoreworICAgIC8vIGlmIHdlIGZhaWwgdG8gZmluZCBhIHBsdWdpbiBm b3IgdGhpcyBNSU1FIHR5cGUsIGZpbmRQbHVnaW4gd2lsbCBzZWFyY2ggZm9yCisgICAgLy8gYSBw bHVnaW4gYnkgdGhlIGZpbGUgZXh0ZW5zaW9uIGFuZCB1cGRhdGUgdGhlIE1JTUUgdHlwZSwgc28g cGFzcyBhIG11dGFibGUgU3RyaW5nCisgICAgU3RyaW5nIG1pbWVUeXBlQ29weSA9IG1pbWVUeXBl OworICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbiA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQ bHVnaW5zKCktPmZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOworICAgIAorICAgIC8vIE5v IHBsdWdpbiB3YXMgZm91bmQsIHRyeSByZWZyZXNoaW5nIHRoZSBkYXRhYmFzZSBhbmQgc2VhcmNo aW5nIGFnYWluCisgICAgaWYgKCFwbHVnaW4gJiYgUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBs dWdpbnMoKS0+cmVmcmVzaCgpKSB7CisgICAgICAgIG1pbWVUeXBlQ29weSA9IG1pbWVUeXBlOwor ICAgICAgICBwbHVnaW4gPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5maW5k UGx1Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKKyAgICB9CisgICAgICAgIAorICAgIHJldHVybiBu ZXcgUGx1Z2luVmlldyhwYXJlbnRGcmFtZSwgc2l6ZSwgcGx1Z2luLCBlbGVtZW50LCB1cmwsIHBh cmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZUNvcHksIGxvYWRNYW51YWxseSk7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAzMDA5NikKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDItMDggIFJvZG5l eSBEYXdlcyAgPGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhISkKKworICAgICAgICBNb3ZlIGNyZWF0ZVBsdWdpblZpZXcgdG8gUGx1 Z2luVmlldyBmcm9tIFBsdWdpbkRhdGFiYXNlIHRvIGF2b2lkCisgICAgICAgIGFuIHVubmVjZXNz YXJ5IGRlcGVuZGVuY3kgYmV0d2VlbiB0aGUgdHdvCisgICAgICAgIE1ha2UgUGx1Z2luRGF0YWJh c2U6OmZpbmRQbHVnaW4gYSBwdWJsaWMgbWV0aG9kCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdp bkRhdGFiYXNlLmg6CisgICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgICog cGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAqIHBsdWdpbnMvd2lu L1BsdWdpblZpZXdXaW4uY3BwOgorCiAyMDA4LTAyLTA4ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSHlhdHQuCg== 19010 2008-02-08 16:35:16 -0800 2008-02-08 18:42:00 -0800 Update to rename to PluginView::create webkit-createpluginview.patch text/plain 7804 dobey SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiAzMDA5NikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDItMDggIFJvZG5leSBEYXdlcyAgPGRvYmV5 QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh ISkKKworICAgICAgICBVcGRhdGUgZm9yIHRoZSByZW5hbWUgb2YgUGx1Z2luRGF0YWJhc2U6OmNy ZWF0ZVBsdWdpblZpZXcgdG8KKyAgICAgICAgUGx1Z2luVmlldzo6Y3JlYXRlCisKKyAgICAgICAg KiBXZWJGcmFtZS5jcHA6CisKIDIwMDgtMDItMDcgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5j b20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyOTI0MzM+IGNlcnRpZmljYXRlIGF1dGhl bnRpY2F0aW9uIHN1cHBvcnQgYnJva2VuIGluIFNhZmFyaSAzLjAKSW5kZXg6IFdlYktpdC93aW4v V2ViRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCShyZXZp c2lvbiAzMDA5NikKKysrIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMzQwLDcgKzIzNDAsNyBAQCBQYXNzUmVmUHRyPEZyYW1lPiBXZWJGcmFtZTo6Y3JlYXRlRnJh bWUoCiAKIFdpZGdldCogV2ViRnJhbWU6OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBwbHVn aW5TaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KQogewotICAgIFBsdWdpblZp ZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5jcmVh dGVQbHVnaW5WaWV3KGNvcmUodGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1O YW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOworICAgIFBsdWdpblZp ZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5WaWV3OjpjcmVhdGUoY29yZSh0aGlzKSwgcGx1Z2luU2l6 ZSwgZWxlbWVudCwgdXJsLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGUsIGxvYWRN YW51YWxseSk7CiAKICAgICBpZiAocGx1Z2luVmlldy0+c3RhdHVzKCkgPT0gUGx1Z2luU3RhdHVz TG9hZGVkU3VjY2Vzc2Z1bGx5KQogICAgICAgICByZXR1cm4gcGx1Z2luVmlldzsKQEAgLTI0MTAs OCArMjQxMCw3IEBAIHZvaWQgV2ViRnJhbWU6OnJlZGlyZWN0RGF0YVRvUGx1Z2luKFdpZGcKIAog V2lkZ2V0KiBXZWJGcmFtZTo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBw bHVnaW5TaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiAvKmJhc2VVUkwqLywgY29u c3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJh bVZhbHVlcykKIHsKLSAgICBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3ID0gUGx1Z2luRGF0YWJhc2U6 Omluc3RhbGxlZFBsdWdpbnMoKS0+Ci0gICAgICAgIGNyZWF0ZVBsdWdpblZpZXcoY29yZSh0aGlz KSwgcGx1Z2luU2l6ZSwgZWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywg ImFwcGxpY2F0aW9uL3gtamF2YS1hcHBsZXQiLCBmYWxzZSk7CisgICAgUGx1Z2luVmlldyogcGx1 Z2luVmlldyA9IFBsdWdpblZpZXc6OmNyZWF0ZShjb3JlKHRoaXMpLCBwbHVnaW5TaXplLCBlbGVt ZW50LCBLVVJMKCksIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCAiYXBwbGljYXRpb24veC1qYXZh LWFwcGxldCIsIGZhbHNlKTsKIAogICAgIC8vIENoZWNrIGlmIHRoZSBwbHVnaW4gY2FuIGJlIGxv YWRlZCBzdWNjZXNzZnVsbHkKICAgICBpZiAocGx1Z2luVmlldy0+cGx1Z2luKCkgJiYgcGx1Z2lu Vmlldy0+cGx1Z2luKCktPmxvYWQoKSkKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAkocmV2aXNpb24g MzAwOTYpCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCSh3b3JraW5nIGNvcHkpCkBA IC03Niw3ICs3Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBmcmllbmQgc3RhdGljIExS RVNVTFQgQ0FMTEJBQ0sgUGx1Z2luVmlld1duZFByb2MoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFS QU0pOwogCiAgICAgcHVibGljOgotICAgICAgICBQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRGcmFt ZSwgY29uc3QgSW50U2l6ZSYsIFBsdWdpblBhY2thZ2UqIHBsdWdpbiwgRWxlbWVudCosIGNvbnN0 IEtVUkwmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0 cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51 YWxseSk7CisgICAgICAgIFBsdWdpblZpZXcqIGNyZWF0ZShGcmFtZSogcGFyZW50RnJhbWUsIGNv bnN0IEludFNpemUmLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1 ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKICAgICAgICAg dmlydHVhbCB+UGx1Z2luVmlldygpOwogCiAgICAgICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbigp IGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luLmdldCgpOyB9CkBAIC0xMzgsNiArMTM4LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMgYm9vbCBpc0NhbGxpbmdQbHVnaW4oKTsK IAogICAgIHByaXZhdGU6CisgICAgICAgIFBsdWdpblZpZXcoRnJhbWUqIHBhcmVudEZyYW1lLCBj b25zdCBJbnRTaXplJiwgUGx1Z2luUGFja2FnZSogcGx1Z2luLCBFbGVtZW50KiwgY29uc3QgS1VS TCYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5 KTsKKwogICAgICAgICB2b2lkIHNldFBhcmFtZXRlcnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBh cmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcyk7CiAgICAgICAgIHZv aWQgaW5pdCgpOwogICAgICAgICBib29sIHN0YXJ0KCk7CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMv UGx1Z2luRGF0YWJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0 YWJhc2UuaAkocmV2aXNpb24gMzAwOTYpCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJh c2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsMTcgKzQ2LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICBjbGFzcyBQbHVnaW5EYXRhYmFzZSB7CiAgICAgcHVibGljOgogICAgICAgICBzdGF0 aWMgUGx1Z2luRGF0YWJhc2UqIGluc3RhbGxlZFBsdWdpbnMoKTsKLSAgICAgICAgUGx1Z2luVmll dyogY3JlYXRlKEZyYW1lKiBwYXJlbnRGcmFtZSwgY29uc3QgSW50U2l6ZSYsIEVsZW1lbnQqIGVs ZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMs IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgYm9vbCBsb2FkTWFudWFsbHkpOwogCiAgICAgICAgIGJvb2wgcmVmcmVzaCgpOwogICAgICAg ICBWZWN0b3I8UGx1Z2luUGFja2FnZSo+IHBsdWdpbnMoKSBjb25zdDsKICAgICAgICAgYm9vbCBp c01JTUVUeXBlUmVnaXN0ZXJlZChjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICAgICAgdm9p ZCBhZGRFeHRyYVBsdWdpblBhdGgoY29uc3QgU3RyaW5nJik7CisKKyAgICAgICAgUGx1Z2luUGFj a2FnZSogZmluZFBsdWdpbihjb25zdCBLVVJMJiB1cmwsIFN0cmluZyYgbWltZVR5cGUpOwogICAg IHByaXZhdGU6CiAgICAgICAgIHZvaWQgc2V0UGx1Z2luUGF0aHMoY29uc3QgVmVjdG9yPFN0cmlu Zz4mIHBhdGhzKSB7IG1fcGx1Z2luUGF0aHMgPSBwYXRoczsgfQogICAgICAgICBQbHVnaW5TZXQg Z2V0UGx1Z2luc0luUGF0aHMoKSBjb25zdDsKIAotICAgICAgICBQbHVnaW5QYWNrYWdlKiBmaW5k UGx1Z2luKGNvbnN0IEtVUkwmIHVybCwgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIFBsdWdp blBhY2thZ2UqIHBsdWdpbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogICAg ICAgICBTdHJpbmcgTUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb24p IGNvbnN0OwogCkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNw cAkocmV2aXNpb24gMzAwOTYpCisrKyBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNl V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIxLDIwICs1MjEsNCBAQCBQbHVnaW5QYWNrYWdl KiBQbHVnaW5EYXRhYmFzZTo6ZmluZFBsdWdpCiAgICAgcmV0dXJuIHBsdWdpbjsKIH0KIAotUGx1 Z2luVmlldyogUGx1Z2luRGF0YWJhc2U6OmNyZWF0ZVBsdWdpblZpZXcoRnJhbWUqIHBhcmVudEZy YW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1 cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5 KQotewotICAgIC8vIGlmIHdlIGZhaWwgdG8gZmluZCBhIHBsdWdpbiBmb3IgdGhpcyBNSU1FIHR5 cGUsIGZpbmRQbHVnaW4gd2lsbCBzZWFyY2ggZm9yCi0gICAgLy8gYSBwbHVnaW4gYnkgdGhlIGZp bGUgZXh0ZW5zaW9uIGFuZCB1cGRhdGUgdGhlIE1JTUUgdHlwZSwgc28gcGFzcyBhIG11dGFibGUg U3RyaW5nCi0gICAgU3RyaW5nIG1pbWVUeXBlQ29weSA9IG1pbWVUeXBlOwotICAgIFBsdWdpblBh Y2thZ2UqIHBsdWdpbiA9IGZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOwotICAgIAotICAg IC8vIE5vIHBsdWdpbiB3YXMgZm91bmQsIHRyeSByZWZyZXNoaW5nIHRoZSBkYXRhYmFzZSBhbmQg c2VhcmNoaW5nIGFnYWluCi0gICAgaWYgKCFwbHVnaW4gJiYgcmVmcmVzaCgpKSB7Ci0gICAgICAg IG1pbWVUeXBlQ29weSA9IG1pbWVUeXBlOwotICAgICAgICBwbHVnaW4gPSBmaW5kUGx1Z2luKHVy bCwgbWltZVR5cGVDb3B5KTsKLSAgICB9Ci0gICAgICAgIAotICAgIHJldHVybiBuZXcgUGx1Z2lu VmlldyhwYXJlbnRGcmFtZSwgc2l6ZSwgcGx1Z2luLCBlbGVtZW50LCB1cmwsIHBhcmFtTmFtZXMs IHBhcmFtVmFsdWVzLCBtaW1lVHlwZUNvcHksIGxvYWRNYW51YWxseSk7Ci19Ci0KIH0KSW5kZXg6 IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2luLmNwcAkocmV2aXNpb24gMzAwOTYpCisrKyBX ZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NzAwLDQgKzE3MDAsMjAgQEAgYm9vbCBQbHVnaW5WaWV3Ojppc0NhbGxpbmdQbHVnaW4oKQogICAg IHJldHVybiBzX2NhbGxpbmdQbHVnaW4gPiAwOwogfQogCitQbHVnaW5WaWV3KiBQbHVnaW5WaWV3 OjpjcmVhdGUoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBFbGVtZW50 KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5h bWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KQoreworICAgIC8vIGlmIHdlIGZhaWwgdG8gZmluZCBh IHBsdWdpbiBmb3IgdGhpcyBNSU1FIHR5cGUsIGZpbmRQbHVnaW4gd2lsbCBzZWFyY2ggZm9yCisg ICAgLy8gYSBwbHVnaW4gYnkgdGhlIGZpbGUgZXh0ZW5zaW9uIGFuZCB1cGRhdGUgdGhlIE1JTUUg dHlwZSwgc28gcGFzcyBhIG11dGFibGUgU3RyaW5nCisgICAgU3RyaW5nIG1pbWVUeXBlQ29weSA9 IG1pbWVUeXBlOworICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbiA9IFBsdWdpbkRhdGFiYXNlOjpp bnN0YWxsZWRQbHVnaW5zKCktPmZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOworICAgIAor ICAgIC8vIE5vIHBsdWdpbiB3YXMgZm91bmQsIHRyeSByZWZyZXNoaW5nIHRoZSBkYXRhYmFzZSBh bmQgc2VhcmNoaW5nIGFnYWluCisgICAgaWYgKCFwbHVnaW4gJiYgUGx1Z2luRGF0YWJhc2U6Omlu c3RhbGxlZFBsdWdpbnMoKS0+cmVmcmVzaCgpKSB7CisgICAgICAgIG1pbWVUeXBlQ29weSA9IG1p bWVUeXBlOworICAgICAgICBwbHVnaW4gPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lu cygpLT5maW5kUGx1Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKKyAgICB9CisgICAgICAgIAorICAg IHJldHVybiBuZXcgUGx1Z2luVmlldyhwYXJlbnRGcmFtZSwgc2l6ZSwgcGx1Z2luLCBlbGVtZW50 LCB1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZUNvcHksIGxvYWRNYW51YWxs eSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAzMDA5NikKKysrIFdl YkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDIt MDggIFJvZG5leSBEYXdlcyAgPGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhISkKKworICAgICAgICBSZW5hbWUgUGx1Z2luRGF0YWJh c2U6OmNyZWF0ZVBsdWdpblZpZXcgdG8gUGx1Z2luVmlldzo6Y3JlYXRlIHRvIGF2b2lkCisgICAg ICAgIGFuIHVubmVjZXNzYXJ5IGRlcGVuZGVuY3kgYmV0d2VlbiB0aGUgdHdvCisgICAgICAgIE1h a2UgUGx1Z2luRGF0YWJhc2U6OmZpbmRQbHVnaW4gYSBwdWJsaWMgbWV0aG9kCisKKyAgICAgICAg KiBwbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmg6CisgICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3 Lmg6CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAg ICAqIHBsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwOgorCiAyMDA4LTAyLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSHlhdHQuCg== 19012 2008-02-08 18:41:48 -0800 2008-02-11 08:20:23 -0800 Updated patch that compiles on Windows plugindatabase-pluginview.patch text/plain 8436 mrowe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMDEwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDItMDggIFJvZG5leSBEYXdlcyAgPGRvYmV5QHdheW9mdGhl bW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhISkKKworICAg ICAgICBSZW5hbWUgUGx1Z2luRGF0YWJhc2U6OmNyZWF0ZVBsdWdpblZpZXcgdG8gUGx1Z2luVmll dzo6Y3JlYXRlIHRvIGF2b2lkCisgICAgICAgIGFuIHVubmVjZXNzYXJ5IGRlcGVuZGVuY3kgYmV0 d2VlbiB0aGUgdHdvCisgICAgICAgIE1ha2UgUGx1Z2luRGF0YWJhc2U6OmZpbmRQbHVnaW4gYSBw dWJsaWMgbWV0aG9kCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmg6CisgICAg ICAgICogcGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2lu RGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3Bw OgorCiAyMDA4LTAyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWl0ei4KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5E YXRhYmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5o CShyZXZpc2lvbiAzMDEwMSkKKysrIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zOSwyNCArMzksMjMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg IGNsYXNzIEludFNpemU7CiAgICAgY2xhc3MgS1VSTDsKICAgICBjbGFzcyBQbHVnaW5QYWNrYWdl OwotICAgIGNsYXNzIFBsdWdpblZpZXc7CiAKICAgICB0eXBlZGVmIEhhc2hTZXQ8UmVmUHRyPFBs dWdpblBhY2thZ2U+LCBQbHVnaW5QYWNrYWdlSGFzaD4gUGx1Z2luU2V0OwogICAKICAgICBjbGFz cyBQbHVnaW5EYXRhYmFzZSB7CiAgICAgcHVibGljOgogICAgICAgICBzdGF0aWMgUGx1Z2luRGF0 YWJhc2UqIGluc3RhbGxlZFBsdWdpbnMoKTsKLSAgICAgICAgUGx1Z2luVmlldyogY3JlYXRlUGx1 Z2luVmlldyhGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmLCBFbGVtZW50KiBlbGVt ZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBj b25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IGJvb2wgbG9hZE1hbnVhbGx5KTsKIAogICAgICAgICBib29sIHJlZnJlc2goKTsKICAgICAgICAg VmVjdG9yPFBsdWdpblBhY2thZ2UqPiBwbHVnaW5zKCkgY29uc3Q7CiAgICAgICAgIGJvb2wgaXNN SU1FVHlwZVJlZ2lzdGVyZWQoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIHZvaWQg YWRkRXh0cmFQbHVnaW5QYXRoKGNvbnN0IFN0cmluZyYpOworCisgICAgICAgIFBsdWdpblBhY2th Z2UqIGZpbmRQbHVnaW4oY29uc3QgS1VSTCYgdXJsLCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICBw cml2YXRlOgogICAgICAgICB2b2lkIHNldFBsdWdpblBhdGhzKGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBwYXRocykgeyBtX3BsdWdpblBhdGhzID0gcGF0aHM7IH0KICAgICAgICAgUGx1Z2luU2V0IGdl dFBsdWdpbnNJblBhdGhzKCkgY29uc3Q7CiAKLSAgICAgICAgUGx1Z2luUGFja2FnZSogZmluZFBs dWdpbihjb25zdCBLVVJMJiB1cmwsIFN0cmluZyYgbWltZVR5cGUpOwogICAgICAgICBQbHVnaW5Q YWNrYWdlKiBwbHVnaW5Gb3JNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICAg ICAgU3RyaW5nIE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKSBj b25zdDsKIApJbmRleDogV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCShyZXZpc2lvbiAzMDEwMSkKKysrIFdlYkNv cmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGZyaWVuZCBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBQ bHVnaW5WaWV3V25kUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAKICAgICBwdWJs aWM6Ci0gICAgICAgIFBsdWdpblZpZXcoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXpl JiwgUGx1Z2luUGFja2FnZSogcGx1Z2luLCBFbGVtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1 ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKKyAgICAgICAg c3RhdGljIFBsdWdpblZpZXcqIGNyZWF0ZShGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNp emUmLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKICAgICAgICAgdmlydHVhbCB+ UGx1Z2luVmlldygpOwogCiAgICAgICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbigpIGNvbnN0IHsg cmV0dXJuIG1fcGx1Z2luLmdldCgpOyB9CkBAIC0xMzgsNiArMTM4LDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICBzdGF0aWMgYm9vbCBpc0NhbGxpbmdQbHVnaW4oKTsKIAogICAgIHBy aXZhdGU6CisgICAgICAgIFBsdWdpblZpZXcoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRT aXplJiwgUGx1Z2luUGFja2FnZSogcGx1Z2luLCBFbGVtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1W YWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKKwogICAg ICAgICB2b2lkIHNldFBhcmFtZXRlcnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMs IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcyk7CiAgICAgICAgIHZvaWQgaW5pdCgp OwogICAgICAgICBib29sIHN0YXJ0KCk7CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdp bkRhdGFiYXNlV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdp bkRhdGFiYXNlV2luLmNwcAkocmV2aXNpb24gMzAxMDEpCisrKyBXZWJDb3JlL3BsdWdpbnMvd2lu L1BsdWdpbkRhdGFiYXNlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsOSArMjYsOSBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCiAKLSNpbmNs dWRlICJQbHVnaW5QYWNrYWdlLmgiCi0jaW5jbHVkZSAiUGx1Z2luVmlldy5oIgorI2luY2x1ZGUg IktVUkwuaCIKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIlBsdWdpblBhY2thZ2UuaCIK ICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAjaW5jbHVkZSA8c2hsd2FwaS5oPgogCkBAIC01MjEsMjAg KzUyMSw0IEBAIFBsdWdpblBhY2thZ2UqIFBsdWdpbkRhdGFiYXNlOjpmaW5kUGx1Z2kKICAgICBy ZXR1cm4gcGx1Z2luOwogfQogCi1QbHVnaW5WaWV3KiBQbHVnaW5EYXRhYmFzZTo6Y3JlYXRlUGx1 Z2luVmlldyhGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmIHNpemUsIEVsZW1lbnQq IGVsZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFt ZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCi17Ci0gICAgLy8gaWYgd2UgZmFpbCB0byBmaW5kIGEg cGx1Z2luIGZvciB0aGlzIE1JTUUgdHlwZSwgZmluZFBsdWdpbiB3aWxsIHNlYXJjaCBmb3IKLSAg ICAvLyBhIHBsdWdpbiBieSB0aGUgZmlsZSBleHRlbnNpb24gYW5kIHVwZGF0ZSB0aGUgTUlNRSB0 eXBlLCBzbyBwYXNzIGEgbXV0YWJsZSBTdHJpbmcKLSAgICBTdHJpbmcgbWltZVR5cGVDb3B5ID0g bWltZVR5cGU7Ci0gICAgUGx1Z2luUGFja2FnZSogcGx1Z2luID0gZmluZFBsdWdpbih1cmwsIG1p bWVUeXBlQ29weSk7Ci0gICAgCi0gICAgLy8gTm8gcGx1Z2luIHdhcyBmb3VuZCwgdHJ5IHJlZnJl c2hpbmcgdGhlIGRhdGFiYXNlIGFuZCBzZWFyY2hpbmcgYWdhaW4KLSAgICBpZiAoIXBsdWdpbiAm JiByZWZyZXNoKCkpIHsKLSAgICAgICAgbWltZVR5cGVDb3B5ID0gbWltZVR5cGU7Ci0gICAgICAg IHBsdWdpbiA9IGZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOwotICAgIH0KLSAgICAgICAg Ci0gICAgcmV0dXJuIG5ldyBQbHVnaW5WaWV3KHBhcmVudEZyYW1lLCBzaXplLCBwbHVnaW4sIGVs ZW1lbnQsIHVybCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlQ29weSwgbG9hZE1h bnVhbGx5KTsKLX0KLQogfQpJbmRleDogV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2lu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3Bw CShyZXZpc2lvbiAzMDEwMSkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAKICNpbmNsdWRlICJranNfYmluZGlu Zy5oIgogI2luY2x1ZGUgImtqc19wcm94eS5oIgogI2luY2x1ZGUgImtqc193aW5kb3cuaCIKKyNp bmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgogI2luY2x1ZGUgIlBsdWdpbkRlYnVnLmgiCiAjaW5j bHVkZSAiUGx1Z2luUGFja2FnZS5oIgogI2luY2x1ZGUgIm5wcnVudGltZV9pbXBsLmgiCkBAIC0x NzAwLDQgKzE3MDEsMjAgQEAgYm9vbCBQbHVnaW5WaWV3Ojppc0NhbGxpbmdQbHVnaW4oKQogICAg IHJldHVybiBzX2NhbGxpbmdQbHVnaW4gPiAwOwogfQogCitQbHVnaW5WaWV3KiBQbHVnaW5WaWV3 OjpjcmVhdGUoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBFbGVtZW50 KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5h bWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KQoreworICAgIC8vIGlmIHdlIGZhaWwgdG8gZmluZCBh IHBsdWdpbiBmb3IgdGhpcyBNSU1FIHR5cGUsIGZpbmRQbHVnaW4gd2lsbCBzZWFyY2ggZm9yCisg ICAgLy8gYSBwbHVnaW4gYnkgdGhlIGZpbGUgZXh0ZW5zaW9uIGFuZCB1cGRhdGUgdGhlIE1JTUUg dHlwZSwgc28gcGFzcyBhIG11dGFibGUgU3RyaW5nCisgICAgU3RyaW5nIG1pbWVUeXBlQ29weSA9 IG1pbWVUeXBlOworICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbiA9IFBsdWdpbkRhdGFiYXNlOjpp bnN0YWxsZWRQbHVnaW5zKCktPmZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOworICAgIAor ICAgIC8vIE5vIHBsdWdpbiB3YXMgZm91bmQsIHRyeSByZWZyZXNoaW5nIHRoZSBkYXRhYmFzZSBh bmQgc2VhcmNoaW5nIGFnYWluCisgICAgaWYgKCFwbHVnaW4gJiYgUGx1Z2luRGF0YWJhc2U6Omlu c3RhbGxlZFBsdWdpbnMoKS0+cmVmcmVzaCgpKSB7CisgICAgICAgIG1pbWVUeXBlQ29weSA9IG1p bWVUeXBlOworICAgICAgICBwbHVnaW4gPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lu cygpLT5maW5kUGx1Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKKyAgICB9CisgICAgICAgIAorICAg IHJldHVybiBuZXcgUGx1Z2luVmlldyhwYXJlbnRGcmFtZSwgc2l6ZSwgcGx1Z2luLCBlbGVtZW50 LCB1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZUNvcHksIGxvYWRNYW51YWxs eSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiAzMDEwMSkK KysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAK KzIwMDgtMDItMDggIFJvZG5leSBEYXdlcyAgPGRvYmV5QHdheW9mdGhlbW9ua2V5LmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhISkKKworICAgICAgICBVcGRhdGUgZm9y IHRoZSByZW5hbWUgb2YgUGx1Z2luRGF0YWJhc2U6OmNyZWF0ZVBsdWdpblZpZXcgdG8KKyAgICAg ICAgUGx1Z2luVmlldzo6Y3JlYXRlCisKKyAgICAgICAgKiBXZWJGcmFtZS5jcHA6CisKIDIwMDgt MDItMDcgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzUyOTI0MzM+IGNlcnRpZmljYXRlIGF1dGhlbnRpY2F0aW9uIHN1cHBvcnQgYnJva2Vu IGluIFNhZmFyaSAzLjAKSW5kZXg6IFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCShyZXZpc2lvbiAzMDEwMSkKKysrIFdlYktpdC93 aW4vV2ViRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQwLDcgKzIzNDAsNyBAQCBQYXNz UmVmUHRyPEZyYW1lPiBXZWJGcmFtZTo6Y3JlYXRlRnJhbWUoCiAKIFdpZGdldCogV2ViRnJhbWU6 OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBFbGVtZW50KiBlbGVtZW50 LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJv b2wgbG9hZE1hbnVhbGx5KQogewotICAgIFBsdWdpblZpZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5E YXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5jcmVhdGVQbHVnaW5WaWV3KGNvcmUodGhpcyks IHBsdWdpblNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVU eXBlLCBsb2FkTWFudWFsbHkpOworICAgIFBsdWdpblZpZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5W aWV3OjpjcmVhdGUoY29yZSh0aGlzKSwgcGx1Z2luU2l6ZSwgZWxlbWVudCwgdXJsLCBwYXJhbU5h bWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGUsIGxvYWRNYW51YWxseSk7CiAKICAgICBpZiAocGx1 Z2luVmlldy0+c3RhdHVzKCkgPT0gUGx1Z2luU3RhdHVzTG9hZGVkU3VjY2Vzc2Z1bGx5KQogICAg ICAgICByZXR1cm4gcGx1Z2luVmlldzsKQEAgLTI0MTAsOCArMjQxMCw3IEBAIHZvaWQgV2ViRnJh bWU6OnJlZGlyZWN0RGF0YVRvUGx1Z2luKFdpZGcKIAogV2lkZ2V0KiBXZWJGcmFtZTo6Y3JlYXRl SmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBFbGVtZW50KiBlbGVt ZW50LCBjb25zdCBLVVJMJiAvKmJhc2VVUkwqLywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFt TmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcykKIHsKLSAgICBQbHVnaW5W aWV3KiBwbHVnaW5WaWV3ID0gUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+Ci0g ICAgICAgIGNyZWF0ZVBsdWdpblZpZXcoY29yZSh0aGlzKSwgcGx1Z2luU2l6ZSwgZWxlbWVudCwg S1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgImFwcGxpY2F0aW9uL3gtamF2YS1hcHBs ZXQiLCBmYWxzZSk7CisgICAgUGx1Z2luVmlldyogcGx1Z2luVmlldyA9IFBsdWdpblZpZXc6OmNy ZWF0ZShjb3JlKHRoaXMpLCBwbHVnaW5TaXplLCBlbGVtZW50LCBLVVJMKCksIHBhcmFtTmFtZXMs IHBhcmFtVmFsdWVzLCAiYXBwbGljYXRpb24veC1qYXZhLWFwcGxldCIsIGZhbHNlKTsKIAogICAg IC8vIENoZWNrIGlmIHRoZSBwbHVnaW4gY2FuIGJlIGxvYWRlZCBzdWNjZXNzZnVsbHkKICAgICBp ZiAocGx1Z2luVmlldy0+cGx1Z2luKCkgJiYgcGx1Z2luVmlldy0+cGx1Z2luKCktPmxvYWQoKSkK 19067 2008-02-11 08:20:23 -0800 2008-02-13 09:19:54 -0800 Updated patch with Jon's suggestions webkit-createpluginview.patch text/plain 8739 dobey SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiAzMDE0MCkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDItMDggIFJvZG5leSBEYXdlcyAgPGRvYmV5 QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh ISkKKworICAgICAgICBVcGRhdGUgZm9yIHRoZSByZW5hbWUgb2YgUGx1Z2luRGF0YWJhc2U6OmNy ZWF0ZVBsdWdpblZpZXcKKyAgICAgICAgdG8gUGx1Z2luVmlldzo6Y3JlYXRlCisKKyAgICAgICAg KiBXZWJGcmFtZS5jcHA6CisKIDIwMDgtMDItMDcgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5j b20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyOTI0MzM+IGNlcnRpZmljYXRlIGF1dGhl bnRpY2F0aW9uIHN1cHBvcnQgYnJva2VuIGluIFNhZmFyaSAzLjAKSW5kZXg6IFdlYktpdC93aW4v V2ViRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCShyZXZp c2lvbiAzMDE0MCkKKysrIFdlYktpdC93aW4vV2ViRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMzQwLDcgKzIzNDAsNyBAQCBQYXNzUmVmUHRyPEZyYW1lPiBXZWJGcmFtZTo6Y3JlYXRlRnJh bWUoCiAKIFdpZGdldCogV2ViRnJhbWU6OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBwbHVn aW5TaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KQogewotICAgIFBsdWdpblZp ZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5jcmVh dGVQbHVnaW5WaWV3KGNvcmUodGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1O YW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOworICAgIFBsdWdpblZp ZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5WaWV3OjpjcmVhdGUoY29yZSh0aGlzKSwgcGx1Z2luU2l6 ZSwgZWxlbWVudCwgdXJsLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGUsIGxvYWRN YW51YWxseSk7CiAKICAgICBpZiAocGx1Z2luVmlldy0+c3RhdHVzKCkgPT0gUGx1Z2luU3RhdHVz TG9hZGVkU3VjY2Vzc2Z1bGx5KQogICAgICAgICByZXR1cm4gcGx1Z2luVmlldzsKQEAgLTI0MTAs OCArMjQxMCw3IEBAIHZvaWQgV2ViRnJhbWU6OnJlZGlyZWN0RGF0YVRvUGx1Z2luKFdpZGcKIAog V2lkZ2V0KiBXZWJGcmFtZTo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBw bHVnaW5TaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJMJiAvKmJhc2VVUkwqLywgY29u c3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJh bVZhbHVlcykKIHsKLSAgICBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3ID0gUGx1Z2luRGF0YWJhc2U6 Omluc3RhbGxlZFBsdWdpbnMoKS0+Ci0gICAgICAgIGNyZWF0ZVBsdWdpblZpZXcoY29yZSh0aGlz KSwgcGx1Z2luU2l6ZSwgZWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywg ImFwcGxpY2F0aW9uL3gtamF2YS1hcHBsZXQiLCBmYWxzZSk7CisgICAgUGx1Z2luVmlldyogcGx1 Z2luVmlldyA9IFBsdWdpblZpZXc6OmNyZWF0ZShjb3JlKHRoaXMpLCBwbHVnaW5TaXplLCBlbGVt ZW50LCBLVVJMKCksIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCAiYXBwbGljYXRpb24veC1qYXZh LWFwcGxldCIsIGZhbHNlKTsKIAogICAgIC8vIENoZWNrIGlmIHRoZSBwbHVnaW4gY2FuIGJlIGxv YWRlZCBzdWNjZXNzZnVsbHkKICAgICBpZiAocGx1Z2luVmlldy0+cGx1Z2luKCkgJiYgcGx1Z2lu Vmlldy0+cGx1Z2luKCktPmxvYWQoKSkKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAkocmV2aXNpb24g MzAxNDApCisrKyBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCSh3b3JraW5nIGNvcHkpCkBA IC03Niw3ICs3Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBmcmllbmQgc3RhdGljIExS RVNVTFQgQ0FMTEJBQ0sgUGx1Z2luVmlld1duZFByb2MoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFS QU0pOwogCiAgICAgcHVibGljOgotICAgICAgICBQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRGcmFt ZSwgY29uc3QgSW50U2l6ZSYsIFBsdWdpblBhY2thZ2UqIHBsdWdpbiwgRWxlbWVudCosIGNvbnN0 IEtVUkwmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0 cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51 YWxseSk7CisgICAgICAgIHN0YXRpYyBQbHVnaW5WaWV3KiBjcmVhdGUoRnJhbWUqIHBhcmVudEZy YW1lLCBjb25zdCBJbnRTaXplJiwgRWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgdXJsLCBj b25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBh cmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSk7CiAg ICAgICAgIHZpcnR1YWwgflBsdWdpblZpZXcoKTsKIAogICAgICAgICBQbHVnaW5QYWNrYWdlKiBw bHVnaW4oKSBjb25zdCB7IHJldHVybiBtX3BsdWdpbi5nZXQoKTsgfQpAQCAtMTM4LDYgKzEzOCw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIGJvb2wgaXNDYWxsaW5nUGx1 Z2luKCk7CiAKICAgICBwcml2YXRlOgorICAgICAgICBQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRG cmFtZSwgY29uc3QgSW50U2l6ZSYsIFBsdWdpblBhY2thZ2UqIHBsdWdpbiwgRWxlbWVudCosIGNv bnN0IEtVUkwmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9y PFN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRN YW51YWxseSk7CisKICAgICAgICAgdm9pZCBzZXRQYXJhbWV0ZXJzKGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpOwogICAg ICAgICB2b2lkIGluaXQoKTsKICAgICAgICAgYm9vbCBzdGFydCgpOwpJbmRleDogV2ViQ29yZS9w bHVnaW5zL1BsdWdpbkRhdGFiYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL1Bs dWdpbkRhdGFiYXNlLmgJKHJldmlzaW9uIDMwMTQwKQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdp bkRhdGFiYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KIAorI2luY2x1ZGUgIktVUkwu aCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlBsdWdpblBhY2thZ2Uu aCIKICNpbmNsdWRlICJTdHJpbmdIYXNoLmgiCkBAIC0zNyw3ICszOCw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICBjbGFzcyBFbGVtZW50OwogICAgIGNsYXNzIEZyYW1lOwogICAgIGNsYXNz IEludFNpemU7Ci0gICAgY2xhc3MgS1VSTDsKICAgICBjbGFzcyBQbHVnaW5QYWNrYWdlOwogICAg IGNsYXNzIFBsdWdpblZpZXc7CiAKQEAgLTQ2LDE3ICs0NiwxNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgY2xhc3MgUGx1Z2luRGF0YWJhc2UgewogICAgIHB1YmxpYzoKICAgICAgICAgc3Rh dGljIFBsdWdpbkRhdGFiYXNlKiBpbnN0YWxsZWRQbHVnaW5zKCk7Ci0gICAgICAgIFBsdWdpblZp ZXcqIGNyZWF0ZVBsdWdpblZpZXcoRnJhbWUqIHBhcmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiwg RWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYg cGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJp bmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSk7CiAKICAgICAgICAgYm9vbCByZWZyZXNo KCk7CiAgICAgICAgIFZlY3RvcjxQbHVnaW5QYWNrYWdlKj4gcGx1Z2lucygpIGNvbnN0OwogICAg ICAgICBib29sIGlzTUlNRVR5cGVSZWdpc3RlcmVkKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwog ICAgICAgICB2b2lkIGFkZEV4dHJhUGx1Z2luUGF0aChjb25zdCBTdHJpbmcmKTsKKworICAgICAg ICBQbHVnaW5QYWNrYWdlKiBmaW5kUGx1Z2luKGNvbnN0IEtVUkwmIHVybCwgU3RyaW5nJiBtaW1l VHlwZSk7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRQbHVnaW5QYXRocyhjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGF0aHMpIHsgbV9wbHVnaW5QYXRocyA9IHBhdGhzOyB9CiAgICAgICAg IFBsdWdpblNldCBnZXRQbHVnaW5zSW5QYXRocygpIGNvbnN0OwogCi0gICAgICAgIFBsdWdpblBh Y2thZ2UqIGZpbmRQbHVnaW4oY29uc3QgS1VSTCYgdXJsLCBTdHJpbmcmIG1pbWVUeXBlKTsKICAg ICAgICAgUGx1Z2luUGFja2FnZSogcGx1Z2luRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1l VHlwZSk7CiAgICAgICAgIFN0cmluZyBNSU1FVHlwZUZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcm IGV4dGVuc2lvbikgY29uc3Q7CiAKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0 YWJhc2VXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0 YWJhc2VXaW4uY3BwCShyZXZpc2lvbiAzMDE0MCkKKysrIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1 Z2luRGF0YWJhc2VXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw2IEBACiAjaW5j bHVkZSAiUGx1Z2luRGF0YWJhc2UuaCIKIAogI2luY2x1ZGUgIlBsdWdpblBhY2thZ2UuaCIKLSNp bmNsdWRlICJQbHVnaW5WaWV3LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlIDx3aW5k b3dzLmg+CiAjaW5jbHVkZSA8c2hsd2FwaS5oPgpAQCAtNTIxLDIwICs1MjAsNCBAQCBQbHVnaW5Q YWNrYWdlKiBQbHVnaW5EYXRhYmFzZTo6ZmluZFBsdWdpCiAgICAgcmV0dXJuIHBsdWdpbjsKIH0K IAotUGx1Z2luVmlldyogUGx1Z2luRGF0YWJhc2U6OmNyZWF0ZVBsdWdpblZpZXcoRnJhbWUqIHBh cmVudEZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBFbGVtZW50KiBlbGVtZW50LCBjb25zdCBL VVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8 U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1h bnVhbGx5KQotewotICAgIC8vIGlmIHdlIGZhaWwgdG8gZmluZCBhIHBsdWdpbiBmb3IgdGhpcyBN SU1FIHR5cGUsIGZpbmRQbHVnaW4gd2lsbCBzZWFyY2ggZm9yCi0gICAgLy8gYSBwbHVnaW4gYnkg dGhlIGZpbGUgZXh0ZW5zaW9uIGFuZCB1cGRhdGUgdGhlIE1JTUUgdHlwZSwgc28gcGFzcyBhIG11 dGFibGUgU3RyaW5nCi0gICAgU3RyaW5nIG1pbWVUeXBlQ29weSA9IG1pbWVUeXBlOwotICAgIFBs dWdpblBhY2thZ2UqIHBsdWdpbiA9IGZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOwotICAg IAotICAgIC8vIE5vIHBsdWdpbiB3YXMgZm91bmQsIHRyeSByZWZyZXNoaW5nIHRoZSBkYXRhYmFz ZSBhbmQgc2VhcmNoaW5nIGFnYWluCi0gICAgaWYgKCFwbHVnaW4gJiYgcmVmcmVzaCgpKSB7Ci0g ICAgICAgIG1pbWVUeXBlQ29weSA9IG1pbWVUeXBlOwotICAgICAgICBwbHVnaW4gPSBmaW5kUGx1 Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKLSAgICB9Ci0gICAgICAgIAotICAgIHJldHVybiBuZXcg UGx1Z2luVmlldyhwYXJlbnRGcmFtZSwgc2l6ZSwgcGx1Z2luLCBlbGVtZW50LCB1cmwsIHBhcmFt TmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZUNvcHksIGxvYWRNYW51YWxseSk7Ci19Ci0KIH0K SW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3V2luLmNwcAkocmV2aXNpb24gMzAxNDAp CisrKyBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZpZXdXaW4uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSAia2pzX2JpbmRpbmcuaCIKICNpbmNsdWRlICJr anNfcHJveHkuaCIKICNpbmNsdWRlICJranNfd2luZG93LmgiCisjaW5jbHVkZSAiUGx1Z2luRGF0 YWJhc2UuaCIKICNpbmNsdWRlICJQbHVnaW5EZWJ1Zy5oIgogI2luY2x1ZGUgIlBsdWdpblBhY2th Z2UuaCIKICNpbmNsdWRlICJucHJ1bnRpbWVfaW1wbC5oIgpAQCAtMTcwMCw0ICsxNzAxLDIwIEBA IGJvb2wgUGx1Z2luVmlldzo6aXNDYWxsaW5nUGx1Z2luKCkKICAgICByZXR1cm4gc19jYWxsaW5n UGx1Z2luID4gMDsKIH0KIAorUGx1Z2luVmlldyogUGx1Z2luVmlldzo6Y3JlYXRlKEZyYW1lKiBw YXJlbnRGcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgRWxlbWVudCogZWxlbWVudCwgY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9y PFN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRN YW51YWxseSkKK3sKKyAgICAvLyBpZiB3ZSBmYWlsIHRvIGZpbmQgYSBwbHVnaW4gZm9yIHRoaXMg TUlNRSB0eXBlLCBmaW5kUGx1Z2luIHdpbGwgc2VhcmNoIGZvcgorICAgIC8vIGEgcGx1Z2luIGJ5 IHRoZSBmaWxlIGV4dGVuc2lvbiBhbmQgdXBkYXRlIHRoZSBNSU1FIHR5cGUsIHNvIHBhc3MgYSBt dXRhYmxlIFN0cmluZworICAgIFN0cmluZyBtaW1lVHlwZUNvcHkgPSBtaW1lVHlwZTsKKyAgICBQ bHVnaW5QYWNrYWdlKiBwbHVnaW4gPSBQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygp LT5maW5kUGx1Z2luKHVybCwgbWltZVR5cGVDb3B5KTsKKyAgICAKKyAgICAvLyBObyBwbHVnaW4g d2FzIGZvdW5kLCB0cnkgcmVmcmVzaGluZyB0aGUgZGF0YWJhc2UgYW5kIHNlYXJjaGluZyBhZ2Fp bgorICAgIGlmICghcGx1Z2luICYmIFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCkt PnJlZnJlc2goKSkgeworICAgICAgICBtaW1lVHlwZUNvcHkgPSBtaW1lVHlwZTsKKyAgICAgICAg cGx1Z2luID0gUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+ZmluZFBsdWdpbih1 cmwsIG1pbWVUeXBlQ29weSk7CisgICAgfQorICAgICAgICAKKyAgICByZXR1cm4gbmV3IFBsdWdp blZpZXcocGFyZW50RnJhbWUsIHNpemUsIHBsdWdpbiwgZWxlbWVudCwgdXJsLCBwYXJhbU5hbWVz LCBwYXJhbVZhbHVlcywgbWltZVR5cGVDb3B5LCBsb2FkTWFudWFsbHkpOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMzAxNDApCisrKyBXZWJDb3JlL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDA4LTAyLTExICBSb2RuZXkgRGF3ZXMg IDxkb2JleUB3YXlvZnRoZW1vbmtleS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISEpCisKKyAgICAgICAgUmVuYW1lIFBsdWdpbkRhdGFiYXNlOjpjcmVhdGVQbHVnaW5W aWV3IHRvIFBsdWdpblZpZXc6OmNyZWF0ZSwgdG8gbWFrZQorICAgICAgICB0aGUgaWxsb2dpY2Fs IGRlcGVuZGVuY3kgYmV0d2VlbiB0aGUgdHdvLCBsb2dpY2FsCisgICAgICAgIE1ha2UgUGx1Z2lu RGF0YWJhc2U6OmZpbmRQbHVnaW4gYSBwdWJsaWMgbWV0aG9kCisgICAgICAgIFVwZGF0ZSB0aGUg aW5jbHVkZXMgaW4gUGx1Z2luVmlldyBhbmQgUGx1Z2luRGF0YWJhc2UgZm9yIHRoZSBjaGFuZ2UK KwlBZGQgS1VSTC5oIGluY2x1ZGUgdG8gUGx1Z2luRGF0YWJhc2UsIGFuZCByZW1vdmUgY2xhc3Mg S1VSTDsgdXNhZ2UKKworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YWJhc2UuaDoKKyAgICAg ICAgKiBwbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKiBwbHVnaW5zL3dpbi9QbHVnaW5E YXRhYmFzZVdpbi5jcHA6CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luVmlld1dpbi5jcHA6 CisKIDIwMDgtMDItMTAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg IC0gYW5vdGhlciBRdCBidWlsZCBmaXggKHdpc2ggdGhlIFF0IGJvdCB3b3VsZG4ndCBzdG9wIG9u IHRoZSBmaXJzdCBlcnJvcikK 19114 2008-02-13 09:19:54 -0800 2008-02-13 09:19:54 -0800 Updated to revert the KURL.h change in PluginDatabase.h webkit-createpluginview.patch text/plain 8476 dobey SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiAzMDE5OSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDgtMDItMTMgIFJvZG5leSBEYXdlcyAgPGRvYmV5 QHdheW9mdGhlbW9ua2V5LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIGFuZCBEYXJp bi4KKworICAgICAgICBVcGRhdGUgZm9yIHRoZSByZW5hbWUgb2YgUGx1Z2luRGF0YWJhc2U6OmNy ZWF0ZVBsdWdpblZpZXcKKyAgICAgICAgdG8gUGx1Z2luVmlldzo6Y3JlYXRlCisKKyAgICAgICAg KiBXZWJGcmFtZS5jcHA6CisKIDIwMDgtMDItMTIgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2Vu QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYSBwcmVjb21waWxlZCBoZWFkZXIgdG8gYnVpbGQg V2ViS2l0LgpAQCAtMTU1LDYgKzE2NCw3IEBACiAgICAgICAgIChXZWJDb3JlOjppbWFnZVRpdGxl KToKICAgICAgICAgQWRkIHN0dWIuCiAgICAgICAgIAorCiAyMDA4LTAyLTA3ICBBZGEgQ2hhbiAg PGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjkyNDMzPiBj ZXJ0aWZpY2F0ZSBhdXRoZW50aWNhdGlvbiBzdXBwb3J0IGJyb2tlbiBpbiBTYWZhcmkgMy4wCklu ZGV4OiBXZWJLaXQvd2luL1dlYkZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dl YkZyYW1lLmNwcAkocmV2aXNpb24gMzAxOTkpCisrKyBXZWJLaXQvd2luL1dlYkZyYW1lLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjMzMyw3ICsyMzMzLDcgQEAgUGFzc1JlZlB0cjxGcmFtZT4gV2Vi RnJhbWU6OmNyZWF0ZUZyYW1lKAogCiBXaWRnZXQqIFdlYkZyYW1lOjpjcmVhdGVQbHVnaW4oY29u c3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwgRWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgdXJs LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4m IHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkK IHsKLSAgICBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3ID0gUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxl ZFBsdWdpbnMoKS0+Y3JlYXRlUGx1Z2luVmlldyhjb3JlKHRoaXMpLCBwbHVnaW5TaXplLCBlbGVt ZW50LCB1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5 KTsKKyAgICBQbHVnaW5WaWV3KiBwbHVnaW5WaWV3ID0gUGx1Z2luVmlldzo6Y3JlYXRlKGNvcmUo dGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIHVybCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMs IG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOwogCiAgICAgaWYgKHBsdWdpblZpZXctPnN0YXR1cygp ID09IFBsdWdpblN0YXR1c0xvYWRlZFN1Y2Nlc3NmdWxseSkKICAgICAgICAgcmV0dXJuIHBsdWdp blZpZXc7CkBAIC0yNDAzLDggKzI0MDMsNyBAQCB2b2lkIFdlYkZyYW1lOjpyZWRpcmVjdERhdGFU b1BsdWdpbihXaWRnCiAKIFdpZGdldCogV2ViRnJhbWU6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQo Y29uc3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwgRWxlbWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYg LypiYXNlVVJMKi8sIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpCiB7Ci0gICAgUGx1Z2luVmlldyogcGx1Z2luVmlldyA9 IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPgotICAgICAgICBjcmVhdGVQbHVn aW5WaWV3KGNvcmUodGhpcyksIHBsdWdpblNpemUsIGVsZW1lbnQsIEtVUkwoKSwgcGFyYW1OYW1l cywgcGFyYW1WYWx1ZXMsICJhcHBsaWNhdGlvbi94LWphdmEtYXBwbGV0IiwgZmFsc2UpOworICAg IFBsdWdpblZpZXcqIHBsdWdpblZpZXcgPSBQbHVnaW5WaWV3OjpjcmVhdGUoY29yZSh0aGlzKSwg cGx1Z2luU2l6ZSwgZWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgImFw cGxpY2F0aW9uL3gtamF2YS1hcHBsZXQiLCBmYWxzZSk7CiAKICAgICAvLyBDaGVjayBpZiB0aGUg cGx1Z2luIGNhbiBiZSBsb2FkZWQgc3VjY2Vzc2Z1bGx5CiAgICAgaWYgKHBsdWdpblZpZXctPnBs dWdpbigpICYmIHBsdWdpblZpZXctPnBsdWdpbigpLT5sb2FkKCkpCkluZGV4OiBXZWJDb3JlL3Bs dWdpbnMvUGx1Z2luVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5W aWV3LmgJKHJldmlzaW9uIDMwMTk5KQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ZnJpZW5kIHN0YXRpYyBMUkVTVUxUIENBTExCQUNLIFBsdWdpblZpZXdXbmRQcm9jKEhXTkQsIFVJ TlQsIFdQQVJBTSwgTFBBUkFNKTsKIAogICAgIHB1YmxpYzoKLSAgICAgICAgUGx1Z2luVmlldyhG cmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmLCBQbHVnaW5QYWNrYWdlKiBwbHVnaW4s IEVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMs IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgYm9vbCBsb2FkTWFudWFsbHkpOworICAgICAgICBzdGF0aWMgUGx1Z2luVmlldyogY3JlYXRl KEZyYW1lKiBwYXJlbnRGcmFtZSwgY29uc3QgSW50U2l6ZSYsIEVsZW1lbnQqIGVsZW1lbnQsIGNv bnN0IEtVUkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBs b2FkTWFudWFsbHkpOwogICAgICAgICB2aXJ0dWFsIH5QbHVnaW5WaWV3KCk7CiAKICAgICAgICAg UGx1Z2luUGFja2FnZSogcGx1Z2luKCkgY29uc3QgeyByZXR1cm4gbV9wbHVnaW4uZ2V0KCk7IH0K QEAgLTEzOCw2ICsxMzgsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyBi b29sIGlzQ2FsbGluZ1BsdWdpbigpOwogCiAgICAgcHJpdmF0ZToKKyAgICAgICAgUGx1Z2luVmll dyhGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmLCBQbHVnaW5QYWNrYWdlKiBwbHVn aW4sIEVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFt ZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpOworCiAgICAgICAgIHZvaWQgc2V0UGFyYW1ldGVycyhj b25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBh cmFtVmFsdWVzKTsKICAgICAgICAgdm9pZCBpbml0KCk7CiAgICAgICAgIGJvb2wgc3RhcnQoKTsK SW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCShyZXZpc2lvbiAzMDE5OSkKKysrIFdlYkNv cmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NiwxNyArNDYs MTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIFBsdWdpbkRhdGFiYXNlIHsKICAg ICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBQbHVnaW5EYXRhYmFzZSogaW5zdGFsbGVkUGx1Z2lu cygpOwotICAgICAgICBQbHVnaW5WaWV3KiBjcmVhdGVQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRG cmFtZSwgY29uc3QgSW50U2l6ZSYsIEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwg Y29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBw YXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpOwog CiAgICAgICAgIGJvb2wgcmVmcmVzaCgpOwogICAgICAgICBWZWN0b3I8UGx1Z2luUGFja2FnZSo+ IHBsdWdpbnMoKSBjb25zdDsKICAgICAgICAgYm9vbCBpc01JTUVUeXBlUmVnaXN0ZXJlZChjb25z dCBTdHJpbmcmIG1pbWVUeXBlKTsKICAgICAgICAgdm9pZCBhZGRFeHRyYVBsdWdpblBhdGgoY29u c3QgU3RyaW5nJik7CisKKyAgICAgICAgUGx1Z2luUGFja2FnZSogZmluZFBsdWdpbihjb25zdCBL VVJMJiB1cmwsIFN0cmluZyYgbWltZVR5cGUpOwogICAgIHByaXZhdGU6CiAgICAgICAgIHZvaWQg c2V0UGx1Z2luUGF0aHMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhdGhzKSB7IG1fcGx1Z2luUGF0 aHMgPSBwYXRoczsgfQogICAgICAgICBQbHVnaW5TZXQgZ2V0UGx1Z2luc0luUGF0aHMoKSBjb25z dDsKIAotICAgICAgICBQbHVnaW5QYWNrYWdlKiBmaW5kUGx1Z2luKGNvbnN0IEtVUkwmIHVybCwg U3RyaW5nJiBtaW1lVHlwZSk7CiAgICAgICAgIFBsdWdpblBhY2thZ2UqIHBsdWdpbkZvck1JTUVU eXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogICAgICAgICBTdHJpbmcgTUlNRVR5cGVGb3JF eHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb24pIGNvbnN0OwogCkluZGV4OiBXZWJDb3Jl L3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAkocmV2aXNpb24gMzAxOTkpCisrKyBX ZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFiYXNlV2luLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjcsNyArMjcsNiBAQAogI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCiAKICNpbmNsdWRl ICJQbHVnaW5QYWNrYWdlLmgiCi0jaW5jbHVkZSAiUGx1Z2luVmlldy5oIgogI2luY2x1ZGUgIkZy YW1lLmgiCiAjaW5jbHVkZSA8d2luZG93cy5oPgogI2luY2x1ZGUgPHNobHdhcGkuaD4KQEAgLTUy MSwyMCArNTIwLDQgQEAgUGx1Z2luUGFja2FnZSogUGx1Z2luRGF0YWJhc2U6OmZpbmRQbHVnaQog ICAgIHJldHVybiBwbHVnaW47CiB9CiAKLVBsdWdpblZpZXcqIFBsdWdpbkRhdGFiYXNlOjpjcmVh dGVQbHVnaW5WaWV3KEZyYW1lKiBwYXJlbnRGcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgRWxl bWVudCogZWxlbWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFy YW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkKLXsKLSAgICAvLyBpZiB3ZSBmYWlsIHRvIGZp bmQgYSBwbHVnaW4gZm9yIHRoaXMgTUlNRSB0eXBlLCBmaW5kUGx1Z2luIHdpbGwgc2VhcmNoIGZv cgotICAgIC8vIGEgcGx1Z2luIGJ5IHRoZSBmaWxlIGV4dGVuc2lvbiBhbmQgdXBkYXRlIHRoZSBN SU1FIHR5cGUsIHNvIHBhc3MgYSBtdXRhYmxlIFN0cmluZwotICAgIFN0cmluZyBtaW1lVHlwZUNv cHkgPSBtaW1lVHlwZTsKLSAgICBQbHVnaW5QYWNrYWdlKiBwbHVnaW4gPSBmaW5kUGx1Z2luKHVy bCwgbWltZVR5cGVDb3B5KTsKLSAgICAKLSAgICAvLyBObyBwbHVnaW4gd2FzIGZvdW5kLCB0cnkg cmVmcmVzaGluZyB0aGUgZGF0YWJhc2UgYW5kIHNlYXJjaGluZyBhZ2FpbgotICAgIGlmICghcGx1 Z2luICYmIHJlZnJlc2goKSkgewotICAgICAgICBtaW1lVHlwZUNvcHkgPSBtaW1lVHlwZTsKLSAg ICAgICAgcGx1Z2luID0gZmluZFBsdWdpbih1cmwsIG1pbWVUeXBlQ29weSk7Ci0gICAgfQotICAg ICAgICAKLSAgICByZXR1cm4gbmV3IFBsdWdpblZpZXcocGFyZW50RnJhbWUsIHNpemUsIHBsdWdp biwgZWxlbWVudCwgdXJsLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGVDb3B5LCBs b2FkTWFudWFsbHkpOwotfQotCiB9CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpblZp ZXdXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luVmlld1dp bi5jcHAJKHJldmlzaW9uIDMwMTk5KQorKysgV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5WaWV3 V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEsNiArNTEsNyBAQAogI2luY2x1ZGUgImtqc19i aW5kaW5nLmgiCiAjaW5jbHVkZSAia2pzX3Byb3h5LmgiCiAjaW5jbHVkZSAia2pzX3dpbmRvdy5o IgorI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiUGx1Z2luRGVidWcuaCIK ICNpbmNsdWRlICJQbHVnaW5QYWNrYWdlLmgiCiAjaW5jbHVkZSAibnBydW50aW1lX2ltcGwuaCIK QEAgLTE3MDAsNCArMTcwMSwyMCBAQCBib29sIFBsdWdpblZpZXc6OmlzQ2FsbGluZ1BsdWdpbigp CiAgICAgcmV0dXJuIHNfY2FsbGluZ1BsdWdpbiA+IDA7CiB9CiAKK1BsdWdpblZpZXcqIFBsdWdp blZpZXc6OmNyZWF0ZShGcmFtZSogcGFyZW50RnJhbWUsIGNvbnN0IEludFNpemUmIHNpemUsIEVs ZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBh cmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCit7CisgICAgLy8gaWYgd2UgZmFpbCB0byBm aW5kIGEgcGx1Z2luIGZvciB0aGlzIE1JTUUgdHlwZSwgZmluZFBsdWdpbiB3aWxsIHNlYXJjaCBm b3IKKyAgICAvLyBhIHBsdWdpbiBieSB0aGUgZmlsZSBleHRlbnNpb24gYW5kIHVwZGF0ZSB0aGUg TUlNRSB0eXBlLCBzbyBwYXNzIGEgbXV0YWJsZSBTdHJpbmcKKyAgICBTdHJpbmcgbWltZVR5cGVD b3B5ID0gbWltZVR5cGU7CisgICAgUGx1Z2luUGFja2FnZSogcGx1Z2luID0gUGx1Z2luRGF0YWJh c2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+ZmluZFBsdWdpbih1cmwsIG1pbWVUeXBlQ29weSk7Cisg ICAgCisgICAgLy8gTm8gcGx1Z2luIHdhcyBmb3VuZCwgdHJ5IHJlZnJlc2hpbmcgdGhlIGRhdGFi YXNlIGFuZCBzZWFyY2hpbmcgYWdhaW4KKyAgICBpZiAoIXBsdWdpbiAmJiBQbHVnaW5EYXRhYmFz ZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5yZWZyZXNoKCkpIHsKKyAgICAgICAgbWltZVR5cGVDb3B5 ID0gbWltZVR5cGU7CisgICAgICAgIHBsdWdpbiA9IFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQ bHVnaW5zKCktPmZpbmRQbHVnaW4odXJsLCBtaW1lVHlwZUNvcHkpOworICAgIH0KKyAgICAgICAg CisgICAgcmV0dXJuIG5ldyBQbHVnaW5WaWV3KHBhcmVudEZyYW1lLCBzaXplLCBwbHVnaW4sIGVs ZW1lbnQsIHVybCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlQ29weSwgbG9hZE1h bnVhbGx5KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDMwMTk5KQor KysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAw OC0wMi0xMyAgUm9kbmV5IERhd2VzICA8ZG9iZXlAd2F5b2Z0aGVtb25rZXkuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gYW5kIERhcmluLgorCisgICAgICAgIFJlbmFtZSBQbHVnaW5E YXRhYmFzZTo6Y3JlYXRlUGx1Z2luVmlldyB0byBQbHVnaW5WaWV3OjpjcmVhdGUsIHRvIG1ha2UK KyAgICAgICAgdGhlIGlsbG9naWNhbCBkZXBlbmRlbmN5IGJldHdlZW4gdGhlIHR3bywgbG9naWNh bAorICAgICAgICBNYWtlIFBsdWdpbkRhdGFiYXNlOjpmaW5kUGx1Z2luIGEgcHVibGljIG1ldGhv ZAorICAgICAgICBVcGRhdGUgdGhlIGluY2x1ZGVzIGluIFBsdWdpblZpZXcgYW5kIFBsdWdpbkRh dGFiYXNlIGZvciB0aGUgY2hhbmdlCisKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpbkRhdGFiYXNl Lmg6CisgICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgICogcGx1Z2lucy93 aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAqIHBsdWdpbnMvd2luL1BsdWdpblZp ZXdXaW4uY3BwOgorCiAyMDA4LTAyLTEzICBNYXR0IExpbGVrICA8d2Via2l0QG1hdHRsaWxlay5j b20+CiAKICAgICAgICAgTm90IHJldmlld2VkLCBidWlsZCBmaXguCg==