63381 2011-06-25 04:14:29 -0700 [GTK] [WK2] Implement missing initializeLogChannel function. 2011-07-20 00:02:12 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 l.slachciak webkit-unassigned mrobinson rniwa webkit.review.bot oldest_to_newest 427353 0 l.slachciak 2011-06-25 04:14:29 -0700 Implemented logging for GTK platform in WebKit2 - function initializeLogChannel is called for all ports, so added missing implementation. Aslo helper function added for getting channels from name. 427355 1 98588 l.slachciak 2011-06-25 04:27:37 -0700 Created attachment 98588 Loggging for WebKit2 - GTK 427356 2 98589 l.slachciak 2011-06-25 04:30:52 -0700 Created attachment 98589 Logging - WK2 GTK Changelog fix 429391 3 98589 mrobinson 2011-06-28 20:08:39 -0700 Comment on attachment 98589 Logging - WK2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=98589&action=review Nice. Some comments below. > Source/WebKit2/Platform/Logging.cpp:48 > +WTFLogChannel* getChannelFromName(const String& channelName) Why not just put this in LoggingGtk and make it static? > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:44 > + // unfortunatelly this is initialized and enumerated for every WTFLogChannel This seems like an expensive thing to do for every log channel. Why not just do it statically? > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:45 > + gchar** logv = g_strsplit(logEnv, " ", -1); I would prefer you to do this with WTF::String instead of GLib. You can avoid manual memory management that way. > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:56 > +#endif /* !LOG_DISABLED */ C++ style comment here, I think. 430367 4 98589 l.slachciak 2011-06-30 06:39:37 -0700 Comment on attachment 98589 Logging - WK2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=98589&action=review >> Source/WebKit2/Platform/Logging.cpp:48 >> +WTFLogChannel* getChannelFromName(const String& channelName) > > Why not just put this in LoggingGtk and make it static? I put this function here because I think that in future other ports will want to use it too. In WebCore, similar function is used by GTK, EFL, QT, WX >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:44 >> + // unfortunatelly this is initialized and enumerated for every WTFLogChannel > > This seems like an expensive thing to do for every log channel. Why not just do it statically? ok, done. I was thinking about it earlier but was afraid about keeping in memory things till the end. But we will do this only in case of !LOG_DISABLED so this shouldn't be a problem. >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:45 > > I would prefer you to do this with WTF::String instead of GLib. You can avoid manual memory management that way. done >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:56 >> +#endif /* !LOG_DISABLED */ > > C++ style comment here, I think. Right. Fixed. 430373 5 99293 l.slachciak 2011-06-30 06:50:37 -0700 Created attachment 99293 Logging WK2 GTK 435256 6 99293 mrobinson 2011-07-11 15:52:51 -0700 Comment on attachment 99293 Logging WK2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=99293&action=review Looks pretty good, but I have a few nits. > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:39 > + const static String logEnv(g_getenv("WEBKIT_DEBUG")); > + static Vector<String> logv; Please don't use abbreviations for variable names. I suggest something like activatedChannels here, instead of logv. > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:52 > + if (logv.isEmpty()) > + logEnv.split(" ", logv); > + > + for (unsigned int i = 0; i < logv.size(); i++) { > + if (channel == getChannelFromName(logv[i])) { > + channel->state = WTFLogChannelOn; > + break; > + } > + } Instead of iterating and parsing log channel names for every single channel, why not build a Vector of WTFLogChannel once and then simply do activatedChannels.contains each time? This would take up less space and be faster, I believe. 437330 7 99293 l.slachciak 2011-07-14 14:22:56 -0700 Comment on attachment 99293 Logging WK2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=99293&action=review >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:39 >> + static Vector<String> logv; > > Please don't use abbreviations for variable names. I suggest something like activatedChannels here, instead of logv. done >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:52 >> + } > > Instead of iterating and parsing log channel names for every single channel, why not build a Vector of WTFLogChannel once and then simply do activatedChannels.contains each time? This would take up less space and be faster, I believe. Yes you are right. Code will be little more complicated now, but faster. No need to iterate each time. 437332 8 100864 l.slachciak 2011-07-14 14:23:57 -0700 Created attachment 100864 WebKit2 Logging for GTK port implementation 437932 9 l.slachciak 2011-07-15 13:08:11 -0700 And one more note. To have Logging working in WebProcess (not only UIProcess) we need to add logging initialization in WebProcess. This is covered by another, independent bug: https://bugs.webkit.org/show_bug.cgi?id=63395 439322 10 100864 mrobinson 2011-07-19 11:55:46 -0700 Comment on attachment 100864 WebKit2 Logging for GTK port implementation View in context: https://bugs.webkit.org/attachment.cgi?id=100864&action=review > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:43 > + // fulfill activatedChannels vector only once basing on names set in logEnv This comment should probably read: Fill activatedChannels vector only once based on names set in logEnv. According to WebKit style guidelines, comments need to be a full sentence with a capital and period. 439443 11 100864 l.slachciak 2011-07-19 14:16:54 -0700 Comment on attachment 100864 WebKit2 Logging for GTK port implementation View in context: https://bugs.webkit.org/attachment.cgi?id=100864&action=review >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:43 >> + // fulfill activatedChannels vector only once basing on names set in logEnv > > This comment should probably read: > > Fill activatedChannels vector only once based on names set in logEnv. > > According to WebKit style guidelines, comments need to be a full sentence with a capital and period. Fixed. 439449 12 101387 l.slachciak 2011-07-19 14:20:12 -0700 Created attachment 101387 Logging implementation for WebKit2 GTK Setting cq ? only. Previous patch was set r+. Changes: - comment fixed according to Martin comments. - WebKit2/Changelog updated according to the new style (short note - review by - long note) 439486 13 101387 webkit.review.bot 2011-07-19 15:07:24 -0700 Comment on attachment 101387 Logging implementation for WebKit2 GTK Clearing flags on attachment: 101387 Committed r91307: <http://trac.webkit.org/changeset/91307> 439487 14 webkit.review.bot 2011-07-19 15:07:29 -0700 All reviewed patches have been landed. Closing bug. 439503 15 rniwa 2011-07-19 15:20:29 -0700 This patch broke Windows and Mac :( http://build.webkit.org/builders/SnowLeopard%20Intel%20Release%20%28Build%29/builds/32102 http://build.webkit.org/builders/Windows%20Release%20%28Build%29/builds/18981 439505 16 101387 rniwa 2011-07-19 15:23:53 -0700 Comment on attachment 101387 Logging implementation for WebKit2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=101387&action=review Since I'm already here, I'm going to comment on the landed patch. > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:2 > + * Copyright (C) 2011 Samsung Electronics I don't think you should claim the copyright of the entire file you're copying the existing file and modifying it. > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:13 > + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' Also, this paragraph mentions Apple. 439513 17 rniwa 2011-07-19 15:33:30 -0700 (In reply to comment #16) > (From update of attachment 101387 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101387&action=review > > Since I'm already here, I'm going to comment on the landed patch. > > > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:2 > > + * Copyright (C) 2011 Samsung Electronics > > I don't think you should claim the copyright of the entire file you're copying the existing file and modifying it. > > > Source/WebKit2/Platform/gtk/LoggingGtk.cpp:13 > > + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' > > Also, this paragraph mentions Apple. It seems like all of this is accidental, caused by git. 439632 18 101387 l.slachciak 2011-07-19 22:52:46 -0700 Comment on attachment 101387 Logging implementation for WebKit2 GTK View in context: https://bugs.webkit.org/attachment.cgi?id=101387&action=review >>> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:2 >>> + * Copyright (C) 2011 Samsung Electronics >> >> I don't think you should claim the copyright of the entire file you're copying the existing file and modifying it. > > It seems like all of this is accidental, caused by git. Initially the idea of logging was basing on the Source/WebCore/platform/gtk/LoggingGtk.cpp and even had note about it. But patch was redesigned and now don't have common main code. >> Source/WebKit2/Platform/gtk/LoggingGtk.cpp:13 >> + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' > > Also, this paragraph mentions Apple. right, I'll fix this. In fact I see a lot of errors like this in other files: Source/WebKit2/efl/MainEfl.cpp 439636 19 l.slachciak 2011-07-19 23:05:57 -0700 Thank you Ryosuke for fixing problem on Mac/Win 439653 20 rniwa 2011-07-20 00:02:12 -0700 (In reply to comment #19) > Thank you Ryosuke for fixing problem on Mac/Win Oh sorry, I forgot to mention that the Mac/Win builds were fixed in http://trac.webkit.org/changeset/91317. 98588 2011-06-25 04:27:37 -0700 2011-06-25 04:30:52 -0700 Loggging for WebKit2 - GTK w2GtkLogging1.patch text/plain 6539 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMTNmNGEyLi42MGI2M2E0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMjUgIEx1a2FzeiBTbGFjaGNpYWsgIDxsdWthc3ouc2xhY2hjaWFrQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb R1RLXSBbV0syXSBJbXBsZW1lbnQgbWlzc2luZyBpbml0aWFsaXplTG9nQ2hhbm5lbCBmdW5jdGlv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYzMzgx CisKKyAgICAgICAgSW1wbGVtZW50ZWQgbG9nZ2luZyBmb3IgR1RLIHBsYXRmb3JtIGluIFdlYktp dDIgLSBmdW5jdGlvbiBpbml0aWFsaXplTG9nQ2hhbm5lbCBpcyBjYWxsZWQgZm9yIGFsbCBwb3J0 cywKKyAgICAgICAgc28gYWRkZWQgbWlzc2luZyBpbXBsZW1lbnRhdGlvbi4gQXNsbyBoZWxwZXIg ZnVuY3Rpb24gYWRkZWQgZm9yIGdldHRpbmcgY2hhbm5lbHMgZnJvbSBuYW1lcy4KKworICAgICAg ICAqIEdOVW1ha2VmaWxlLmFtOiBBZGRlZCByZWZlcmVuY2UgdG8gbmV3IGZpbGUgTG9nZ2luZ0d0 ay5jcHAuCisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5jcHA6IExvZ2dpbmcgaW1wbGVtZW50 YXRpb24gZm9yIEdUSyBwb3J0IGVuYWJsZWQuCisgICAgICAgIChXZWJLaXQ6OmdldENoYW5uZWxG cm9tTmFtZSk6IEhlbHBlciB0byBjb25uZWN0IG5hbWUgd2l0aCBXVEZMb2dDaGFubmVsLgorICAg ICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDogTmV3IGhlbHBlciBtZXRob2QgYWRkZWQuCisgICAg ICAgICogUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwOiBHVEsgbG9nZ2luZyBpbXBsZW1lbnRh dGlvbi4KKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWwpOiBDaGVubmVsIGlz IGluaXRpYWxpemVkIGlmIGl0cyBuYW1lIGlzIGZvdW5kIGluIFdFQktJVF9ERUJVRy4KKwogMjAx MS0wNi0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEpvaG4gU3VsbGl2YW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9H TlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQzYWJk ZTMuLjViZjU0M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisr KyBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC05Nyw2ICs5Nyw3IEBAIGxpYndl YmtpdDJndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlO T1JfVkVSU0lPTkBfbGFfU09VCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNz YWdlU2VuZGVyLmggXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9BdHRh Y2htZW50VW5peC5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9D b25uZWN0aW9uVW5peC5jcHAgXAorCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Mb2dnaW5n R3RrLmNwcCBcCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3RrL01vZHVsZUd0ay5jcHAgXAog CVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9SdW5Mb29wR3RrLmNwcCBcCiAJU291cmNlL1dl YktpdDIvUGxhdGZvcm0vZ3RrL1dvcmtRdWV1ZUd0ay5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9M b2dnaW5nLmNwcAppbmRleCBiMGIyOTY3Li5mNjdlM2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9M b2dnaW5nLmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1 bmcgRWxlY3Ryb25pY3MKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzcsMTMg KzM4LDM5IEBAIFdURkxvZ0NoYW5uZWwgTG9nVmlldyAgICAgICAgID0geyAweDAwMDAwMDA4LCAi V2ViS2l0MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mCiBXVEZMb2dDaGFubmVsIExvZ0ljb25E YXRhYmFzZSA9IHsgMHgwMDAwMDAxMCwgIldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxP ZmYgfTsKIFdURkxvZ0NoYW5uZWwgTG9nS2V5SGFuZGxpbmcgID0geyAweDAwMDAwMDIwLCAiV2Vi S2l0MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogCi0jaWYgIVBMQVRGT1JNKE1BQykK KyNpZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oR1RLKQogdm9pZCBpbml0aWFsaXplTG9n Q2hhbm5lbChXVEZMb2dDaGFubmVsKiBjaGFubmVsKQogewogICAgIC8vIEZJWE1FOiBFYWNoIHBs YXRmb3JtIHdpbGwgbmVlZCB0byBkZWZpbmUgdGhlaXIgb3duIGluaXRpYWxpemVMb2dDaGFubmVs KCkuCiB9CiAjZW5kaWYKIAorV1RGTG9nQ2hhbm5lbCogZ2V0Q2hhbm5lbEZyb21OYW1lKGNvbnN0 IFN0cmluZyYgY2hhbm5lbE5hbWUpCit7CisgICAgaWYgKCEoY2hhbm5lbE5hbWUubGVuZ3RoKCkg Pj0gMikpCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNo YW5uZWxOYW1lLCBTdHJpbmcoIlNlc3Npb25TdGF0ZSIpKSkKKyAgICAgICAgcmV0dXJuICZMb2dT ZXNzaW9uU3RhdGU7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0 cmluZygiQ29udGV4dE1lbnUiKSkpCisgICAgICAgIHJldHVybiAmTG9nQ29udGV4dE1lbnU7CisK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiVGV4dElucHV0 IikpKQorICAgICAgICByZXR1cm4gJkxvZ1RleHRJbnB1dDsKKworICAgIGlmIChlcXVhbElnbm9y aW5nQ2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJWaWV3IikpKQorICAgICAgICByZXR1cm4gJkxv Z1ZpZXc7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygi SWNvbkRhdGFiYXNlIikpKQorICAgICAgICByZXR1cm4gJkxvZ0ljb25EYXRhYmFzZTsKKworICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJLZXlIYW5kbGluZyIp KSkKKyAgICAgICAgcmV0dXJuICZMb2dLZXlIYW5kbGluZzsKKworICAgIHJldHVybiAwOworfQor CiB2b2lkIGluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCkKIHsKICAgICBzdGF0aWMg Ym9vbCBoYXZlSW5pdGlhbGl6ZWRMb2dDaGFubmVscyA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v TG9nZ2luZy5oCmluZGV4IGI5OWNkNjkuLjgzYzY2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dn aW5nLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgV2ViS2l0TG9nZ2luZ19oCiAjZGVmaW5l IFdlYktpdExvZ2dpbmdfaAogCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRl IDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAjaWYgIUxPR19ESVNBQkxFRApAQCAtNDUsNiArNDYsNyBA QCBleHRlcm4gV1RGTG9nQ2hhbm5lbCBMb2dWaWV3OwogCiB2b2lkIGluaXRpYWxpemVMb2dDaGFu bmVsKFdURkxvZ0NoYW5uZWwqKTsKIHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3Nh cnkodm9pZCk7CitXVEZMb2dDaGFubmVsKiBnZXRDaGFubmVsRnJvbU5hbWUoY29uc3QgU3RyaW5n JiBjaGFubmVsTmFtZSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uMDE1ODczNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL2d0ay9Mb2dnaW5nR3RrLmNwcApAQCAtMCwwICsxLDU4IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDA3IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIw MDkgR3VzdGF2byBOb3JvbmhhIFNpbHZhIDxnbnNAZ25vbWUub3JnPgorICogQ29weXJpZ2h0IChD KSAyMDExIFNhbXN1bmcgRWxlY3Ryb25pY3MKKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5o IgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKworI2luY2x1ZGUgPGdsaWIuaD4KKworbmFtZXNwYWNl IFdlYktpdCB7CisKKyNpZiAhTE9HX0RJU0FCTEVECisKKy8vIEluc3BpcmVkIGJ5IHRoZSBXZWJD b3JlL3BsYXRmb3JtL2d0ay9Mb2dnaW5nR3RrLmNwcAordm9pZCBpbml0aWFsaXplTG9nQ2hhbm5l bChXVEZMb2dDaGFubmVsKiBjaGFubmVsKQoreworICAgIGNvbnN0IHN0YXRpYyBnY2hhciogbG9n RW52ID0gZ19nZXRlbnYoIldFQktJVF9ERUJVRyIpOworICAgIGlmICghbG9nRW52KQorICAgICAg ICByZXR1cm47CisKKyAgICAvLyB1bmZvcnR1bmF0ZWxseSB0aGlzIGlzIGluaXRpYWxpemVkIGFu ZCBlbnVtZXJhdGVkIGZvciBldmVyeSBXVEZMb2dDaGFubmVsCisgICAgZ2NoYXIqKiBsb2d2ID0g Z19zdHJzcGxpdChsb2dFbnYsICIgIiwgLTEpOworICAgIGZvciAoaW50IGkgPSAwOyBsb2d2W2ld OyBpKyspIHsKKyAgICAgICAgaWYgKGNoYW5uZWwgPT0gZ2V0Q2hhbm5lbEZyb21OYW1lKGxvZ3Zb aV0pKSB7CisgICAgICAgICAgICBjaGFubmVsLT5zdGF0ZSA9IFdURkxvZ0NoYW5uZWxPbjsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgZ19zdHJmcmVldihsb2d2 KTsKK30KKworI2VuZGlmIC8qICFMT0dfRElTQUJMRUQgKi8KKworfQo= 98589 2011-06-25 04:30:52 -0700 2011-06-30 06:50:37 -0700 Logging - WK2 GTK w2GtkLogging2.patch text/plain 6536 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMTNmNGEyLi45MmI2MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMjUgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lha0BzYW1zdW5nLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RL XSBbV0syXSBJbXBsZW1lbnQgbWlzc2luZyBpbml0aWFsaXplTG9nQ2hhbm5lbCBmdW5jdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYzMzgxCisK KyAgICAgICAgSW1wbGVtZW50ZWQgbG9nZ2luZyBmb3IgR1RLIHBsYXRmb3JtIGluIFdlYktpdDIg LSBmdW5jdGlvbiBpbml0aWFsaXplTG9nQ2hhbm5lbCBpcyBjYWxsZWQgZm9yIGFsbCBwb3J0cywK KyAgICAgICAgc28gYWRkZWQgbWlzc2luZyBpbXBsZW1lbnRhdGlvbi4gQXNsbyBoZWxwZXIgZnVu Y3Rpb24gYWRkZWQgZm9yIGdldHRpbmcgY2hhbm5lbHMgZnJvbSBuYW1lcy4KKworICAgICAgICAq IEdOVW1ha2VmaWxlLmFtOiBBZGRlZCByZWZlcmVuY2UgdG8gbmV3IGZpbGUgTG9nZ2luZ0d0ay5j cHAuCisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5jcHA6IExvZ2dpbmcgaW1wbGVtZW50YXRp b24gZm9yIEdUSyBwb3J0IGVuYWJsZWQuCisgICAgICAgIChXZWJLaXQ6OmdldENoYW5uZWxGcm9t TmFtZSk6IEhlbHBlciB0byBjb25uZWN0IG5hbWUgd2l0aCBXVEZMb2dDaGFubmVsLgorICAgICAg ICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDogTmV3IGhlbHBlciBtZXRob2QgYWRkZWQuCisgICAgICAg ICogUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwOiBHVEsgbG9nZ2luZyBpbXBsZW1lbnRhdGlv bi4KKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWwpOiBDaGVubmVsIGlzIGlu aXRpYWxpemVkIGlmIGl0cyBuYW1lIGlzIGZvdW5kIGluIFdFQktJVF9ERUJVRy4KKwogMjAxMS0w Ni0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEpvaG4gU3VsbGl2YW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVt YWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQzYWJkZTMu LjViZjU0M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisrKyBi L1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC05Nyw2ICs5Nyw3IEBAIGxpYndlYmtp dDJndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1Jf VkVSU0lPTkBfbGFfU09VCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdl U2VuZGVyLmggXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9BdHRhY2ht ZW50VW5peC5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25u ZWN0aW9uVW5peC5jcHAgXAorCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Mb2dnaW5nR3Rr LmNwcCBcCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3RrL01vZHVsZUd0ay5jcHAgXAogCVNv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9SdW5Mb29wR3RrLmNwcCBcCiAJU291cmNlL1dlYktp dDIvUGxhdGZvcm0vZ3RrL1dvcmtRdWV1ZUd0ay5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dn aW5nLmNwcAppbmRleCBiMGIyOTY3Li5mNjdlM2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dn aW5nLmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1bmcg RWxlY3Ryb25pY3MKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzcsMTMgKzM4 LDM5IEBAIFdURkxvZ0NoYW5uZWwgTG9nVmlldyAgICAgICAgID0geyAweDAwMDAwMDA4LCAiV2Vi S2l0MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mCiBXVEZMb2dDaGFubmVsIExvZ0ljb25EYXRh YmFzZSA9IHsgMHgwMDAwMDAxMCwgIldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZmYg fTsKIFdURkxvZ0NoYW5uZWwgTG9nS2V5SGFuZGxpbmcgID0geyAweDAwMDAwMDIwLCAiV2ViS2l0 MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogCi0jaWYgIVBMQVRGT1JNKE1BQykKKyNp ZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oR1RLKQogdm9pZCBpbml0aWFsaXplTG9nQ2hh bm5lbChXVEZMb2dDaGFubmVsKiBjaGFubmVsKQogewogICAgIC8vIEZJWE1FOiBFYWNoIHBsYXRm b3JtIHdpbGwgbmVlZCB0byBkZWZpbmUgdGhlaXIgb3duIGluaXRpYWxpemVMb2dDaGFubmVsKCku CiB9CiAjZW5kaWYKIAorV1RGTG9nQ2hhbm5lbCogZ2V0Q2hhbm5lbEZyb21OYW1lKGNvbnN0IFN0 cmluZyYgY2hhbm5lbE5hbWUpCit7CisgICAgaWYgKCEoY2hhbm5lbE5hbWUubGVuZ3RoKCkgPj0g MikpCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5u ZWxOYW1lLCBTdHJpbmcoIlNlc3Npb25TdGF0ZSIpKSkKKyAgICAgICAgcmV0dXJuICZMb2dTZXNz aW9uU3RhdGU7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmlu ZygiQ29udGV4dE1lbnUiKSkpCisgICAgICAgIHJldHVybiAmTG9nQ29udGV4dE1lbnU7CisKKyAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiVGV4dElucHV0Iikp KQorICAgICAgICByZXR1cm4gJkxvZ1RleHRJbnB1dDsKKworICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJWaWV3IikpKQorICAgICAgICByZXR1cm4gJkxvZ1Zp ZXc7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiSWNv bkRhdGFiYXNlIikpKQorICAgICAgICByZXR1cm4gJkxvZ0ljb25EYXRhYmFzZTsKKworICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJLZXlIYW5kbGluZyIpKSkK KyAgICAgICAgcmV0dXJuICZMb2dLZXlIYW5kbGluZzsKKworICAgIHJldHVybiAwOworfQorCiB2 b2lkIGluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCkKIHsKICAgICBzdGF0aWMgYm9v bCBoYXZlSW5pdGlhbGl6ZWRMb2dDaGFubmVscyA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9n Z2luZy5oCmluZGV4IGI5OWNkNjkuLjgzYzY2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5n LmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgV2ViS2l0TG9nZ2luZ19oCiAjZGVmaW5lIFdl YktpdExvZ2dpbmdfaAogCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRlIDx3 dGYvQXNzZXJ0aW9ucy5oPgogCiAjaWYgIUxPR19ESVNBQkxFRApAQCAtNDUsNiArNDYsNyBAQCBl eHRlcm4gV1RGTG9nQ2hhbm5lbCBMb2dWaWV3OwogCiB2b2lkIGluaXRpYWxpemVMb2dDaGFubmVs KFdURkxvZ0NoYW5uZWwqKTsKIHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3Nhcnko dm9pZCk7CitXVEZMb2dDaGFubmVsKiBnZXRDaGFubmVsRnJvbU5hbWUoY29uc3QgU3RyaW5nJiBj aGFubmVsTmFtZSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9Q bGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uMDE1ODczNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt L2d0ay9Mb2dnaW5nR3RrLmNwcApAQCAtMCwwICsxLDU4IEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDA3IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDkg R3VzdGF2byBOb3JvbmhhIFNpbHZhIDxnbnNAZ25vbWUub3JnPgorICogQ29weXJpZ2h0IChDKSAy MDExIFNhbXN1bmcgRWxlY3Ryb25pY3MKKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor ICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisg KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgor I2luY2x1ZGUgIkxvZ2dpbmcuaCIKKworI2luY2x1ZGUgPGdsaWIuaD4KKworbmFtZXNwYWNlIFdl YktpdCB7CisKKyNpZiAhTE9HX0RJU0FCTEVECisKKy8vIEluc3BpcmVkIGJ5IHRoZSBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9Mb2dnaW5nR3RrLmNwcAordm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChX VEZMb2dDaGFubmVsKiBjaGFubmVsKQoreworICAgIGNvbnN0IHN0YXRpYyBnY2hhciogbG9nRW52 ID0gZ19nZXRlbnYoIldFQktJVF9ERUJVRyIpOworICAgIGlmICghbG9nRW52KQorICAgICAgICBy ZXR1cm47CisKKyAgICAvLyB1bmZvcnR1bmF0ZWxseSB0aGlzIGlzIGluaXRpYWxpemVkIGFuZCBl bnVtZXJhdGVkIGZvciBldmVyeSBXVEZMb2dDaGFubmVsCisgICAgZ2NoYXIqKiBsb2d2ID0gZ19z dHJzcGxpdChsb2dFbnYsICIgIiwgLTEpOworICAgIGZvciAoaW50IGkgPSAwOyBsb2d2W2ldOyBp KyspIHsKKyAgICAgICAgaWYgKGNoYW5uZWwgPT0gZ2V0Q2hhbm5lbEZyb21OYW1lKGxvZ3ZbaV0p KSB7CisgICAgICAgICAgICBjaGFubmVsLT5zdGF0ZSA9IFdURkxvZ0NoYW5uZWxPbjsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgZ19zdHJmcmVldihsb2d2KTsK K30KKworI2VuZGlmIC8qICFMT0dfRElTQUJMRUQgKi8KKworfQo= 99293 2011-06-30 06:50:37 -0700 2011-07-14 14:23:57 -0700 Logging WK2 GTK logging2.patch text/plain 6425 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMWIxNzdkLi4wMjM3NjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDYtMzAgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lha0BzYW1zdW5nLmNv bT4KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10g W1dLMl0gSW1wbGVtZW50IG1pc3NpbmcgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwgZnVuY3Rpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzM4MQorCisg ICAgICAgIEltcGxlbWVudGVkIGxvZ2dpbmcgZm9yIEdUSyBwbGF0Zm9ybSBpbiBXZWJLaXQyIC0g ZnVuY3Rpb24gaW5pdGlhbGl6ZUxvZ0NoYW5uZWwgaXMgY2FsbGVkIGZvciBhbGwgcG9ydHMsCisg ICAgICAgIHNvIGFkZGVkIG1pc3NpbmcgaW1wbGVtZW50YXRpb24uIEFzbG8gaGVscGVyIGZ1bmN0 aW9uIGFkZGVkIGZvciBnZXR0aW5nIGNoYW5uZWxzIGZyb20gbmFtZXMuCisKKyAgICAgICAgKiBH TlVtYWtlZmlsZS5hbTogQWRkZWQgcmVmZXJlbmNlIHRvIG5ldyBmaWxlIExvZ2dpbmdHdGsuY3Bw LgorICAgICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuY3BwOiBMb2dnaW5nIGltcGxlbWVudGF0aW9u IGZvciBHVEsgcG9ydCBlbmFibGVkLgorICAgICAgICAoV2ViS2l0OjpnZXRDaGFubmVsRnJvbU5h bWUpOiBIZWxwZXIgdG8gY29ubmVjdCBuYW1lIHdpdGggV1RGTG9nQ2hhbm5lbC4KKyAgICAgICAg KiBQbGF0Zm9ybS9Mb2dnaW5nLmg6IE5ldyBoZWxwZXIgbWV0aG9kIGFkZGVkLgorICAgICAgICAq IFBsYXRmb3JtL2d0ay9Mb2dnaW5nR3RrLmNwcDogR1RLIGxvZ2dpbmcgaW1wbGVtZW50YXRpb24u CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsKTogQ2hhbm5lbCBpcyBpbml0 aWFsaXplZCBpZiBpdHMgbmFtZSBpcyBmb3VuZCBpbiBXRUJLSVRfREVCVUcuCisKIDIwMTEtMDYt MjkgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5h bSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQzYWJkZTMuLjViZjU0M2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC05Nyw2ICs5Nyw3IEBAIGxpYndlYmtpdDJndGtfQFdF QktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBf bGFfU09VCiAJU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlU2VuZGVyLmgg XAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9BdHRhY2htZW50VW5peC5j cHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5p eC5jcHAgXAorCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Mb2dnaW5nR3RrLmNwcCBcCiAJ U291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3RrL01vZHVsZUd0ay5jcHAgXAogCVNvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL2d0ay9SdW5Mb29wR3RrLmNwcCBcCiAJU291cmNlL1dlYktpdDIvUGxhdGZv cm0vZ3RrL1dvcmtRdWV1ZUd0ay5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vTG9nZ2luZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcApp bmRleCBiMGIyOTY3Li5iMjkwNDA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Mb2dnaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcApA QCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1bmcgRWxlY3Ryb25p Y3MKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzcsMTMgKzM4LDQxIEBAIFdU RkxvZ0NoYW5uZWwgTG9nVmlldyAgICAgICAgID0geyAweDAwMDAwMDA4LCAiV2ViS2l0MkxvZ0xl dmVsIiwgV1RGTG9nQ2hhbm5lbE9mCiBXVEZMb2dDaGFubmVsIExvZ0ljb25EYXRhYmFzZSA9IHsg MHgwMDAwMDAxMCwgIldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZmYgfTsKIFdURkxv Z0NoYW5uZWwgTG9nS2V5SGFuZGxpbmcgID0geyAweDAwMDAwMDIwLCAiV2ViS2l0MkxvZ0xldmVs IiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogCi0jaWYgIVBMQVRGT1JNKE1BQykKKyNpZiAhUExBVEZP Uk0oTUFDKSAmJiAhUExBVEZPUk0oR1RLKQogdm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZM b2dDaGFubmVsKiBjaGFubmVsKQogewogICAgIC8vIEZJWE1FOiBFYWNoIHBsYXRmb3JtIHdpbGwg bmVlZCB0byBkZWZpbmUgdGhlaXIgb3duIGluaXRpYWxpemVMb2dDaGFubmVsKCkuCiB9CiAjZW5k aWYKIAorI2lmIFBMQVRGT1JNKEdUSykKK1dURkxvZ0NoYW5uZWwqIGdldENoYW5uZWxGcm9tTmFt ZShjb25zdCBTdHJpbmcmIGNoYW5uZWxOYW1lKQoreworICAgIGlmICghKGNoYW5uZWxOYW1lLmxl bmd0aCgpID49IDIpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJTZXNzaW9uU3RhdGUiKSkpCisgICAgICAgIHJldHVy biAmTG9nU2Vzc2lvblN0YXRlOworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxO YW1lLCBTdHJpbmcoIkNvbnRleHRNZW51IikpKQorICAgICAgICByZXR1cm4gJkxvZ0NvbnRleHRN ZW51OworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxOYW1lLCBTdHJpbmcoIlRl eHRJbnB1dCIpKSkKKyAgICAgICAgcmV0dXJuICZMb2dUZXh0SW5wdXQ7CisKKyAgICBpZiAoZXF1 YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiVmlldyIpKSkKKyAgICAgICAgcmV0 dXJuICZMb2dWaWV3OworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxOYW1lLCBT dHJpbmcoIkljb25EYXRhYmFzZSIpKSkKKyAgICAgICAgcmV0dXJuICZMb2dJY29uRGF0YWJhc2U7 CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiS2V5SGFu ZGxpbmciKSkpCisgICAgICAgIHJldHVybiAmTG9nS2V5SGFuZGxpbmc7CisKKyAgICByZXR1cm4g MDsKK30KKyNlbmRpZgorCiB2b2lkIGluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KCkK IHsKICAgICBzdGF0aWMgYm9vbCBoYXZlSW5pdGlhbGl6ZWRMb2dDaGFubmVscyA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dl YktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCmluZGV4IGI5OWNkNjkuLjMxZGNhNTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgV2ViS2l0TG9n Z2luZ19oCiAjZGVmaW5lIFdlYktpdExvZ2dpbmdfaAogCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJp bmcuaCIKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAjaWYgIUxPR19ESVNBQkxFRApA QCAtNDUsNiArNDYsOSBAQCBleHRlcm4gV1RGTG9nQ2hhbm5lbCBMb2dWaWV3OwogCiB2b2lkIGlu aXRpYWxpemVMb2dDaGFubmVsKFdURkxvZ0NoYW5uZWwqKTsKIHZvaWQgaW5pdGlhbGl6ZUxvZ0No YW5uZWxzSWZOZWNlc3Nhcnkodm9pZCk7CisjaWYgUExBVEZPUk0oR1RLKQorV1RGTG9nQ2hhbm5l bCogZ2V0Q2hhbm5lbEZyb21OYW1lKGNvbnN0IFN0cmluZyYgY2hhbm5lbE5hbWUpOworI2VuZGlm CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9Q bGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsv TG9nZ2luZ0d0ay5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTQ1NDQz ZQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Mb2dnaW5n R3RrLmNwcApAQCAtMCwwICsxLDU4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1 bmcgRWxlY3Ryb25pY3MKKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1l dDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUg IkxvZ2dpbmcuaCIKKworI2luY2x1ZGUgPGdsaWIuaD4KKworbmFtZXNwYWNlIFdlYktpdCB7CisK KyNpZiAhTE9HX0RJU0FCTEVECisKKy8vIEluc3BpcmVkIGJ5IHRoZSBXZWJDb3JlL3BsYXRmb3Jt L2d0ay9Mb2dnaW5nR3RrLmNwcAordm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZMb2dDaGFu bmVsKiBjaGFubmVsKQoreworICAgIGNvbnN0IHN0YXRpYyBTdHJpbmcgbG9nRW52KGdfZ2V0ZW52 KCJXRUJLSVRfREVCVUciKSk7CisgICAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGxvZ3Y7CisKKyAg ICBpZiAoIWxvZ0VudikKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGxvZ3YuaXNFbXB0eSgp KQorICAgICAgICBsb2dFbnYuc3BsaXQoIiAiLCBsb2d2KTsKKworICAgIGZvciAodW5zaWduZWQg aW50IGkgPSAwOyBpIDwgbG9ndi5zaXplKCk7IGkrKykgeworICAgICAgICBpZiAoY2hhbm5lbCA9 PSBnZXRDaGFubmVsRnJvbU5hbWUobG9ndltpXSkpIHsKKyAgICAgICAgICAgIGNoYW5uZWwtPnN0 YXRlID0gV1RGTG9nQ2hhbm5lbE9uOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAg ICB9CisKK30KKworI2VuZGlmIC8vICFMT0dfRElTQUJMRUQKKworfQo= 100864 2011-07-14 14:23:57 -0700 2011-07-19 14:21:55 -0700 WebKit2 Logging for GTK port implementation logging3.patch text/plain 6726 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MWFiNGM5Li5kMzlhOTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDctMTQgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lha0BzYW1zdW5nLmNv bT4KKworICAgICAgICBbR1RLXSBbV0syXSBJbXBsZW1lbnQgbWlzc2luZyBpbml0aWFsaXplTG9n Q2hhbm5lbCBmdW5jdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYzMzgxCisKKyAgICAgICAgSW1wbGVtZW50ZWQgbG9nZ2luZyBmb3IgR1RLIHBs YXRmb3JtIGluIFdlYktpdDIgLSBmdW5jdGlvbiBpbml0aWFsaXplTG9nQ2hhbm5lbCBpcyBjYWxs ZWQgZm9yIGFsbCBwb3J0cywKKyAgICAgICAgc28gYWRkZWQgbWlzc2luZyBpbXBsZW1lbnRhdGlv bi4gQXNsbyBoZWxwZXIgZnVuY3Rpb24gYWRkZWQgZm9yIGdldHRpbmcgY2hhbm5lbHMgZnJvbSBu YW1lcy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEdOVW1ha2VmaWxlLmFtOiBBZGRlZCByZWZlcmVuY2UgdG8gbmV3IGZpbGUgTG9nZ2luZ0d0ay5j cHAuCisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5jcHA6IExvZ2dpbmcgaW1wbGVtZW50YXRp b24gZm9yIEdUSyBwb3J0IGVuYWJsZWQuCisgICAgICAgIChXZWJLaXQ6OmdldENoYW5uZWxGcm9t TmFtZSk6IEhlbHBlciB0byBjb25uZWN0IG5hbWUgd2l0aCBXVEZMb2dDaGFubmVsLgorICAgICAg ICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDogTmV3IGhlbHBlciBtZXRob2QgYWRkZWQuCisgICAgICAg ICogUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwOiBHVEsgbG9nZ2luZyBpbXBsZW1lbnRhdGlv bi4KKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWwpOiBDaGFubmVsIGlzIGlu aXRpYWxpemVkIGlmIGl0cyBuYW1lIGlzIGZvdW5kIGluIFdFQktJVF9ERUJVRy4KKwogMjAxMS0w Ny0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQppbmRleCA2 MDUxNTgwLi4xYmJlYTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5h bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQpAQCAtOTcsNiArOTcsNyBAQCBs aWJ3ZWJraXQyZ3RrX0BXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05AX0BXRUJLSVRHVEtfQVBJ X01JTk9SX1ZFUlNJT05AX2xhX1NPVQogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMv TWVzc2FnZVNlbmRlci5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgv QXR0YWNobWVudFVuaXguY3BwIFwKIAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3Vu aXgvQ29ubmVjdGlvblVuaXguY3BwIFwKKwlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvTG9n Z2luZ0d0ay5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Nb2R1bGVHdGsuY3Bw IFwKIAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvUnVuTG9vcEd0ay5jcHAgXAogCVNvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Xb3JrUXVldWVHdGsuY3BwIFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZv cm0vTG9nZ2luZy5jcHAKaW5kZXggYjBiMjk2Ny4uYjI5MDQwOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZv cm0vTG9nZ2luZy5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEw IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBT YW1zdW5nIEVsZWN0cm9uaWNzCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM3 LDEzICszOCw0MSBAQCBXVEZMb2dDaGFubmVsIExvZ1ZpZXcgICAgICAgICA9IHsgMHgwMDAwMDAw OCwgIldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZgogV1RGTG9nQ2hhbm5lbCBMb2dJ Y29uRGF0YWJhc2UgPSB7IDB4MDAwMDAwMTAsICJXZWJLaXQyTG9nTGV2ZWwiLCBXVEZMb2dDaGFu bmVsT2ZmIH07CiBXVEZMb2dDaGFubmVsIExvZ0tleUhhbmRsaW5nICA9IHsgMHgwMDAwMDAyMCwg IldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZmYgfTsKIAotI2lmICFQTEFURk9STShN QUMpCisjaWYgIVBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKEdUSykKIHZvaWQgaW5pdGlhbGl6 ZUxvZ0NoYW5uZWwoV1RGTG9nQ2hhbm5lbCogY2hhbm5lbCkKIHsKICAgICAvLyBGSVhNRTogRWFj aCBwbGF0Zm9ybSB3aWxsIG5lZWQgdG8gZGVmaW5lIHRoZWlyIG93biBpbml0aWFsaXplTG9nQ2hh bm5lbCgpLgogfQogI2VuZGlmCiAKKyNpZiBQTEFURk9STShHVEspCitXVEZMb2dDaGFubmVsKiBn ZXRDaGFubmVsRnJvbU5hbWUoY29uc3QgU3RyaW5nJiBjaGFubmVsTmFtZSkKK3sKKyAgICBpZiAo IShjaGFubmVsTmFtZS5sZW5ndGgoKSA+PSAyKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBp ZiAoZXF1YWxJZ25vcmluZ0Nhc2UoY2hhbm5lbE5hbWUsIFN0cmluZygiU2Vzc2lvblN0YXRlIikp KQorICAgICAgICByZXR1cm4gJkxvZ1Nlc3Npb25TdGF0ZTsKKworICAgIGlmIChlcXVhbElnbm9y aW5nQ2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJDb250ZXh0TWVudSIpKSkKKyAgICAgICAgcmV0 dXJuICZMb2dDb250ZXh0TWVudTsKKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVs TmFtZSwgU3RyaW5nKCJUZXh0SW5wdXQiKSkpCisgICAgICAgIHJldHVybiAmTG9nVGV4dElucHV0 OworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxOYW1lLCBTdHJpbmcoIlZpZXci KSkpCisgICAgICAgIHJldHVybiAmTG9nVmlldzsKKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2Fz ZShjaGFubmVsTmFtZSwgU3RyaW5nKCJJY29uRGF0YWJhc2UiKSkpCisgICAgICAgIHJldHVybiAm TG9nSWNvbkRhdGFiYXNlOworCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxOYW1l LCBTdHJpbmcoIktleUhhbmRsaW5nIikpKQorICAgICAgICByZXR1cm4gJkxvZ0tleUhhbmRsaW5n OworCisgICAgcmV0dXJuIDA7Cit9CisjZW5kaWYKKwogdm9pZCBpbml0aWFsaXplTG9nQ2hhbm5l bHNJZk5lY2Vzc2FyeSgpCiB7CiAgICAgc3RhdGljIGJvb2wgaGF2ZUluaXRpYWxpemVkTG9nQ2hh bm5lbHMgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dp bmcuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCBiOTljZDY5Li4z MWRjYTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgKKysr IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCkBAIC0yNiw2ICsyNiw3IEBACiAj aWZuZGVmIFdlYktpdExvZ2dpbmdfaAogI2RlZmluZSBXZWJLaXRMb2dnaW5nX2gKIAorI2luY2x1 ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogI2lm ICFMT0dfRElTQUJMRUQKQEAgLTQ1LDYgKzQ2LDkgQEAgZXh0ZXJuIFdURkxvZ0NoYW5uZWwgTG9n VmlldzsKIAogdm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZMb2dDaGFubmVsKik7CiB2b2lk IGluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHZvaWQpOworI2lmIFBMQVRGT1JNKEdU SykKK1dURkxvZ0NoYW5uZWwqIGdldENoYW5uZWxGcm9tTmFtZShjb25zdCBTdHJpbmcmIGNoYW5u ZWxOYW1lKTsKKyNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjI0OTM5YzMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAKQEAgLTAsMCArMSw2MCBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAxMSBTYW1zdW5nIEVsZWN0cm9uaWNzCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMg SVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRP UlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgor ICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25m aWcuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCisKKyNpbmNsdWRlIDxnbGliLmg+CisKK25hbWVz cGFjZSBXZWJLaXQgeworCisjaWYgIUxPR19ESVNBQkxFRAorCit2b2lkIGluaXRpYWxpemVMb2dD aGFubmVsKFdURkxvZ0NoYW5uZWwqIGNoYW5uZWwpCit7CisgICAgc3RhdGljIFZlY3RvcjxXVEZM b2dDaGFubmVsKj4gYWN0aXZhdGVkQ2hhbm5lbHM7CisgICAgY29uc3Qgc3RhdGljIFN0cmluZyBs b2dWYWx1ZShnX2dldGVudigiV0VCS0lUX0RFQlVHIikpOworCisgICAgaWYgKGxvZ1ZhbHVlLmlz RW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gZnVsZmlsbCBhY3RpdmF0ZWRDaGFu bmVscyB2ZWN0b3Igb25seSBvbmNlIGJhc2luZyBvbiBuYW1lcyBzZXQgaW4gbG9nRW52CisgICAg aWYgKGFjdGl2YXRlZENoYW5uZWxzLmlzRW1wdHkoKSkgeworICAgICAgICBzdGF0aWMgVmVjdG9y PFN0cmluZz4gYWN0aXZhdGVkTmFtZXM7CisgICAgICAgIGxvZ1ZhbHVlLnNwbGl0KCIgIiwgYWN0 aXZhdGVkTmFtZXMpOworICAgICAgICBmb3IgKHVuc2lnbmVkIGludCBpID0gMDsgaSA8IGFjdGl2 YXRlZE5hbWVzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICBXVEZMb2dDaGFubmVsKiBhY3Rp dmVDaGFubmVsID0gZ2V0Q2hhbm5lbEZyb21OYW1lKGFjdGl2YXRlZE5hbWVzW2ldKTsKKyAgICAg ICAgICAgIGlmIChhY3RpdmVDaGFubmVsKQorICAgICAgICAgICAgICAgIGFjdGl2YXRlZENoYW5u ZWxzLmFwcGVuZChhY3RpdmVDaGFubmVsKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmIChh Y3RpdmF0ZWRDaGFubmVscy5jb250YWlucyhjaGFubmVsKSkKKyAgICAgICAgY2hhbm5lbC0+c3Rh dGUgPSBXVEZMb2dDaGFubmVsT247Cit9CisKKyNlbmRpZiAvLyAhTE9HX0RJU0FCTEVECisKK30K 101387 2011-07-19 14:20:12 -0700 2011-07-19 22:52:46 -0700 Logging implementation for WebKit2 GTK logging4.patch text/plain 6764 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlZmFkYWZiLi40M2E2NTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDctMTkgIEx1a2FzeiBTbGFjaGNpYWsgIDxsdWthc3ouc2xhY2hjaWFrQGdtYWls LmNvbT4KKworICAgICAgICBbR1RLXSBbV0syXSBJbXBsZW1lbnQgbWlzc2luZyBpbml0aWFsaXpl TG9nQ2hhbm5lbCBmdW5jdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYzMzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW1wbGVtZW50ZWQgbG9nZ2luZyBmb3IgR1RLIHBsYXRmb3JtIGluIFdlYktp dDIgLSBmdW5jdGlvbiBpbml0aWFsaXplTG9nQ2hhbm5lbCBpcyBjYWxsZWQgZm9yIGFsbCBwb3J0 cywKKyAgICAgICAgc28gYWRkZWQgbWlzc2luZyBpbXBsZW1lbnRhdGlvbi4gQXNsbyBoZWxwZXIg ZnVuY3Rpb24gYWRkZWQgZm9yIGdldHRpbmcgY2hhbm5lbHMgZnJvbSBuYW1lcy4KKworICAgICAg ICAqIEdOVW1ha2VmaWxlLmFtOiBBZGRlZCByZWZlcmVuY2UgdG8gbmV3IGZpbGUgTG9nZ2luZ0d0 ay5jcHAuCisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5jcHA6IExvZ2dpbmcgaW1wbGVtZW50 YXRpb24gZm9yIEdUSyBwb3J0IGVuYWJsZWQuCisgICAgICAgIChXZWJLaXQ6OmdldENoYW5uZWxG cm9tTmFtZSk6IEhlbHBlciB0byBjb25uZWN0IG5hbWUgd2l0aCBXVEZMb2dDaGFubmVsLgorICAg ICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDogTmV3IGhlbHBlciBtZXRob2QgYWRkZWQuCisgICAg ICAgICogUGxhdGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwOiBBZGRlZC4gR1RLIGxvZ2dpbmcgaW1w bGVtZW50YXRpb24uCisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsKTogQ2hh bm5lbCBpcyBpbml0aWFsaXplZCBpZiBpdHMgbmFtZSBpcyBmb3VuZCBpbiBXRUJLSVRfREVCVUcu CisKIDIwMTEtMDctMTkgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBiYWNrIGEgY2hhbmdlIHRoYXQgd2FzIGFjY2lkZW50YWxseSByZW1vdmVk IGluIHI5MTI2Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtIGIv U291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KaW5kZXggYzQ4N2M4Zi4uMTdiYzJlZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktp dDIvR05VbWFrZWZpbGUuYW0KQEAgLTE2OCw2ICsxNjgsNyBAQCBsaWJ3ZWJraXQyZ3RrX0BXRUJL SVRHVEtfQVBJX01BSk9SX1ZFUlNJT05AX0BXRUJLSVRHVEtfQVBJX01JTk9SX1ZFUlNJT05AX2xh X1NPVQogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZVNlbmRlci5oIFwK IAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQXR0YWNobWVudFVuaXguY3Bw IFwKIAlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXgu Y3BwIFwKKwlTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvTG9nZ2luZ0d0ay5jcHAgXAogCVNv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL2d0ay9Nb2R1bGVHdGsuY3BwIFwKIAlTb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9ndGsvUnVuTG9vcEd0ay5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt L2d0ay9Xb3JrUXVldWVHdGsuY3BwIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL0xvZ2dpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKaW5k ZXggYjBiMjk2Ny4uYjI5MDQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v TG9nZ2luZy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKQEAg LTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBTYW1zdW5nIEVsZWN0cm9uaWNz CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM3LDEzICszOCw0MSBAQCBXVEZM b2dDaGFubmVsIExvZ1ZpZXcgICAgICAgICA9IHsgMHgwMDAwMDAwOCwgIldlYktpdDJMb2dMZXZl bCIsIFdURkxvZ0NoYW5uZWxPZgogV1RGTG9nQ2hhbm5lbCBMb2dJY29uRGF0YWJhc2UgPSB7IDB4 MDAwMDAwMTAsICJXZWJLaXQyTG9nTGV2ZWwiLCBXVEZMb2dDaGFubmVsT2ZmIH07CiBXVEZMb2dD aGFubmVsIExvZ0tleUhhbmRsaW5nICA9IHsgMHgwMDAwMDAyMCwgIldlYktpdDJMb2dMZXZlbCIs IFdURkxvZ0NoYW5uZWxPZmYgfTsKIAotI2lmICFQTEFURk9STShNQUMpCisjaWYgIVBMQVRGT1JN KE1BQykgJiYgIVBMQVRGT1JNKEdUSykKIHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwoV1RGTG9n Q2hhbm5lbCogY2hhbm5lbCkKIHsKICAgICAvLyBGSVhNRTogRWFjaCBwbGF0Zm9ybSB3aWxsIG5l ZWQgdG8gZGVmaW5lIHRoZWlyIG93biBpbml0aWFsaXplTG9nQ2hhbm5lbCgpLgogfQogI2VuZGlm CiAKKyNpZiBQTEFURk9STShHVEspCitXVEZMb2dDaGFubmVsKiBnZXRDaGFubmVsRnJvbU5hbWUo Y29uc3QgU3RyaW5nJiBjaGFubmVsTmFtZSkKK3sKKyAgICBpZiAoIShjaGFubmVsTmFtZS5sZW5n dGgoKSA+PSAyKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nh c2UoY2hhbm5lbE5hbWUsIFN0cmluZygiU2Vzc2lvblN0YXRlIikpKQorICAgICAgICByZXR1cm4g JkxvZ1Nlc3Npb25TdGF0ZTsKKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVsTmFt ZSwgU3RyaW5nKCJDb250ZXh0TWVudSIpKSkKKyAgICAgICAgcmV0dXJuICZMb2dDb250ZXh0TWVu dTsKKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVsTmFtZSwgU3RyaW5nKCJUZXh0 SW5wdXQiKSkpCisgICAgICAgIHJldHVybiAmTG9nVGV4dElucHV0OworCisgICAgaWYgKGVxdWFs SWdub3JpbmdDYXNlKGNoYW5uZWxOYW1lLCBTdHJpbmcoIlZpZXciKSkpCisgICAgICAgIHJldHVy biAmTG9nVmlldzsKKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShjaGFubmVsTmFtZSwgU3Ry aW5nKCJJY29uRGF0YWJhc2UiKSkpCisgICAgICAgIHJldHVybiAmTG9nSWNvbkRhdGFiYXNlOwor CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNoYW5uZWxOYW1lLCBTdHJpbmcoIktleUhhbmRs aW5nIikpKQorICAgICAgICByZXR1cm4gJkxvZ0tleUhhbmRsaW5nOworCisgICAgcmV0dXJuIDA7 Cit9CisjZW5kaWYKKwogdm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpCiB7 CiAgICAgc3RhdGljIGJvb2wgaGF2ZUluaXRpYWxpemVkTG9nQ2hhbm5lbHMgPSBmYWxzZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCBiOTljZDY5Li4zMWRjYTU2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vTG9nZ2luZy5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIFdlYktpdExvZ2dp bmdfaAogI2RlZmluZSBXZWJLaXRMb2dnaW5nX2gKIAorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5n LmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogI2lmICFMT0dfRElTQUJMRUQKQEAg LTQ1LDYgKzQ2LDkgQEAgZXh0ZXJuIFdURkxvZ0NoYW5uZWwgTG9nVmlldzsKIAogdm9pZCBpbml0 aWFsaXplTG9nQ2hhbm5lbChXVEZMb2dDaGFubmVsKik7CiB2b2lkIGluaXRpYWxpemVMb2dDaGFu bmVsc0lmTmVjZXNzYXJ5KHZvaWQpOworI2lmIFBMQVRGT1JNKEdUSykKK1dURkxvZ0NoYW5uZWwq IGdldENoYW5uZWxGcm9tTmFtZShjb25zdCBTdHJpbmcmIGNoYW5uZWxOYW1lKTsKKyNlbmRpZgog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vZ3RrL0xvZ2dpbmdHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3RrL0xv Z2dpbmdHdGsuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg2MzdjMWUK LS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvTG9nZ2luZ0d0 ay5jcHAKQEAgLTAsMCArMSw2MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBTYW1zdW5n IEVsZWN0cm9uaWNzCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJM b2dnaW5nLmgiCisKKyNpbmNsdWRlIDxnbGliLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisj aWYgIUxPR19ESVNBQkxFRAorCit2b2lkIGluaXRpYWxpemVMb2dDaGFubmVsKFdURkxvZ0NoYW5u ZWwqIGNoYW5uZWwpCit7CisgICAgc3RhdGljIFZlY3RvcjxXVEZMb2dDaGFubmVsKj4gYWN0aXZh dGVkQ2hhbm5lbHM7CisgICAgY29uc3Qgc3RhdGljIFN0cmluZyBsb2dWYWx1ZShnX2dldGVudigi V0VCS0lUX0RFQlVHIikpOworCisgICAgaWYgKGxvZ1ZhbHVlLmlzRW1wdHkoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgLy8gRmlsbCBhY3RpdmF0ZWRDaGFubmVscyB2ZWN0b3Igb25seSBvbmNl IGJhc2VkIG9uIG5hbWVzIHNldCBpbiBsb2dWYWx1ZS4KKyAgICBpZiAoYWN0aXZhdGVkQ2hhbm5l bHMuaXNFbXB0eSgpKSB7CisgICAgICAgIHN0YXRpYyBWZWN0b3I8U3RyaW5nPiBhY3RpdmF0ZWRO YW1lczsKKyAgICAgICAgbG9nVmFsdWUuc3BsaXQoIiAiLCBhY3RpdmF0ZWROYW1lcyk7CisgICAg ICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwOyBpIDwgYWN0aXZhdGVkTmFtZXMuc2l6ZSgpOyBp KyspIHsKKyAgICAgICAgICAgIFdURkxvZ0NoYW5uZWwqIGFjdGl2ZUNoYW5uZWwgPSBnZXRDaGFu bmVsRnJvbU5hbWUoYWN0aXZhdGVkTmFtZXNbaV0pOworICAgICAgICAgICAgaWYgKGFjdGl2ZUNo YW5uZWwpCisgICAgICAgICAgICAgICAgYWN0aXZhdGVkQ2hhbm5lbHMuYXBwZW5kKGFjdGl2ZUNo YW5uZWwpOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKGFjdGl2YXRlZENoYW5uZWxzLmNv bnRhaW5zKGNoYW5uZWwpKQorICAgICAgICBjaGFubmVsLT5zdGF0ZSA9IFdURkxvZ0NoYW5uZWxP bjsKK30KKworI2VuZGlmIC8vICFMT0dfRElTQUJMRUQKKworfQo=