37853 2010-04-20 06:08:08 -0700 Update EFL port to match recent API changes. 2010-04-21 05:32:50 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 barbieri webkit-unassigned commit-queue webkit.review.bot oldest_to_newest 214599 0 barbieri 2010-04-20 06:08:08 -0700 Recent changes to WebKit were not applied to WebKit-EFL and broke its compile. Of course nobody noticed it since we still have patches missing to fully integrate it, and we have no build-bot set :-( Changes required are: * WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.{cpp,h}: add didTransferChildFrameToNewDocument() and dispatchDidChangeIcons(). * WebCore/platform/graphics/efl/ImageEfl.cpp: add now missing include. * WebCore/platform/efl/LocalizedStringsEfl.cpp: add missing strings for plugin handling (crash, missing). * WebCore/platform/efl/MIMETypeRegistryEfl.cpp: add isApplicationPluginMIMEType(). * WebCore/platform/efl/FileSystemEfl.cpp: remove closeFile() and writeToFile() as they are now in WebCore/platform/posix/FileSystemPOSIX.cpp. * WebKit/efl/WebCoreSupport/EditorClientEfl.cpp: use new common WindowsKeyboardCodes.h instead of KeyboardCodes.h. 214602 1 53806 barbieri 2010-04-20 06:13:42 -0700 Created attachment 53806 Update EFL port to match recent API changes This is a quite simple patch that unbreaks the EFL port given the recent WebCore changes, basically introduces couple of notImplemented and remove functions that were made common elsewhere. 214603 2 webkit.review.bot 2010-04-20 06:15:24 -0700 Attachment 53806 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] WebKit/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] WebKit/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 4 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 214614 3 53806 barbieri 2010-04-20 06:36:58 -0700 Comment on attachment 53806 Update EFL port to match recent API changes clear flags as patch had tabs in ChangeLog 214615 4 53808 barbieri 2010-04-20 06:37:37 -0700 Created attachment 53808 Update EFL port to match recent API changes New version without tabs in ChangeLogs, sorry. 214622 5 53808 zimmermann 2010-04-20 06:44:23 -0700 Comment on attachment 53808 Update EFL port to match recent API changes Looks good to me. r=me. 214725 6 53835 barbieri 2010-04-20 10:10:01 -0700 Created attachment 53835 Update EFL port to match recent API changes (without Plugins) New patch that disables Plugin-related code so we can build with Plugin*None and without using PluginView.cpp/PluginDatabase.cpp and others, as mentioned by aroben at https://bugs.webkit.org/show_bug.cgi?id=37478#c23 214727 7 53835 aroben 2010-04-20 10:11:57 -0700 Comment on attachment 53835 Update EFL port to match recent API changes (without Plugins) > Index: WebCore/ChangeLog > +++ WebCore/platform/graphics/efl/ImageEfl.cpp (working copy) > @@ -28,8 +28,8 @@ > > #include "config.h" > #include "Image.h" > - > #include "BitmapImage.h" > +#include "SharedBuffer.h" You should leave in the blank line after Image.h. Everything else looks fine, though. 214730 8 53836 barbieri 2010-04-20 10:15:06 -0700 Created attachment 53836 Update EFL port to match recent API changes (without Plugins) Fixed the new line reported by aroben. 214731 9 53836 aroben 2010-04-20 10:16:03 -0700 Comment on attachment 53836 Update EFL port to match recent API changes (without Plugins) r=me 214732 10 53808 barbieri 2010-04-20 10:17:20 -0700 Comment on attachment 53808 Update EFL port to match recent API changes Clear flags as it is obsolete. 215262 11 53836 commit-queue 2010-04-21 05:32:45 -0700 Comment on attachment 53836 Update EFL port to match recent API changes (without Plugins) Clearing flags on attachment: 53836 Committed r57970: <http://trac.webkit.org/changeset/57970> 215263 12 commit-queue 2010-04-21 05:32:50 -0700 All reviewed patches have been landed. Closing bug. 53806 2010-04-20 06:13:42 -0700 2010-04-20 06:37:37 -0700 Update EFL port to match recent API changes Update-EFL-port-to-match-recent-API-changes.patch text/plain 7309 barbieri SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Nzg4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMjAgIEd1c3Rhdm8gU3Zlcnp1dCBCYXJiaWVyaSAgPGJh cmJpZXJpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisJVXBkYXRlIEVGTCBwb3J0IHRvIG1hdGNoIHJlY2VudCBBUEkgY2hhbmdlcy4KKwlo dHRwOi8vd2Via2l0Lm9yZy9iLzM3ODUzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvRmlsZVN5 c3RlbUVmbC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZWZsL0xvY2FsaXplZFN0cmluZ3NFZmwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWlzc2luZ1BsdWdpblRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6Y3Jhc2hlZFBsdWdpblRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9NSU1FVHlw ZVJlZ2lzdHJ5RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6Omlz QXBwbGljYXRpb25QbHVnaW5NSU1FVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv ZWZsL0ltYWdlRWZsLmNwcDoKKwogMjAxMC0wNC0yMCAgRGlyayBTY2h1bHplICA8a3JpdEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZWZsL0ZpbGVTeXN0ZW1FZmwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZWZsL0ZpbGVTeXN0ZW1FZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysr IFdlYkNvcmUvcGxhdGZvcm0vZWZsL0ZpbGVTeXN0ZW1FZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04OSwzMyArODksNiBAQCBlbmQ6CiAgICAgcmV0dXJuIENTdHJpbmcoKTsKIH0KIAotdm9pZCBj bG9zZUZpbGUoUGxhdGZvcm1GaWxlSGFuZGxlJiBoYW5kbGUpCi17Ci0gICAgaWYgKGlzSGFuZGxl VmFsaWQoaGFuZGxlKSkgewotICAgICAgICBjbG9zZShoYW5kbGUpOwotICAgICAgICBoYW5kbGUg PSBpbnZhbGlkUGxhdGZvcm1GaWxlSGFuZGxlOwotICAgIH0KLX0KLQotaW50IHdyaXRlVG9GaWxl KFBsYXRmb3JtRmlsZUhhbmRsZSBoYW5kbGUsIGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgp Ci17Ci0gICAgc2l6ZV90IHRvdGFsQnl0ZXNXcml0dGVuID0gMDsKLSAgICBzaXplX3QgdG9kbyA9 IGxlbmd0aDsKLSAgICB3aGlsZSAodG9kbyA+IDApIHsKLSAgICAgICAgc3NpemVfdCBieXRlc1dy aXR0ZW4gPSB3cml0ZShoYW5kbGUsIGRhdGEsIHRvZG8pOwotICAgICAgICBpZiAoYnl0ZXNXcml0 dGVuIDwgMCkgewotICAgICAgICAgICAgaWYgKGVycm5vICE9IEVJTlRSICYmIGVycm5vICE9IEVB R0FJTikKLSAgICAgICAgICAgICAgICByZXR1cm4gLTE7Ci0gICAgICAgIH0gZWxzZSBpZiAoYnl0 ZXNXcml0dGVuID4gMCkgewotICAgICAgICAgICAgdG90YWxCeXRlc1dyaXR0ZW4gKz0gYnl0ZXNX cml0dGVuOwotICAgICAgICAgICAgZGF0YSArPSBieXRlc1dyaXR0ZW47Ci0gICAgICAgICAgICB0 b2RvIC09IGJ5dGVzV3JpdHRlbjsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHJldHVybiB0b3Rh bEJ5dGVzV3JpdHRlbjsKLX0KLQogYm9vbCB1bmxvYWRNb2R1bGUoUGxhdGZvcm1Nb2R1bGUgbW9k dWxlKQogewogICAgIC8vIGNhdXRpb24sIGNsb3NpbmcgaGFuZGxlIHdpbGwgbWFrZSBtZW1vcnkg dmFuaXNoIGFuZCBhbnkgcmVtYWluaW5nCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2VmbC9Mb2Nh bGl6ZWRTdHJpbmdzRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2VmbC9M b2NhbGl6ZWRTdHJpbmdzRWZsLmNwcAkocmV2aXNpb24gNTc4ODQpCisrKyBXZWJDb3JlL3BsYXRm b3JtL2VmbC9Mb2NhbGl6ZWRTdHJpbmdzRWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDA1LDQg KzQwNSwxNCBAQCBTdHJpbmcgQVhNZW51TGlzdEFjdGlvblZlcmIoKQogICAgIHJldHVybiBTdHJp bmcoKTsKIH0KIAorU3RyaW5nIG1pc3NpbmdQbHVnaW5UZXh0KCkKK3sKKyAgICByZXR1cm4gU3Ry aW5nOjpmcm9tVVRGOCgiTWlzc2luZyBQbHVnLWluIik7Cit9CisKK1N0cmluZyBjcmFzaGVkUGx1 Z2luVGV4dCgpCit7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgoIlBsdWctaW4gQ3Jhc2hl ZCIpOworfQorCiB9CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2VmbC9NSU1FVHlwZVJlZ2lzdHJ5 RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2VmbC9NSU1FVHlwZVJlZ2lz dHJ5RWZsLmNwcAkocmV2aXNpb24gNTc4ODQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2VmbC9NSU1F VHlwZVJlZ2lzdHJ5RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNCArODMsOSBAQCBTdHJp bmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFCiAgICAgcmV0dXJuICJhcHBsaWNh dGlvbi9vY3RldC1zdHJlYW0iOwogfQogCitib29sIE1JTUVUeXBlUmVnaXN0cnk6OmlzQXBwbGlj YXRpb25QbHVnaW5NSU1FVHlwZShjb25zdCBTdHJpbmcmKQoreworICAgIHJldHVybiBmYWxzZTsK K30KKwogfQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0ltYWdlRWZsLmNw cAkocmV2aXNpb24gNTc4ODQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9JbWFn ZUVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4LDggKzI4LDggQEAKIAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIkltYWdlLmgiCi0KICNpbmNsdWRlICJCaXRtYXBJbWFnZS5oIgor I2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogCiAjaW5jbHVkZSA8Y2Fpcm8uaD4KIApJbmRleDog V2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lv biA1Nzg4NikKKysrIFdlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NiBAQAorMjAxMC0wNC0yMCAgR3VzdGF2byBTdmVyenV0IEJhcmJpZXJpICA8YmFyYmllcmlAcHJv ZnVzaW9uLm1vYmk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwlV cGRhdGUgRUZMIHBvcnQgdG8gbWF0Y2ggcmVjZW50IEFQSSBjaGFuZ2VzLgorCWh0dHA6Ly93ZWJr aXQub3JnL2IvMzc4NTMKKworICAgICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRFZmwuY3BwOgorICAgICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlkVHJh bnNmZXJDaGlsZEZyYW1lVG9OZXdEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucyk6CisgICAgICAgICogZWZsL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisKIDIwMTAtMDQtMTUgIExlYW5k cm8gUGVyZWlyYSAgPGxlYW5kcm9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvZWZsL1dlYkNvcmVT dXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9XZWJD b3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysrIFdlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjksMTEgKzI5LDExIEBACiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkZv Y3VzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiS2V5Ym9hcmRD b2Rlcy5oIgogI2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1l bnRlZC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZl bnQuaCIKKyNpbmNsdWRlICJXaW5kb3dzS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1ZGUgImV3a19w cml2YXRlLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpJbmRleDogV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAJKHJldmlzaW9u IDU3ODg0KQorKysgV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVm bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDYgQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudEVmbC5oIgogCi0jaW5jbHVkZSAiQ1N0cmlu Zy5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRVdlYktpdC5oIgog I2luY2x1ZGUgIkZvcm1TdGF0ZS5oIgpAQCAtNTEsNiArNTAsNyBAQAogI2luY2x1ZGUgIlJlbmRl clBhcnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJld2tfcHJp dmF0ZS5oIgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JNKFVO SVgpCiAjaW5jbHVkZSA8c3lzL3V0c25hbWUuaD4KQEAgLTM1NSw2ICszNTUsMTAgQEAgUGFzc1Jl ZlB0cjxGcmFtZT4gRnJhbWVMb2FkZXJDbGllbnRFZmw6OgogICAgIHJldHVybiBld2tfdmlld19m cmFtZV9jcmVhdGUobV92aWV3LCBtX2ZyYW1lLCBuYW1lLCBvd25lckVsZW1lbnQsIHVybCwgcmVm ZXJyZXIpOwogfQogCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaWRUcmFuc2ZlckNoaWxk RnJhbWVUb05ld0RvY3VtZW50KCkKK3sKK30KKwogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 cmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVnaW5XaWRnZXQpCiB7CiAgICAgQVNTRVJU KCFtX3BsdWdpblZpZXcpOwpAQCAtNTYyLDYgKzU2NiwxMSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZFJlCiAgICAgZXdrX3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgY3Mu ZGF0YSgpKTsKIH0KIAordm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDaGFu Z2VJY29ucygpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwogdm9pZCBGcmFtZUxvYWRl ckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKIHsKICAgICBld2tfZnJhbWVfdXJp X2NoYW5nZWQobV9mcmFtZSk7CkluZGV4OiBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50RWZsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCShyZXZpc2lvbiA1Nzg4NCkKKysrIFdlYktpdC9lZmwv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAkod29ya2luZyBjb3B5KQpAQCAt MTAyLDYgKzEwMiw3IEBAIGNsYXNzIEZyYW1lTG9hZGVyQ2xpZW50RWZsIDogcHVibGljIEZyYW0K ICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigpOwogICAgIHZpcnR1YWwg dm9pZCBkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCk7CiAgICAgdmlydHVhbCB2b2lk IGRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZyYpOworICAgIHZpcnR1YWwgdm9p ZCBkaXNwYXRjaERpZENoYW5nZUljb25zKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlk Q29tbWl0TG9hZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZEZhaWxQcm92aXNpb25h bExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERp ZEZhaWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImKTsKQEAgLTEzMiw2ICsxMzMsOCBAQCBjbGFz cyBGcmFtZUxvYWRlckNsaWVudEVmbCA6IHB1YmxpYyBGcmFtCiAKICAgICB2aXJ0dWFsIFBhc3NS ZWZQdHI8RnJhbWU+IGNyZWF0ZUZyYW1lKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBu YW1lLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBib29sIGFsbG93c1Njcm9s bGluZywgaW50IG1hcmdpbldpZHRoLCBpbnQgbWFyZ2luSGVpZ2h0KTsKKyAgICB2aXJ0dWFsIHZv aWQgZGlkVHJhbnNmZXJDaGlsZEZyYW1lVG9OZXdEb2N1bWVudCgpOworCiAgICAgdmlydHVhbCBQ YXNzUmVmUHRyPFdpZGdldD4gY3JlYXRlUGx1Z2luKGNvbnN0IEludFNpemUmLCBIVE1MUGx1Z0lu RWxlbWVudCosIGNvbnN0IEtVUkwmLCBjb25zdCBXVEY6OlZlY3RvcjxTdHJpbmc+JiwgY29uc3Qg V1RGOjpWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFN0cmluZyYsIGJvb2wpOwogICAgIHZpcnR1YWwg dm9pZCByZWRpcmVjdERhdGFUb1BsdWdpbihXaWRnZXQqIHBsdWdpbldpZGdldCk7CiAgICAgdmly dHVhbCBQYXNzUmVmUHRyPFdpZGdldD4gY3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRT aXplJiwgSFRNTEFwcGxldEVsZW1lbnQqLCBjb25zdCBLVVJMJiBiYXNlVVJMLCBjb25zdCBXVEY6 OlZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6OlZlY3RvcjxTdHJpbmc+JiBw YXJhbVZhbHVlcyk7Cg== 53808 2010-04-20 06:37:37 -0700 2010-04-20 10:17:19 -0700 Update EFL port to match recent API changes Update-EFL-port-to-match-recent-API-changes_2.patch text/plain 7337 barbieri SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Nzg4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMjAgIEd1c3Rhdm8gU3Zlcnp1dCBCYXJiaWVyaSAgPGJh cmJpZXJpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVwZGF0ZSBFRkwgcG9ydCB0byBtYXRjaCByZWNlbnQgQVBJIGNoYW5n ZXMuCisgICAgICAgIGh0dHA6Ly93ZWJraXQub3JnL2IvMzc4NTMKKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9GaWxlU3lzdGVtRWZsLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvTG9jYWxp emVkU3RyaW5nc0VmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptaXNzaW5nUGx1Z2luVGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpjcmFzaGVkUGx1Z2luVGV4dCk6CisgICAgICAgICogcGxhdGZv cm0vZWZsL01JTUVUeXBlUmVnaXN0cnlFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TUlNRVR5 cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3BwOgorCiAyMDEwLTA0LTIwICBEaXJrIFNjaHVs emUgIDxrcml0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1t ZXJtYW5uLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRmlsZVN5c3RlbUVmbC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRmlsZVN5c3RlbUVmbC5jcHAJKHJldmlz aW9uIDU3ODg0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRmlsZVN5c3RlbUVmbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTg5LDMzICs4OSw2IEBAIGVuZDoKICAgICByZXR1cm4gQ1N0cmluZygp OwogfQogCi12b2lkIGNsb3NlRmlsZShQbGF0Zm9ybUZpbGVIYW5kbGUmIGhhbmRsZSkKLXsKLSAg ICBpZiAoaXNIYW5kbGVWYWxpZChoYW5kbGUpKSB7Ci0gICAgICAgIGNsb3NlKGhhbmRsZSk7Ci0g ICAgICAgIGhhbmRsZSA9IGludmFsaWRQbGF0Zm9ybUZpbGVIYW5kbGU7Ci0gICAgfQotfQotCi1p bnQgd3JpdGVUb0ZpbGUoUGxhdGZvcm1GaWxlSGFuZGxlIGhhbmRsZSwgY29uc3QgY2hhciogZGF0 YSwgaW50IGxlbmd0aCkKLXsKLSAgICBzaXplX3QgdG90YWxCeXRlc1dyaXR0ZW4gPSAwOwotICAg IHNpemVfdCB0b2RvID0gbGVuZ3RoOwotICAgIHdoaWxlICh0b2RvID4gMCkgewotICAgICAgICBz c2l6ZV90IGJ5dGVzV3JpdHRlbiA9IHdyaXRlKGhhbmRsZSwgZGF0YSwgdG9kbyk7Ci0gICAgICAg IGlmIChieXRlc1dyaXR0ZW4gPCAwKSB7Ci0gICAgICAgICAgICBpZiAoZXJybm8gIT0gRUlOVFIg JiYgZXJybm8gIT0gRUFHQUlOKQotICAgICAgICAgICAgICAgIHJldHVybiAtMTsKLSAgICAgICAg fSBlbHNlIGlmIChieXRlc1dyaXR0ZW4gPiAwKSB7Ci0gICAgICAgICAgICB0b3RhbEJ5dGVzV3Jp dHRlbiArPSBieXRlc1dyaXR0ZW47Ci0gICAgICAgICAgICBkYXRhICs9IGJ5dGVzV3JpdHRlbjsK LSAgICAgICAgICAgIHRvZG8gLT0gYnl0ZXNXcml0dGVuOwotICAgICAgICB9Ci0gICAgfQotCi0g ICAgcmV0dXJuIHRvdGFsQnl0ZXNXcml0dGVuOwotfQotCiBib29sIHVubG9hZE1vZHVsZShQbGF0 Zm9ybU1vZHVsZSBtb2R1bGUpCiB7CiAgICAgLy8gY2F1dGlvbiwgY2xvc2luZyBoYW5kbGUgd2ls bCBtYWtlIG1lbW9yeSB2YW5pc2ggYW5kIGFueSByZW1haW5pbmcKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vZWZsL0xvY2FsaXplZFN0cmluZ3NFZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vZWZsL0xvY2FsaXplZFN0cmluZ3NFZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysr IFdlYkNvcmUvcGxhdGZvcm0vZWZsL0xvY2FsaXplZFN0cmluZ3NFZmwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MDUsNCArNDA1LDE0IEBAIFN0cmluZyBBWE1lbnVMaXN0QWN0aW9uVmVyYigpCiAg ICAgcmV0dXJuIFN0cmluZygpOwogfQogCitTdHJpbmcgbWlzc2luZ1BsdWdpblRleHQoKQorewor ICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KCJNaXNzaW5nIFBsdWctaW4iKTsKK30KKworU3Ry aW5nIGNyYXNoZWRQbHVnaW5UZXh0KCkKK3sKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOCgi UGx1Zy1pbiBDcmFzaGVkIik7Cit9CisKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZWZsL01J TUVUeXBlUmVnaXN0cnlFZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZWZs L01JTUVUeXBlUmVnaXN0cnlFZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysrIFdlYkNvcmUvcGxh dGZvcm0vZWZsL01JTUVUeXBlUmVnaXN0cnlFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Myw0 ICs4Myw5IEBAIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckUKICAgICBy ZXR1cm4gImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSI7CiB9CiAKK2Jvb2wgTUlNRVR5cGVSZWdp c3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKGNvbnN0IFN0cmluZyYpCit7CisgICAg cmV0dXJuIGZhbHNlOworfQorCiB9CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Vm bC9JbWFnZUVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9l ZmwvSW1hZ2VFZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZWZsL0ltYWdlRWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsOCArMjgsOCBAQAog CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSW1hZ2UuaCIKLQogI2luY2x1ZGUgIkJp dG1hcEltYWdlLmgiCisjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAKICNpbmNsdWRlIDxjYWly by5oPgogCkluZGV4OiBXZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9DaGFu Z2VMb2cJKHJldmlzaW9uIDU3ODg2KQorKysgV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA0LTIwICBHdXN0YXZvIFN2ZXJ6dXQgQmFyYmllcmkg IDxiYXJiaWVyaUBwcm9mdXNpb24ubW9iaT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgRUZMIHBvcnQgdG8gbWF0Y2ggcmVjZW50IEFQSSBj aGFuZ2VzLgorICAgICAgICBodHRwOi8vd2Via2l0Lm9yZy9iLzM3ODUzCisKKyAgICAgICAgKiBl ZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKiBlZmwvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQp OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ2hh bmdlSWNvbnMpOgorICAgICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEVmbC5oOgorCiAyMDEwLTA0LTE1ICBMZWFuZHJvIFBlcmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lv bi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpJbmRleDogV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNw cAkocmV2aXNpb24gNTc4ODQpCisrKyBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNs aWVudEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDExICsyOSwxMSBAQAogI2luY2x1ZGUg IkV2ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGb2N1c0NvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJG cmFtZS5oIgotI2luY2x1ZGUgIktleWJvYXJkQ29kZXMuaCIKICNpbmNsdWRlICJLZXlib2FyZEV2 ZW50LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1LZXlib2FyZEV2ZW50LmgiCisjaW5jbHVkZSAiV2luZG93c0tleWJv YXJkQ29kZXMuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKSW5kZXg6IFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRFZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRFZmwuY3BwCShyZXZpc2lvbiA1Nzg4NCkKKysrIFdlYktpdC9lZmwvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3 ICszNSw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGll bnRFZmwuaCIKIAotI2luY2x1ZGUgIkNTdHJpbmcuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRl ci5oIgogI2luY2x1ZGUgIkVXZWJLaXQuaCIKICNpbmNsdWRlICJGb3JtU3RhdGUuaCIKQEAgLTUx LDYgKzUwLDcgQEAKICNpbmNsdWRlICJSZW5kZXJQYXJ0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VS ZXF1ZXN0LmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKKyNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CiAKICNpZiBQTEFURk9STShVTklYKQogI2luY2x1ZGUgPHN5cy91dHNuYW1lLmg+ CkBAIC0zNTUsNiArMzU1LDEwIEBAIFBhc3NSZWZQdHI8RnJhbWU+IEZyYW1lTG9hZGVyQ2xpZW50 RWZsOjoKICAgICByZXR1cm4gZXdrX3ZpZXdfZnJhbWVfY3JlYXRlKG1fdmlldywgbV9mcmFtZSwg bmFtZSwgb3duZXJFbGVtZW50LCB1cmwsIHJlZmVycmVyKTsKIH0KIAordm9pZCBGcmFtZUxvYWRl ckNsaWVudEVmbDo6ZGlkVHJhbnNmZXJDaGlsZEZyYW1lVG9OZXdEb2N1bWVudCgpCit7Cit9CisK IHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OnJlZGlyZWN0RGF0YVRvUGx1Z2luKFdpZGdldCog cGx1Z2luV2lkZ2V0KQogewogICAgIEFTU0VSVCghbV9wbHVnaW5WaWV3KTsKQEAgLTU2Miw2ICs1 NjYsMTEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZQogICAgIGV3 a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIGNzLmRhdGEoKSk7CiB9CiAKK3ZvaWQgRnJhbWVMb2Fk ZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ2hhbmdlSWNvbnMoKQoreworICAgIG5vdEltcGxlbWVu dGVkKCk7Cit9CisKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ29tbWl0 TG9hZCgpCiB7CiAgICAgZXdrX2ZyYW1lX3VyaV9jaGFuZ2VkKG1fZnJhbWUpOwpJbmRleDogV2Vi S2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAkocmV2 aXNpb24gNTc4ODQpCisrKyBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50RWZsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBjbGFzcyBGcmFtZUxv YWRlckNsaWVudEVmbCA6IHB1YmxpYyBGcmFtCiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlk UmVjZWl2ZUljb24oKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lv bmFsTG9hZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25z dCBTdHJpbmcmKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucygpOwog ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKICAgICB2aXJ0dWFsIHZv aWQgZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImKTsK ICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVycm9y Jik7CkBAIC0xMzIsNiArMTMzLDggQEAgY2xhc3MgRnJhbWVMb2FkZXJDbGllbnRFZmwgOiBwdWJs aWMgRnJhbQogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEZyYW1lPiBjcmVhdGVGcmFtZShjb25z dCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbmFtZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBv d25lckVsZW1lbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5n JiByZWZlcnJlciwgYm9vbCBhbGxvd3NTY3JvbGxpbmcsIGludCBtYXJnaW5XaWR0aCwgaW50IG1h cmdpbkhlaWdodCk7CisgICAgdmlydHVhbCB2b2lkIGRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3 RG9jdW1lbnQoKTsKKwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXaWRnZXQ+IGNyZWF0ZVBsdWdp bihjb25zdCBJbnRTaXplJiwgSFRNTFBsdWdJbkVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3Qg V1RGOjpWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFdURjo6VmVjdG9yPFN0cmluZz4mLCBjb25zdCBT dHJpbmcmLCBib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVkaXJlY3REYXRhVG9QbHVnaW4oV2lk Z2V0KiBwbHVnaW5XaWRnZXQpOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXaWRnZXQ+IGNyZWF0 ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYsIEhUTUxBcHBsZXRFbGVtZW50KiwgY29u c3QgS1VSTCYgYmFzZVVSTCwgY29uc3QgV1RGOjpWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywg Y29uc3QgV1RGOjpWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpOwo= 53835 2010-04-20 10:10:01 -0700 2010-04-20 10:15:06 -0700 Update EFL port to match recent API changes (without Plugins) Update-EFL-port-to-match-recent-API-changes_3.patch text/plain 8342 barbieri SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Nzg5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMjAgIEd1c3Rhdm8gU3Zlcnp1dCBCYXJiaWVyaSAgPGJh cmJpZXJpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVwZGF0ZSBFRkwgcG9ydCB0byBtYXRjaCByZWNlbnQgQVBJIGNoYW5n ZXMuCisgICAgICAgIGh0dHA6Ly93ZWJraXQub3JnL2IvMzc4NTMKKworICAgICAgICBObyBiZWhh dmlvciBjaGFuZ2VzLCBzbyBubyBuZXcgdGVzdHMgd2VyZSBhZGRlZC4KKworICAgICAgICAqIHBs YXRmb3JtL2VmbC9GaWxlU3lzdGVtRWZsLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvTG9j YWxpemVkU3RyaW5nc0VmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptaXNzaW5nUGx1Z2luVGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpjcmFzaGVkUGx1Z2luVGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZWZsL01JTUVUeXBlUmVnaXN0cnlFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TUlN RVR5cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3BwOgorCiAyMDEwLTA0LTIwICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByNTc4OTIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lz dGVtRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lzdGVt RWZsLmNwcAkocmV2aXNpb24gNTc4OTUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lz dGVtRWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODksMzMgKzg5LDYgQEAgZW5kOgogICAgIHJl dHVybiBDU3RyaW5nKCk7CiB9CiAKLXZvaWQgY2xvc2VGaWxlKFBsYXRmb3JtRmlsZUhhbmRsZSYg aGFuZGxlKQotewotICAgIGlmIChpc0hhbmRsZVZhbGlkKGhhbmRsZSkpIHsKLSAgICAgICAgY2xv c2UoaGFuZGxlKTsKLSAgICAgICAgaGFuZGxlID0gaW52YWxpZFBsYXRmb3JtRmlsZUhhbmRsZTsK LSAgICB9Ci19Ci0KLWludCB3cml0ZVRvRmlsZShQbGF0Zm9ybUZpbGVIYW5kbGUgaGFuZGxlLCBj b25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoKQotewotICAgIHNpemVfdCB0b3RhbEJ5dGVzV3Jp dHRlbiA9IDA7Ci0gICAgc2l6ZV90IHRvZG8gPSBsZW5ndGg7Ci0gICAgd2hpbGUgKHRvZG8gPiAw KSB7Ci0gICAgICAgIHNzaXplX3QgYnl0ZXNXcml0dGVuID0gd3JpdGUoaGFuZGxlLCBkYXRhLCB0 b2RvKTsKLSAgICAgICAgaWYgKGJ5dGVzV3JpdHRlbiA8IDApIHsKLSAgICAgICAgICAgIGlmIChl cnJubyAhPSBFSU5UUiAmJiBlcnJubyAhPSBFQUdBSU4pCi0gICAgICAgICAgICAgICAgcmV0dXJu IC0xOwotICAgICAgICB9IGVsc2UgaWYgKGJ5dGVzV3JpdHRlbiA+IDApIHsKLSAgICAgICAgICAg IHRvdGFsQnl0ZXNXcml0dGVuICs9IGJ5dGVzV3JpdHRlbjsKLSAgICAgICAgICAgIGRhdGEgKz0g Ynl0ZXNXcml0dGVuOwotICAgICAgICAgICAgdG9kbyAtPSBieXRlc1dyaXR0ZW47Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICByZXR1cm4gdG90YWxCeXRlc1dyaXR0ZW47Ci19Ci0KIGJvb2wgdW5s b2FkTW9kdWxlKFBsYXRmb3JtTW9kdWxlIG1vZHVsZSkKIHsKICAgICAvLyBjYXV0aW9uLCBjbG9z aW5nIGhhbmRsZSB3aWxsIG1ha2UgbWVtb3J5IHZhbmlzaCBhbmQgYW55IHJlbWFpbmluZwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5jcHAJKHJldmlz aW9uIDU3ODk1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQwNSw0ICs0MDUsMTQgQEAgU3RyaW5nIEFYTWVudUxpc3RB Y3Rpb25WZXJiKCkKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CiAKK1N0cmluZyBtaXNzaW5nUGx1 Z2luVGV4dCgpCit7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgoIk1pc3NpbmcgUGx1Zy1p biIpOworfQorCitTdHJpbmcgY3Jhc2hlZFBsdWdpblRleHQoKQoreworICAgIHJldHVybiBTdHJp bmc6OmZyb21VVEY4KCJQbHVnLWluIENyYXNoZWQiKTsKK30KKwogfQpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAJKHJldmlzaW9uIDU3ODk1KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgzLDQgKzgzLDkgQEAgU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVU eXBlRm9yRQogICAgIHJldHVybiAiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIjsKIH0KIAorYm9v bCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0FwcGxpY2F0aW9uUGx1Z2luTUlNRVR5cGUoY29uc3QgU3Ry aW5nJikKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZWZsL0ltYWdlRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2VmbC9JbWFnZUVmbC5jcHAJKHJldmlzaW9uIDU3ODk1KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y OCw4ICsyOCw4IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbWFnZS5oIgot CiAjaW5jbHVkZSAiQml0bWFwSW1hZ2UuaCIKKyNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKIAog I2luY2x1ZGUgPGNhaXJvLmg+CiAKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gNTc4OTUpCisrKyBXZWJLaXQvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMjAgIEd1c3Rhdm8gU3Zl cnp1dCBCYXJiaWVyaSAgPGJhcmJpZXJpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBFRkwgcG9ydCB0byBtYXRj aCByZWNlbnQgQVBJIGNoYW5nZXMuCisgICAgICAgIGh0dHA6Ly93ZWJraXQub3JnL2IvMzc4NTMK KworICAgICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwOgorICAg ICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlkVHJhbnNmZXJDaGlsZEZyYW1l VG9OZXdEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 b2JqZWN0Q29udGVudFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRF Zmw6OmRpc3BhdGNoRGlkQ2hhbmdlSWNvbnMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXJDbGllbnRFZmw6OmNhblNob3dNSU1FVHlwZSk6CisgICAgICAgICogZWZsL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisKIDIwMTAtMDQtMTUgIExlYW5kcm8gUGVyZWly YSAgPGxlYW5kcm9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0 aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Vk aXRvckNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9y dC9FZGl0b3JDbGllbnRFZmwuY3BwCShyZXZpc2lvbiA1Nzg5NSkKKysrIFdlYktpdC9lZmwvV2Vi Q29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTEg KzI5LDExIEBACiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkZvY3VzQ29udHJv bGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiS2V5Ym9hcmRDb2Rlcy5oIgog I2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgog I2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQuaCIKKyNp bmNsdWRlICJXaW5kb3dzS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1ZGUgImV3a19wcml2YXRlLmgi CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpJbmRleDogV2ViS2l0L2VmbC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAJKHJldmlzaW9uIDU3ODk1KQor KysgV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudEVmbC5oIgogCi0jaW5jbHVkZSAiQ1N0cmluZy5oIgogI2lu Y2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRVdlYktpdC5oIgogI2luY2x1ZGUg IkZvcm1TdGF0ZS5oIgpAQCAtNTEsNiArNTAsNyBAQAogI2luY2x1ZGUgIlJlbmRlclBhcnQuaCIK ICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgor I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JNKFVOSVgpCiAjaW5j bHVkZSA8c3lzL3V0c25hbWUuaD4KQEAgLTM1NSw2ICszNTUsMTAgQEAgUGFzc1JlZlB0cjxGcmFt ZT4gRnJhbWVMb2FkZXJDbGllbnRFZmw6OgogICAgIHJldHVybiBld2tfdmlld19mcmFtZV9jcmVh dGUobV92aWV3LCBtX2ZyYW1lLCBuYW1lLCBvd25lckVsZW1lbnQsIHVybCwgcmVmZXJyZXIpOwog fQogCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaWRUcmFuc2ZlckNoaWxkRnJhbWVUb05l d0RvY3VtZW50KCkKK3sKK30KKwogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6cmVkaXJlY3RE YXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVnaW5XaWRnZXQpCiB7CiAgICAgQVNTRVJUKCFtX3BsdWdp blZpZXcpOwpAQCAtMzg1LDggKzM4OSwxMCBAQCBPYmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRl ckNsaWVudEVmbDo6CiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VN SU1FVHlwZSh0eXBlKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRJbWFnZTsKIAorI2lm IDAgLy8gUGx1Z2luRGF0YWJhc2UgaXMgZGlzYWJsZWQgdW50aWwgd2UgaGF2ZSBQbHVnaW4gc3lz dGVtIGRvbmUuCiAgICAgaWYgKFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPmlz TUlNRVR5cGVSZWdpc3RlcmVkKG1pbWVUeXBlKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENvbnRl bnROZXRzY2FwZVBsdWdpbjsKKyNlbmRpZgogCiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6Omlz U3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZSh0eXBlKSkKICAgICAgICAgcmV0dXJuIE9iamVjdENv bnRlbnRGcmFtZTsKQEAgLTU2Miw2ICs1NjgsMTEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVm bDo6ZGlzcGF0Y2hEaWRSZQogICAgIGV3a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIGNzLmRhdGEo KSk7CiB9CiAKK3ZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkQ2hhbmdlSWNv bnMoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRFZmw6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiB7CiAgICAgZXdrX2ZyYW1lX3VyaV9jaGFu Z2VkKG1fZnJhbWUpOwpAQCAtNjMxLDggKzY0MiwxMCBAQCBib29sIEZyYW1lTG9hZGVyQ2xpZW50 RWZsOjpjYW5TaG93TUlNRVR5CiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVk Tm9uSW1hZ2VNSU1FVHlwZShNSU1FVHlwZSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCisjaWYg MCAvLyBQbHVnaW5EYXRhYmFzZSBpcyBkaXNhYmxlZCB1bnRpbCB3ZSBoYXZlIFBsdWdpbiBzeXN0 ZW0gZG9uZS4KICAgICBpZiAoUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNN SU1FVHlwZVJlZ2lzdGVyZWQoTUlNRVR5cGUpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRp ZgogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpJbmRleDogV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAkocmV2aXNpb24gNTc4OTUpCisrKyBXZWJL aXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBjbGFzcyBGcmFtZUxvYWRlckNsaWVudEVmbCA6IHB1Ymxp YyBGcmFtCiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpOwogICAgIHZpcnR1 YWwgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmcmKTsKKyAgICB2aXJ0 dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VJY29ucygpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNw YXRjaERpZENvbW1pdExvYWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRGYWlsUHJv dmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlz cGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJik7CkBAIC0xMzIsNiArMTMzLDgg QEAgY2xhc3MgRnJhbWVMb2FkZXJDbGllbnRFZmwgOiBwdWJsaWMgRnJhbQogCiAgICAgdmlydHVh bCBQYXNzUmVmUHRyPEZyYW1lPiBjcmVhdGVGcmFtZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0 cmluZyYgbmFtZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1lbnQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCBhbGxv d3NTY3JvbGxpbmcsIGludCBtYXJnaW5XaWR0aCwgaW50IG1hcmdpbkhlaWdodCk7CisgICAgdmly dHVhbCB2b2lkIGRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQoKTsKKwogICAgIHZp cnR1YWwgUGFzc1JlZlB0cjxXaWRnZXQ+IGNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiwgSFRN TFBsdWdJbkVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgV1RGOjpWZWN0b3I8U3RyaW5nPiYs IGNvbnN0IFdURjo6VmVjdG9yPFN0cmluZz4mLCBjb25zdCBTdHJpbmcmLCBib29sKTsKICAgICB2 aXJ0dWFsIHZvaWQgcmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBwbHVnaW5XaWRnZXQpOwog ICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXaWRnZXQ+IGNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29u c3QgSW50U2l6ZSYsIEhUTUxBcHBsZXRFbGVtZW50KiwgY29uc3QgS1VSTCYgYmFzZVVSTCwgY29u c3QgV1RGOjpWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgV1RGOjpWZWN0b3I8U3Ry aW5nPiYgcGFyYW1WYWx1ZXMpOwo= 53836 2010-04-20 10:15:06 -0700 2010-04-21 05:32:45 -0700 Update EFL port to match recent API changes (without Plugins) Update-EFL-port-to-match-recent-API-changes_4.patch text/plain 8319 barbieri SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Nzg5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMjAgIEd1c3Rhdm8gU3Zlcnp1dCBCYXJiaWVyaSAgPGJh cmJpZXJpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVwZGF0ZSBFRkwgcG9ydCB0byBtYXRjaCByZWNlbnQgQVBJIGNoYW5n ZXMuCisgICAgICAgIGh0dHA6Ly93ZWJraXQub3JnL2IvMzc4NTMKKworICAgICAgICBObyBiZWhh dmlvciBjaGFuZ2VzLCBzbyBubyBuZXcgdGVzdHMgd2VyZSBhZGRlZC4KKworICAgICAgICAqIHBs YXRmb3JtL2VmbC9GaWxlU3lzdGVtRWZsLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvTG9j YWxpemVkU3RyaW5nc0VmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptaXNzaW5nUGx1Z2luVGV4 dCk6CisgICAgICAgIChXZWJDb3JlOjpjcmFzaGVkUGx1Z2luVGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZWZsL01JTUVUeXBlUmVnaXN0cnlFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TUlN RVR5cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3BwOgorCiAyMDEwLTA0LTIwICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByNTc4OTIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lz dGVtRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lzdGVt RWZsLmNwcAkocmV2aXNpb24gNTc4OTUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2VmbC9GaWxlU3lz dGVtRWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODksMzMgKzg5LDYgQEAgZW5kOgogICAgIHJl dHVybiBDU3RyaW5nKCk7CiB9CiAKLXZvaWQgY2xvc2VGaWxlKFBsYXRmb3JtRmlsZUhhbmRsZSYg aGFuZGxlKQotewotICAgIGlmIChpc0hhbmRsZVZhbGlkKGhhbmRsZSkpIHsKLSAgICAgICAgY2xv c2UoaGFuZGxlKTsKLSAgICAgICAgaGFuZGxlID0gaW52YWxpZFBsYXRmb3JtRmlsZUhhbmRsZTsK LSAgICB9Ci19Ci0KLWludCB3cml0ZVRvRmlsZShQbGF0Zm9ybUZpbGVIYW5kbGUgaGFuZGxlLCBj b25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoKQotewotICAgIHNpemVfdCB0b3RhbEJ5dGVzV3Jp dHRlbiA9IDA7Ci0gICAgc2l6ZV90IHRvZG8gPSBsZW5ndGg7Ci0gICAgd2hpbGUgKHRvZG8gPiAw KSB7Ci0gICAgICAgIHNzaXplX3QgYnl0ZXNXcml0dGVuID0gd3JpdGUoaGFuZGxlLCBkYXRhLCB0 b2RvKTsKLSAgICAgICAgaWYgKGJ5dGVzV3JpdHRlbiA8IDApIHsKLSAgICAgICAgICAgIGlmIChl cnJubyAhPSBFSU5UUiAmJiBlcnJubyAhPSBFQUdBSU4pCi0gICAgICAgICAgICAgICAgcmV0dXJu IC0xOwotICAgICAgICB9IGVsc2UgaWYgKGJ5dGVzV3JpdHRlbiA+IDApIHsKLSAgICAgICAgICAg IHRvdGFsQnl0ZXNXcml0dGVuICs9IGJ5dGVzV3JpdHRlbjsKLSAgICAgICAgICAgIGRhdGEgKz0g Ynl0ZXNXcml0dGVuOwotICAgICAgICAgICAgdG9kbyAtPSBieXRlc1dyaXR0ZW47Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICByZXR1cm4gdG90YWxCeXRlc1dyaXR0ZW47Ci19Ci0KIGJvb2wgdW5s b2FkTW9kdWxlKFBsYXRmb3JtTW9kdWxlIG1vZHVsZSkKIHsKICAgICAvLyBjYXV0aW9uLCBjbG9z aW5nIGhhbmRsZSB3aWxsIG1ha2UgbWVtb3J5IHZhbmlzaCBhbmQgYW55IHJlbWFpbmluZwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5jcHAJKHJldmlz aW9uIDU3ODk1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTG9jYWxpemVkU3RyaW5nc0VmbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQwNSw0ICs0MDUsMTQgQEAgU3RyaW5nIEFYTWVudUxpc3RB Y3Rpb25WZXJiKCkKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CiAKK1N0cmluZyBtaXNzaW5nUGx1 Z2luVGV4dCgpCit7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgoIk1pc3NpbmcgUGx1Zy1p biIpOworfQorCitTdHJpbmcgY3Jhc2hlZFBsdWdpblRleHQoKQoreworICAgIHJldHVybiBTdHJp bmc6OmZyb21VVEY4KCJQbHVnLWluIENyYXNoZWQiKTsKK30KKwogfQpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAJKHJldmlzaW9uIDU3ODk1KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgzLDQgKzgzLDkgQEAgU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVU eXBlRm9yRQogICAgIHJldHVybiAiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIjsKIH0KIAorYm9v bCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0FwcGxpY2F0aW9uUGx1Z2luTUlNRVR5cGUoY29uc3QgU3Ry aW5nJikKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZWZsL0ltYWdlRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2VmbC9JbWFnZUVmbC5jcHAJKHJldmlzaW9uIDU3ODk1KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvSW1hZ2VFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MCw2ICszMCw3IEBACiAjaW5jbHVkZSAiSW1hZ2UuaCIKIAogI2luY2x1ZGUgIkJpdG1hcEltYWdl LmgiCisjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAKICNpbmNsdWRlIDxjYWlyby5oPgogCklu ZGV4OiBXZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9DaGFuZ2VMb2cJKHJl dmlzaW9uIDU3ODk1KQorKysgV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDEwLTA0LTIwICBHdXN0YXZvIFN2ZXJ6dXQgQmFyYmllcmkgIDxiYXJiaWVy aUBwcm9mdXNpb24ubW9iaT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVcGRhdGUgRUZMIHBvcnQgdG8gbWF0Y2ggcmVjZW50IEFQSSBjaGFuZ2VzLgor ICAgICAgICBodHRwOi8vd2Via2l0Lm9yZy9iLzM3ODUzCisKKyAgICAgICAgKiBlZmwvV2ViQ29y ZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKiBlZmwvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXJDbGllbnRFZmw6OmRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6Om9iamVjdENvbnRlbnRUeXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUlj b25zKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpjYW5TaG93TUlN RVR5cGUpOgorICAgICAgICAqIGVmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVm bC5oOgorCiAyMDEwLTA0LTE1ICBMZWFuZHJvIFBlcmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lvbi5t b2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJ bmRleDogV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcAko cmV2aXNpb24gNTc4OTUpCisrKyBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDExICsyOSwxMSBAQAogI2luY2x1ZGUgIkV2 ZW50TmFtZXMuaCIKICNpbmNsdWRlICJGb2N1c0NvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJGcmFt ZS5oIgotI2luY2x1ZGUgIktleWJvYXJkQ29kZXMuaCIKICNpbmNsdWRlICJLZXlib2FyZEV2ZW50 LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1LZXlib2FyZEV2ZW50LmgiCisjaW5jbHVkZSAiV2luZG93c0tleWJvYXJk Q29kZXMuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKSW5kZXg6IFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRF ZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRFZmwuY3BwCShyZXZpc2lvbiA1Nzg5NSkKKysrIFdlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICsz NSw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnRF ZmwuaCIKIAotI2luY2x1ZGUgIkNTdHJpbmcuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5o IgogI2luY2x1ZGUgIkVXZWJLaXQuaCIKICNpbmNsdWRlICJGb3JtU3RhdGUuaCIKQEAgLTUxLDYg KzUwLDcgQEAKICNpbmNsdWRlICJSZW5kZXJQYXJ0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1 ZXN0LmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CiAKICNpZiBQTEFURk9STShVTklYKQogI2luY2x1ZGUgPHN5cy91dHNuYW1lLmg+CkBA IC0zNTUsNiArMzU1LDEwIEBAIFBhc3NSZWZQdHI8RnJhbWU+IEZyYW1lTG9hZGVyQ2xpZW50RWZs OjoKICAgICByZXR1cm4gZXdrX3ZpZXdfZnJhbWVfY3JlYXRlKG1fdmlldywgbV9mcmFtZSwgbmFt ZSwgb3duZXJFbGVtZW50LCB1cmwsIHJlZmVycmVyKTsKIH0KIAordm9pZCBGcmFtZUxvYWRlckNs aWVudEVmbDo6ZGlkVHJhbnNmZXJDaGlsZEZyYW1lVG9OZXdEb2N1bWVudCgpCit7Cit9CisKIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OnJlZGlyZWN0RGF0YVRvUGx1Z2luKFdpZGdldCogcGx1 Z2luV2lkZ2V0KQogewogICAgIEFTU0VSVCghbV9wbHVnaW5WaWV3KTsKQEAgLTM4NSw4ICszODks MTAgQEAgT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXJDbGllbnRFZmw6OgogICAgIGlmIChN SU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUodHlwZSkpCiAgICAgICAg IHJldHVybiBPYmplY3RDb250ZW50SW1hZ2U7CiAKKyNpZiAwIC8vIFBsdWdpbkRhdGFiYXNlIGlz IGRpc2FibGVkIHVudGlsIHdlIGhhdmUgUGx1Z2luIHN5c3RlbSBkb25lLgogICAgIGlmIChQbHVn aW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVUeXBlUmVnaXN0ZXJlZChtaW1l VHlwZSkpCiAgICAgICAgIHJldHVybiBPYmplY3RDb250ZW50TmV0c2NhcGVQbHVnaW47CisjZW5k aWYKIAogICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5 cGUodHlwZSkpCiAgICAgICAgIHJldHVybiBPYmplY3RDb250ZW50RnJhbWU7CkBAIC01NjIsNiAr NTY4LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmUKICAgICBl d2tfdmlld190aXRsZV9zZXQobV92aWV3LCBjcy5kYXRhKCkpOwogfQogCit2b2lkIEZyYW1lTG9h ZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUljb25zKCkKK3sKKyAgICBub3RJbXBsZW1l bnRlZCgpOworfQorCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1p dExvYWQoKQogewogICAgIGV3a19mcmFtZV91cmlfY2hhbmdlZChtX2ZyYW1lKTsKQEAgLTYzMSw4 ICs2NDIsMTAgQEAgYm9vbCBGcmFtZUxvYWRlckNsaWVudEVmbDo6Y2FuU2hvd01JTUVUeQogICAg IGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUoTUlNRVR5 cGUpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAorI2lmIDAgLy8gUGx1Z2luRGF0YWJhc2UgaXMg ZGlzYWJsZWQgdW50aWwgd2UgaGF2ZSBQbHVnaW4gc3lzdGVtIGRvbmUuCiAgICAgaWYgKFBsdWdp bkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPmlzTUlNRVR5cGVSZWdpc3RlcmVkKE1JTUVU eXBlKSkKICAgICAgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKIAogICAgIHJldHVybiBmYWxzZTsK IH0KSW5kZXg6IFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50RWZsLmgJKHJldmlzaW9uIDU3ODk1KQorKysgV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEVmbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAg Y2xhc3MgRnJhbWVMb2FkZXJDbGllbnRFZmwgOiBwdWJsaWMgRnJhbQogICAgIHZpcnR1YWwgdm9p ZCBkaXNwYXRjaERpZFJlY2VpdmVJY29uKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlk U3RhcnRQcm92aXNpb25hbExvYWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNl aXZlVGl0bGUoY29uc3QgU3RyaW5nJik7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2hh bmdlSWNvbnMoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7CiAg ICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25zdCBSZXNv dXJjZUVycm9yJik7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkRmFpbExvYWQoY29uc3Qg UmVzb3VyY2VFcnJvciYpOwpAQCAtMTMyLDYgKzEzMyw4IEBAIGNsYXNzIEZyYW1lTG9hZGVyQ2xp ZW50RWZsIDogcHVibGljIEZyYW0KIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGcmFtZT4gY3Jl YXRlRnJhbWUoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG5hbWUsIEhUTUxGcmFtZU93 bmVyRWxlbWVudCogb3duZXJFbGVtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGJvb2wgYWxsb3dzU2Nyb2xsaW5nLCBpbnQgbWFyZ2lu V2lkdGgsIGludCBtYXJnaW5IZWlnaHQpOworICAgIHZpcnR1YWwgdm9pZCBkaWRUcmFuc2ZlckNo aWxkRnJhbWVUb05ld0RvY3VtZW50KCk7CisKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2lkZ2V0 PiBjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYsIEhUTUxQbHVnSW5FbGVtZW50KiwgY29uc3Qg S1VSTCYsIGNvbnN0IFdURjo6VmVjdG9yPFN0cmluZz4mLCBjb25zdCBXVEY6OlZlY3RvcjxTdHJp bmc+JiwgY29uc3QgU3RyaW5nJiwgYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHJlZGlyZWN0RGF0 YVRvUGx1Z2luKFdpZGdldCogcGx1Z2luV2lkZ2V0KTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8 V2lkZ2V0PiBjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUmLCBIVE1MQXBwbGV0 RWxlbWVudCosIGNvbnN0IEtVUkwmIGJhc2VVUkwsIGNvbnN0IFdURjo6VmVjdG9yPFN0cmluZz4m IHBhcmFtTmFtZXMsIGNvbnN0IFdURjo6VmVjdG9yPFN0cmluZz4mIHBhcmFtVmFsdWVzKTsK