55308 2011-02-26 14:50:23 -0800 [GTK] General mechanism for adjusting WebKitWebSettings in GtkLauncher. 2011-06-20 11:34:41 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED P2 Enhancement --- 0 l.slachciak webkit-unassigned alex gustavo mrobinson webkit.review.bot xan.lopez oldest_to_newest 358587 0 l.slachciak 2011-02-26 14:50:23 -0800 Added possibility for GtkLauncher to parse command line options. As a first available option - frame flattening. On some sites (e.g. www.expedia.com) turning on this option causes layout problems. 358589 1 83953 l.slachciak 2011-02-26 14:51:59 -0800 Created attachment 83953 GtkLauncher frame flattening option 358592 2 l.slachciak 2011-02-26 15:01:31 -0800 And there is no compatibility break. You can still use GtkLauncher in the "old style" i.e. putting just URL on the command line. 359287 3 mrobinson 2011-02-28 13:25:35 -0800 I think I'd rather see some more general mechanism for adjusting WebKitWebSettings in GtkLauncher. One in which you can pass in property name and value strings and it would do the right thing. CCing some other GTK+ guys here. 360213 4 l.slachciak 2011-03-01 14:08:03 -0800 I'll think about it. We will need to distinguish between different types (boolean/string etc,) of properties passed by commandline. 363063 5 84887 l.slachciak 2011-03-06 05:55:49 -0800 Created attachment 84887 [GTK] General mechanism for adjusting WebKitWebSettings in GtkLauncher Following Martin's comments I created general mechanism for parsing WebKitWebSettings options. It fills available GtkLauncher --help-websettings options with WebKitWebSettings group. All writable string/int/boolean properties will be listed there. User can pass by commandline any combination of them: e.g.: --enable-frame-flattening=1 --minimum-font-size=30 http://xahlee.org/js/frame/0.html --user-agent="SomeStrangeUA" http://www.useragentstring.com --enable-spatial-navigation=1 --minimum-font-size=20 Due to the future extensibility I decided to use G_OPTION_ARG_CALLBACK as option entry arg field. Thanks to callback function we can extend parsing mechanism for float and others types. 363103 6 84893 l.slachciak 2011-03-06 11:12:34 -0800 Created attachment 84893 General mechanism for adjusting WebKitWebSettings in GtkLauncher Additional fix/improvement in boolean values processing 363121 7 84897 l.slachciak 2011-03-06 13:32:44 -0800 Created attachment 84897 General mechanism for adjusting WebKitWebSettings in GtkLauncher memory releasing fix when parsing error occurs 373568 8 84897 mrobinson 2011-03-25 09:52:33 -0700 Comment on attachment 84897 General mechanism for adjusting WebKitWebSettings in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=84897&action=review I sincerely apologize for the very late review! This change looks quite good, though I have recommend some stylistic changes below. Please ensure that all comments are complete sentences and also begin with a capital letter and end with a period. Great work! > Tools/GtkLauncher/main.c:257 > +/** > + * Callback which is called when parsing option entries. > + * Sets WebKitWebSettings properties > + */ Thanks for documenting this function. Instead of having the documentation here though, I'd rather the function be given a longer name. Something like parseOptionEntryCallback. > Tools/GtkLauncher/main.c:259 > +gboolean parseWebSettings(const gchar *optionNameFull, const gchar *value, > + gpointer data, GError **error) The indentation seems off here. You can just put them all on one line. > Tools/GtkLauncher/main.c:284 > + if (strlen(optionNameFull) > 2 && webkitSettings) { > + /* we have two -- in option name so remove them*/ > + const gchar *optionName = optionNameFull + 2; > + GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), > + optionName); > + if (spec) { > + /* convert string to proper type */ > + GValue valueString = {0, {{0}}}; > + GValue valueProperty = {0, {{0}}}; > + g_value_init(&valueString, G_TYPE_STRING); > + g_value_init(&valueProperty, G_PARAM_SPEC_VALUE_TYPE(spec)); > + g_value_set_static_string(&valueString, value); > + if (g_value_transform(&valueString, &valueProperty)) { > + /* set WebKitWebSettings properties */ > + g_object_set_property(G_OBJECT(webkitSettings), optionName, &valueProperty); > + parsedCorrectly = TRUE; > + } > + } > + } > + return parsedCorrectly; > +} Typically in WebKit we use early returns. If you did that you could remove the parsedCorrectly variable altogether. I'm imaginging something like this: if (strlen(optionNameFull <= 2) || !webkitSettings) return FALSE; const gchar *optionName = optionNameFull + 2; GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), optionName); if (!spec) returrn FALSE; etc, etc. > Tools/GtkLauncher/main.c:290 > +/** > + * Creates GArray of GOptionEntries basing > + * on the WebKitWebSettings writable properties > + */ > +static GArray* getOptionEntries(WebKitWebSettings *webkitSettings) Again you could remove the comment and simply say, getOptionEntriesFromWebKitWebSettings. > Tools/GtkLauncher/main.c:296 > + propertySpecs = g_object_class_list_properties > + (G_OBJECT_GET_CLASS(webkitSettings), &numProperties); It's okay for your lines to extend to about 120 characters before wrapping. I suggest doing that simply to match the style we've already established in WebKitGTK+. > Tools/GtkLauncher/main.c:299 > + if (optionEntriesArray) { Here again I recommend an early return. > Tools/GtkLauncher/main.c:302 > + /* only for writable properties fill in structures */ Please make your comments complete sentences with a capital letter and period at the end. > Tools/GtkLauncher/main.c:308 > + if (gParamType == G_TYPE_BOOLEAN > + || gParamType == G_TYPE_STRING > + || gParamType == G_TYPE_INT) { You should also include support for floats. > Tools/GtkLauncher/main.c:332 > +static void > +transformStringToBoolean(const GValue *srcValue, GValue *destValue) Please remove the extra newline. > Tools/GtkLauncher/main.c:345 > +static void > +transformStringToInt(const GValue *srcValue, GValue *destValue) Ditto. > Tools/GtkLauncher/main.c:366 > +/******************* additional options parsing ***********************************************/ Again, it makes more sense to move all this to a helper static function called parseAdditionalOptions rather than having this big comment. > Tools/GtkLauncher/main.c:377 > + GOptionGroup *webSettingsGroup = g_option_group_new("websettings", > + "WebKitWebSettings writable properties for default WebKitWebView", > + "WebKitWebSettings properties", > + webkitSettings, NULL); > + g_option_group_add_entries(webSettingsGroup, (GOptionEntry*) optionEntriesArray->data); When indenting like this I prefer the arguments to all be lined up with the first one. > Tools/GtkLauncher/main.c:380 > + GOptionContext *context = g_option_context_new("[URL]"); > + g_option_context_add_group(context, webSettingsGroup); Why "[URL]" ? > Tools/GtkLauncher/main.c:389 > + GError *error = NULL; > + if (!g_option_context_parse(context, &argc, &argv, &error)) { > + g_print("Failed to parse arguments: %s\n", error->message); > + g_error_free(error); > + g_option_context_free(context); > + g_array_free(optionEntriesArray, TRUE); > + return 1; > + } Excellent error handling! > Tools/GtkLauncher/main.c:392 > +/***********************************************************************************************/ Please remove this and just move all the above code to a helper function. 391561 9 84897 l.slachciak 2011-04-23 23:28:23 -0700 Comment on attachment 84897 General mechanism for adjusting WebKitWebSettings in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=84897&action=review Thank you martin for review. And sorry for late answer too. I'm attaching fixed version of patch. >> Tools/GtkLauncher/main.c:257 >> + */ > > Thanks for documenting this function. Instead of having the documentation here though, I'd rather the function be given a longer name. Something like parseOptionEntryCallback. done >> Tools/GtkLauncher/main.c:259 >> + gpointer data, GError **error) > > The indentation seems off here. You can just put them all on one line. ok >> Tools/GtkLauncher/main.c:284 >> +} > > Typically in WebKit we use early returns. If you did that you could remove the parsedCorrectly variable altogether. I'm imaginging something like this: > > if (strlen(optionNameFull <= 2) || !webkitSettings) > return FALSE; > > const gchar *optionName = optionNameFull + 2; > GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), optionName); > if (!spec) > returrn FALSE; > > etc, etc. I need to change my programing style :) Done. >> Tools/GtkLauncher/main.c:290 >> +static GArray* getOptionEntries(WebKitWebSettings *webkitSettings) > > Again you could remove the comment and simply say, getOptionEntriesFromWebKitWebSettings. Done. >> Tools/GtkLauncher/main.c:296 >> + (G_OBJECT_GET_CLASS(webkitSettings), &numProperties); > > It's okay for your lines to extend to about 120 characters before wrapping. I suggest doing that simply to match the style we've already established in WebKitGTK+. Ok, 120 fills my laptop width >> Tools/GtkLauncher/main.c:299 >> + if (optionEntriesArray) { > > Here again I recommend an early return. ok >> Tools/GtkLauncher/main.c:302 >> + /* only for writable properties fill in structures */ > > Please make your comments complete sentences with a capital letter and period at the end. ok >> Tools/GtkLauncher/main.c:308 >> + || gParamType == G_TYPE_INT) { > > You should also include support for floats. support for floats added, although only --zoom-step property is writable float one and there is no way to use zooming in GtkLauncher >> Tools/GtkLauncher/main.c:332 >> +transformStringToBoolean(const GValue *srcValue, GValue *destValue) > > Please remove the extra newline. ok >> Tools/GtkLauncher/main.c:345 >> +transformStringToInt(const GValue *srcValue, GValue *destValue) > > Ditto. ok >> Tools/GtkLauncher/main.c:366 >> +/******************* additional options parsing ***********************************************/ > > Again, it makes more sense to move all this to a helper static function called parseAdditionalOptions rather than having this big comment. moved >> Tools/GtkLauncher/main.c:377 >> + g_option_group_add_entries(webSettingsGroup, (GOptionEntry*) optionEntriesArray->data); > > When indenting like this I prefer the arguments to all be lined up with the first one. ok >> Tools/GtkLauncher/main.c:380 >> + g_option_context_add_group(context, webSettingsGroup); > > Why "[URL]" ? string param of g_option_context_new(string) is displayed in the first line of --help output, after programname [OPTION...]. I thought that it is useful to say that URL loading is also supported. >> Tools/GtkLauncher/main.c:392 >> +/***********************************************************************************************/ > > Please remove this and just move all the above code to a helper function. ok 391563 10 90875 l.slachciak 2011-04-24 00:15:40 -0700 Created attachment 90875 General mechanism for adjusting WebKitWebSettings in GtkLauncher 392892 11 90875 mrobinson 2011-04-26 15:57:39 -0700 Comment on attachment 90875 General mechanism for adjusting WebKitWebSettings in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=90875&action=review Looks good, but I have a few remaining nits. Thanks for updating it! > Tools/GtkLauncher/main.c:240 > + if (strlen(optionNameFull) <= 2 || !webkitSettings) When can this be null. Would it be better to use an ASSERT(webkitSettings); ? > Tools/GtkLauncher/main.c:244 > + const gchar *optionName = optionNameFull + 2; Why do we end up with two -- entries? > Tools/GtkLauncher/main.c:245 > + GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), This can be one line. > Tools/GtkLauncher/main.c:252 > + GValue valueString = {0, {{0}}}; > + GValue valueProperty = {0, {{0}}}; GValue is such an annoying API. :) > Tools/GtkLauncher/main.c:285 > + if (param && param->flags & G_PARAM_WRITABLE) { Please use an early return here. > Tools/GtkLauncher/main.c:287 > + /* Only int, boolean, float and string writable properties are supported. */ You can remove this comment, as it's obvious from the code that follows. > Tools/GtkLauncher/main.c:289 > + if (gParamType == G_TYPE_BOOLEAN || gParamType == G_TYPE_STRING || gParamType == G_TYPE_INT > + || gParamType == G_TYPE_FLOAT) { Ditto. > Tools/GtkLauncher/main.c:291 > + /* Create option entry. */ This comment seems extraneous. Please remove it. > Tools/GtkLauncher/main.c:294 > + /* No short name for optionEntry. > + optionEntry.short_name=*/ Instead of just stating that there is no short name, it would be better to explain why. > Tools/GtkLauncher/main.c:296 > + /* For bool arguments "enable" type make option argument not required. */ > + if (gParamType == G_TYPE_BOOLEAN && (strstr (optionEntry.long_name, "enable"))) You have an extra space here after strstr. Maybe ths should be separated out into a helper. > Tools/GtkLauncher/main.c:326 > + g_value_set_int(destValue, atoi(str)); Please just make this: g_value_set_int(destValue, atoi(g_value_get_string(srcValue)); > Tools/GtkLauncher/main.c:332 > + const char* str = g_value_get_string(srcValue); > + g_value_set_float(destValue, atof(str)); Ditto making this one line. 423102 12 90875 l.slachciak 2011-06-18 05:41:06 -0700 Comment on attachment 90875 General mechanism for adjusting WebKitWebSettings in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=90875&action=review >> Tools/GtkLauncher/main.c:240 >> + if (strlen(optionNameFull) <= 2 || !webkitSettings) > > When can this be null. Would it be better to use an > > ASSERT(webkitSettings); > > ? I used g_assert(webkitSettings); >> Tools/GtkLauncher/main.c:244 >> + const gchar *optionName = optionNameFull + 2; > > Why do we end up with two -- entries? I don't add them. This is what I get from GOptionEntry mechanism, even if I set name without "--" I think that it is done "by design" to comply with command line options standard for long names. For short names we have one "-" >> Tools/GtkLauncher/main.c:245 >> + GParamSpec *spec = g_object_class_find_property(G_OBJECT_GET_CLASS(webkitSettings), > > This can be one line. done >> Tools/GtkLauncher/main.c:285 >> + if (param && param->flags & G_PARAM_WRITABLE) { > > Please use an early return here. done >> Tools/GtkLauncher/main.c:287 >> + /* Only int, boolean, float and string writable properties are supported. */ > > You can remove this comment, as it's obvious from the code that follows. ok >> Tools/GtkLauncher/main.c:291 >> + /* Create option entry. */ > > This comment seems extraneous. Please remove it. ok >> Tools/GtkLauncher/main.c:294 >> + optionEntry.short_name=*/ > > Instead of just stating that there is no short name, it would be better to explain why. explained in comment. >> Tools/GtkLauncher/main.c:296 >> + if (gParamType == G_TYPE_BOOLEAN && (strstr (optionEntry.long_name, "enable"))) > > You have an extra space here after strstr. Maybe ths should be separated out into a helper. extra space fixed, but I don't see which part could go to a helper function. GOptionEntry filling? >> Tools/GtkLauncher/main.c:326 >> + g_value_set_int(destValue, atoi(str)); > > Please just make this: > > g_value_set_int(destValue, atoi(g_value_get_string(srcValue)); ok >> Tools/GtkLauncher/main.c:332 >> + g_value_set_float(destValue, atof(str)); > > Ditto making this one line. ok 423105 13 97698 l.slachciak 2011-06-18 05:58:03 -0700 Created attachment 97698 General mechanism for adjusting WebKitWebSettings in GtkLauncher 423106 14 97699 l.slachciak 2011-06-18 06:00:41 -0700 Created attachment 97699 General mechanism for adjusting WebKitWebSettings in GtkLauncher 423107 15 webkit.review.bot 2011-06-18 06:01:11 -0700 Attachment 97698 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/GtkLauncher/main..." exit_code: 1 Tools/GtkLauncher/main.c:253: Missing space after , [whitespace/comma] [3] Tools/GtkLauncher/main.c:295: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 423108 16 webkit.review.bot 2011-06-18 06:02:16 -0700 Attachment 97699 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/GtkLauncher/main..." exit_code: 1 Tools/GtkLauncher/main.c:253: Missing space after , [whitespace/comma] [3] Tools/GtkLauncher/main.c:295: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 423109 17 97700 l.slachciak 2011-06-18 06:02:49 -0700 Created attachment 97700 General mechanism for adjusting WebKitWebSettings in GtkLauncher 423110 18 l.slachciak 2011-06-18 06:08:28 -0700 Martin, finally after long break I made fixes according to your comments. 423699 19 97700 mrobinson 2011-06-20 09:22:58 -0700 Comment on attachment 97700 General mechanism for adjusting WebKitWebSettings in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=97700&action=review Nice work! I'll land this one. > Tools/GtkLauncher/main.c:280 > + return NULL; You should use 0 here instead of NULL. > Tools/GtkLauncher/main.c:285 > + return NULL; Ditto. > Tools/GtkLauncher/main.c:359 > + GError *error = NULL; You should use 0 instead of NULL unless you are ending an argument list. I'll fix this and land. 423700 20 mrobinson 2011-06-20 09:25:17 -0700 Committed r89249: <http://trac.webkit.org/changeset/89249> 423701 21 97700 mrobinson 2011-06-20 09:25:33 -0700 Comment on attachment 97700 General mechanism for adjusting WebKitWebSettings in GtkLauncher Clearing flag on landed bug. 423802 22 l.slachciak 2011-06-20 11:34:41 -0700 (In reply to comment #19) > (From update of attachment 97700 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97700&action=review > > Nice work! I'll land this one. > > > Tools/GtkLauncher/main.c:280 > > + return NULL; > > You should use 0 here instead of NULL. > > > Tools/GtkLauncher/main.c:285 > > + return NULL; > > Ditto. > > > Tools/GtkLauncher/main.c:359 > > + GError *error = NULL; > > You should use 0 instead of NULL unless you are ending an argument list. I'll fix this and land. Too much C in my life :) Thank you Martin for review. 83953 2011-02-26 14:51:59 -0800 2011-03-06 05:55:49 -0800 GtkLauncher frame flattening option gtkflattening.patch text/plain 3131 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZjI0 ODYxLi4xODViZjU2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDItMjYgIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHdGtMYXVuY2hlciBlbmhhbmNlbWVudHMgLSBjb21tYW5k IGxpbmUgb3B0aW9ucyBwYXJzaW5nIC0gZnJhbWUgZmxhdHRlbmluZy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MzA4CisKKyAgICAgICAgKiBHdGtM YXVuY2hlci9tYWluLmM6CisgICAgICAgIChjcmVhdGVXaW5kb3cpOiBTZXR0aW5nIGZyYW1lIGZs YXR0ZW5pbmcgb3B0aW9uIGZvciB3ZWJWaWV3CisgICAgICAgIChtYWluKTogQ29tbWFuZCBsaW5l IG9wdGlvbnMgcGFyc2luZworCiAyMDExLTAyLTI2ICBZb25nanVuIFpoYW5nICA8eW9uZ2p1bl96 aGFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgS2lsemVyLgpkaWZm IC0tZ2l0IGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFp bi5jCmluZGV4IGFkNjY2ZTIuLjUwNGJhYTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0d0a0xhdW5jaGVy L21haW4uYworKysgYi9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKQEAgLTEsNiArMSw3IEBACiAv KgogICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3IEFwcGxlIEluYy4KICAqIENvcHlyaWdodCAo QykgMjAwNyBBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29tPgorICogQ29weXJpZ2h0IChDKSAyMDEx IEx1a2FzeiBTbGFjaGNpYWsKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjcs NiArMjgsMTQgQEAKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtp dC5oPgogCitzdGF0aWMgZ2Jvb2xlYW4gZmxhdHRlbmluZyA9IEZBTFNFOworCitzdGF0aWMgY29u c3QgR09wdGlvbkVudHJ5IG9wdGlvbkVudHJpZXNbXSA9Cit7CisgICAgeyAiZmxhdHRlbmluZyIs ICdmJywgMCwgR19PUFRJT05fQVJHX05PTkUsICZmbGF0dGVuaW5nLCAiVXNlIGZyYW1lIGZsYXR0 ZW5pbmciLCBOVUxMIH0sCisgICAgeyBOVUxMIH0KK307CisKIHN0YXRpYyBnaW50IHdpbmRvd0Nv dW50ID0gMDsKIAogc3RhdGljIEd0a1dpZGdldCogY3JlYXRlV2luZG93KFdlYktpdFdlYlZpZXcq KiBvdXRXZWJWaWV3KTsKQEAgLTE4OCw2ICsxOTcsNyBAQCBzdGF0aWMgR3RrV2lkZ2V0KiBjcmVh dGVUb29sYmFyKEd0a1dpZGdldCogdXJpRW50cnksIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiBz dGF0aWMgR3RrV2lkZ2V0KiBjcmVhdGVXaW5kb3coV2ViS2l0V2ViVmlldyoqIG91dFdlYlZpZXcp CiB7CiAgICAgV2ViS2l0V2ViVmlldyAqd2ViVmlldzsKKyAgICBXZWJLaXRXZWJTZXR0aW5ncyAq d2Via2l0U2V0dGluZ3M7CiAgICAgR3RrV2lkZ2V0ICp2Ym94OwogICAgIEd0a1dpZGdldCAqd2lu ZG93OwogICAgIEd0a1dpZGdldCAqdXJpRW50cnk7CkBAIC0yMDIsNiArMjEyLDExIEBAIHN0YXRp YyBHdGtXaWRnZXQqIGNyZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmlldykKICAg ICB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19uZXcoKSk7CiAgICAg dXJpRW50cnkgPSBndGtfZW50cnlfbmV3KCk7CiAKKyAgICB3ZWJraXRTZXR0aW5ncyA9IHdlYmtp dF93ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldyk7CisgICAgZ19vYmplY3Rfc2V0KHdlYmtp dFNldHRpbmdzLAorICAgICAgICAgICAgICAgICJlbmFibGUtZnJhbWUtZmxhdHRlbmluZyIsIGZs YXR0ZW5pbmcsCisgICAgICAgICAgICAgICAgTlVMTCk7CisKICAgICB2Ym94ID0gZ3RrX3Zib3hf bmV3KEZBTFNFLCAwKTsKICAgICBzdGF0dXNiYXIgPSBjcmVhdGVTdGF0dXNiYXIod2ViVmlldyk7 CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1godmJveCksIGNyZWF0ZVRvb2xiYXIodXJp RW50cnksIHdlYlZpZXcpLCBGQUxTRSwgRkFMU0UsIDApOwpAQCAtMjUyLDYgKzI2Nyw3IEBAIGlu dCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiB7CiAgICAgV2ViS2l0V2ViVmlldyAqd2Vi VmlldzsKICAgICBHdGtXaWRnZXQgKm1haW5fd2luZG93OworICAgIEdFcnJvciAqZXJyb3IgPSBO VUxMOwogCiAgICAgZ3RrX2luaXQoJmFyZ2MsICZhcmd2KTsKICAgICBpZiAoIWdfdGhyZWFkX3N1 cHBvcnRlZCgpKQpAQCAtMjYxLDYgKzI3NywxNiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciog YXJndltdKQogICAgIGRpc2FibGVQbHVnaW4oIlNob2Nrd2F2ZSBGbGFzaCIpOwogI2VuZGlmCiAK KyAgICBHT3B0aW9uQ29udGV4dCAqY29udGV4dCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KCJbVVJM XSIpOworICAgIGdfb3B0aW9uX2NvbnRleHRfYWRkX21haW5fZW50cmllcyhjb250ZXh0LCBvcHRp b25FbnRyaWVzLCBOVUxMKTsKKyAgICBnX29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0 LCBndGtfZ2V0X29wdGlvbl9ncm91cChUUlVFKSk7CisgICAgaWYgKCFnX29wdGlvbl9jb250ZXh0 X3BhcnNlKGNvbnRleHQsICZhcmdjLCAmYXJndiwgJmVycm9yKSkgeworICAgICAgICBnX3ByaW50 KCJGYWlsZWQgdG8gcGFyc2UgYXJndW1lbnRzOiAlc1xuIiwgZXJyb3ItPm1lc3NhZ2UpOworICAg ICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOworICAgICAgICBnX29wdGlvbl9jb250ZXh0X2ZyZWUo Y29udGV4dCk7CisgICAgICAgIHJldHVybiBlcnJvci0+Y29kZTsKKyAgICB9CisKICAgICBtYWlu X3dpbmRvdyA9IGNyZWF0ZVdpbmRvdygmd2ViVmlldyk7CiAKICAgICBnY2hhciAqdXJpID0oZ2No YXIqKShhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwo= 84887 2011-03-06 05:55:49 -0800 2011-03-06 11:12:34 -0800 [GTK] General mechanism for adjusting WebKitWebSettings in GtkLauncher general.patch text/plain 7697 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Njdl NGM1Li4zNDNiODA0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDYgIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogTWVjaGFuaXNtIGZvciBhZGp1c3RpbmcgV2ViS2l0V2ViU2V0dGluZ3MuCisgICAgICAg IChwYXJzZVdlYlNldHRpbmdzKTogQ2FsbGJhY2sgZm9yIHBhcnNpbmcgb3B0aW9uIGVudHJpZXMu IFNldHMgV2ViS2l0V2ViU2V0dGluZ3MgYWNjb3JkaW5nbHkuCisgICAgICAgIChnZXRPcHRpb25F bnRyaWVzKTogQmFzaW5nIG9uIHRoZSBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzIHByZXBh cmUgYXZhaWxhYmxlIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNmb3JtU3RyaW5nVG9C b29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBzdHJpbmcgY29udmVydGlvbiB1c2VkIGJ5 IHBhcnNlV2ViU2V0dGluZ3MuCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdUb0ludCk6IFRyYW5z Zm9ybSBmdW5jdGlvbiBmb3Igc3RyaW5nIGNvbnZlcnRpb24gdXNlZCBieSBwYXJzZVdlYlNldHRp bmdzLgorICAgICAgICAobWFpbik6IEFkZGVkIGFkZGl0aW9uYWwgb3B0aW9ucyBwYXJzaW5nIG1l Y2hhbmlzbS4KKwogMjAxMS0wMy0wMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKICAgICAgICAgVXBkYXRlIHRoZSB0ZXN0cyB0aGF0IHVzZSBXS1BhZ2VSdW5KYXZhU2Ny aXB0SW5NYWluRnJhbWUgdXNlIHRoZSBXS1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZVJlZi4KZGlmZiAt LWdpdCBhL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4u YwppbmRleCBhZDY2NmUyLi4yNjhlNmIyIDEwMDY0NAotLS0gYS9Ub29scy9HdGtMYXVuY2hlci9t YWluLmMKKysrIGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBAIC0xLDYgKzEsNyBAQAogLyoK ICAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDcgQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBM dWthc3ogU2xhY2hjaWFrCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1LDYg KzI2LDggQEAKICAqLwogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHN0ZGxpYi5o PgorI2luY2x1ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXQuaD4KIAogc3Rh dGljIGdpbnQgd2luZG93Q291bnQgPSAwOwpAQCAtMjQ4LDYgKzI1MSwxMDcgQEAgc3RhdGljIHZv aWQgZGlzYWJsZVBsdWdpbihjb25zdCBjaGFyKiBwbHVnaW5OYW1lKQogfQogI2VuZGlmCiAKKy8q KgorICAqIENhbGxiYWNrIHdoaWNoIGlzIGNhbGxlZCB3aGVuIHBhcnNpbmcgb3B0aW9uIGVudHJp ZXMuCisgICogU2V0cyBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzCisgICovCitnYm9vbGVh biBwYXJzZVdlYlNldHRpbmdzKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwgY29uc3QgZ2No YXIgKnZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdwb2ludGVyIGRhdGEsIEdF cnJvciAqKmVycm9yKQoreworICAgIFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncyA9 IChXZWJLaXRXZWJTZXR0aW5ncyAqKWRhdGE7CisgICAgZ2Jvb2xlYW4gcGFyc2VkQ29ycmVjdGx5 ID0gRkFMU0U7CisKKyAgICBpZiAoc3RybGVuKG9wdGlvbk5hbWVGdWxsKSA+IDIgJiYgd2Via2l0 U2V0dGluZ3MpIHsKKyAgICAgICAgLyogd2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28g cmVtb3ZlIHRoZW0qLworICAgICAgICBjb25zdCBnY2hhciAqb3B0aW9uTmFtZSA9IG9wdGlvbk5h bWVGdWxsICsgMjsKKyAgICAgICAgR1BhcmFtU3BlYyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2Zp bmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNTKHdlYmtpdFNldHRpbmdzKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25OYW1lKTsK KyAgICAgICAgaWYgKHNwZWMpIHsKKyAgICAgICAgICAgIC8qIGNvbnZlcnQgc3RyaW5nIHRvIHBy b3BlciB0eXBlICovCisgICAgICAgICAgICBHVmFsdWUgdmFsdWVTdHJpbmcgPSB7MCwge3swfX19 OworICAgICAgICAgICAgR1ZhbHVlIHZhbHVlUHJvcGVydHkgPSB7MCwge3swfX19OworICAgICAg ICAgICAgZ192YWx1ZV9pbml0KCZ2YWx1ZVN0cmluZywgR19UWVBFX1NUUklORyk7CisgICAgICAg ICAgICBnX3ZhbHVlX2luaXQoJnZhbHVlUHJvcGVydHksIEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBF KHNwZWMpKTsKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X3N0YXRpY19zdHJpbmcoJnZhbHVlU3Ry aW5nLCB2YWx1ZSk7CisgICAgICAgICAgICBpZiAoZ192YWx1ZV90cmFuc2Zvcm0oJnZhbHVlU3Ry aW5nLCAmdmFsdWVQcm9wZXJ0eSkpIHsKKyAgICAgICAgICAgICAgICAvKiBzZXQgV2ViS2l0V2Vi U2V0dGluZ3MgcHJvcGVydGllcyAqLworICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldF9wcm9w ZXJ0eShHX09CSkVDVCh3ZWJraXRTZXR0aW5ncyksIG9wdGlvbk5hbWUsICZ2YWx1ZVByb3BlcnR5 KTsKKyAgICAgICAgICAgICAgICBnX3ByaW50KCJXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0eSAl cyBzZXQgdG8gJXNcbiIsIG9wdGlvbk5hbWUsIHZhbHVlKTsKKyAgICAgICAgICAgICAgICBwYXJz ZWRDb3JyZWN0bHkgPSBUUlVFOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAg IHJldHVybiBwYXJzZWRDb3JyZWN0bHk7Cit9CisKKy8qKgorICAqIENyZWF0ZXMgR0FycmF5IG9m IEdPcHRpb25FbnRyaWVzIGJhc2luZworICAqIG9uIHRoZSBXZWJLaXRXZWJTZXR0aW5ncyB3cml0 YWJsZSBwcm9wZXJ0aWVzCisgICovCitzdGF0aWMgR0FycmF5KiBnZXRPcHRpb25FbnRyaWVzKFdl YktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncykKK3sKKyAgICBHUGFyYW1TcGVjICoqcHJv cGVydHlTcGVjczsKKyAgICBndWludCBudW1Qcm9wZXJ0aWVzLCBpOworCisgICAgcHJvcGVydHlT cGVjcyA9IGdfb2JqZWN0X2NsYXNzX2xpc3RfcHJvcGVydGllcworICAgICAgICAgICAgICAgICAg ICAgICAgKEdfT0JKRUNUX0dFVF9DTEFTUyh3ZWJraXRTZXR0aW5ncyksICZudW1Qcm9wZXJ0aWVz KTsKKworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0FycmF5ID0gZ19hcnJheV9uZXcoVFJVRSwg VFJVRSwgc2l6ZW9mKEdPcHRpb25FbnRyeSkpOworICAgIGlmIChvcHRpb25FbnRyaWVzQXJyYXkp IHsKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IG51bVByb3BlcnRpZXM7IGkrKykgeworICAgICAg ICAgICAgR1BhcmFtU3BlYyAqcGFyYW0gPSBwcm9wZXJ0eVNwZWNzW2ldOworICAgICAgICAgICAg Lyogb25seSBmb3Igd3JpdGFibGUgcHJvcGVydGllcyBmaWxsIGluIHN0cnVjdHVyZXMgKi8KKyAg ICAgICAgICAgIGlmIChwYXJhbSAmJiBwYXJhbS0+ZmxhZ3MgJiBHX1BBUkFNX1dSSVRBQkxFKSB7 CisgICAgICAgICAgICAgICAgR1R5cGUgZ1BhcmFtVHlwZSA9IEdfUEFSQU1fU1BFQ19WQUxVRV9U WVBFKHBhcmFtKTsKKyAgICAgICAgICAgICAgICAvKiBUT0RPIHByb3ZpZGUgc3VwcG9ydCBmb3Ig b3RoZXIgcGFyYW0gdHlwZXMgKi8KKyAgICAgICAgICAgICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBH X1RZUEVfQk9PTEVBTgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8fCBnUGFyYW1U eXBlID09IEdfVFlQRV9TVFJJTkcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwg Z1BhcmFtVHlwZSA9PSBHX1RZUEVfSU5UKSB7CisgICAgICAgICAgICAgICAgICAgIEdPcHRpb25F bnRyeSBvcHRpb25FbnRyeTsKKyAgICAgICAgICAgICAgICAgICAgLyogY3JlYXRlIG9wdGlvbiBl bnRyeSBmaW5hbGx5ICovCisgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmxvbmdfbmFt ZSA9IGdfcGFyYW1fc3BlY19nZXRfbmFtZShwYXJhbSk7CisgICAgICAgICAgICAgICAgICAgIC8q IG5vIHNob3J0IG5hbWUgZm9yIG9wdGlvbkVudHJ5CisgICAgICAgICAgICAgICAgICAgICAgIG9w dGlvbkVudHJ5LnNob3J0X25hbWU9Ki8KKyAgICAgICAgICAgICAgICAgICAgLyogZm9yIGJvb2wg YXJndW1lbnRzIG1ha2Ugb3B0aW9uIGFyZ3VtZW50IG5vdCByZXF1aXJlZCAqLworICAgICAgICAg ICAgICAgICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBHX1RZUEVfQk9PTEVBTikKKyAgICAgICAgICAg ICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmZsYWdzID0gR19PUFRJT05fRkxBR19PUFRJT05BTF9B Ukc7CisgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmFyZyA9IEdfT1BUSU9OX0FSR19D QUxMQkFDSzsKKyAgICAgICAgICAgICAgICAgICAgb3B0aW9uRW50cnkuYXJnX2RhdGEgPSBwYXJz ZVdlYlNldHRpbmdzOworICAgICAgICAgICAgICAgICAgICBvcHRpb25FbnRyeS5kZXNjcmlwdGlv biA9IGdfcGFyYW1fc3BlY19nZXRfYmx1cmIocGFyYW0pOworICAgICAgICAgICAgICAgICAgICBv cHRpb25FbnRyeS5hcmdfZGVzY3JpcHRpb24gPSBnX3R5cGVfbmFtZShnUGFyYW1UeXBlKTsKKyAg ICAgICAgICAgICAgICAgICAgZ19hcnJheV9hcHBlbmRfdmFsKG9wdGlvbkVudHJpZXNBcnJheSwg b3B0aW9uRW50cnkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorICAgIH0KKyAgICBnX2ZyZWUocHJvcGVydHlTcGVjcyk7CisKKyAgICByZXR1cm4gb3B0aW9u RW50cmllc0FycmF5OworfQorCitzdGF0aWMgdm9pZAordHJhbnNmb3JtU3RyaW5nVG9Cb29sZWFu KGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1ZSAqZGVzdFZhbHVlKQoreworICAgIGNvbnN0 IGNoYXIqIHN0ciA9IGdfdmFsdWVfZ2V0X3N0cmluZyhzcmNWYWx1ZSk7CisgICAgaWYgKGRlc3RW YWx1ZSkgeworICAgICAgICBpZiAoIWdfYXNjaWlfc3RyY2FzZWNtcChzdHIsICJ0cnVlIikgfHwg IXN0cmNtcChzdHIsICIxIikpCisgICAgICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKGRlc3RW YWx1ZSwgVFJVRSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xl YW4oZGVzdFZhbHVlLCBGQUxTRSk7CisgICAgfSBlbHNlCisgICAgLyogZm9yIE5VTEwgb3B0aW9u IHZhbHVlIHdlIGFzc3VtZSBUUlVFIGFzIG9wdGlvbnMgYXJlICJlbmFibGUiIHR5cGUgKi8KKyAg ICAvKiBGSVhNRTogcmVjb2duaXplIGlmIG9wdGlvbiBpcyAiZGlzYWJsZSB0eXBlIgorICAgICAg IGluIHRoaXMgY2FzZSBuby1wYXJhbSBvcHRpb24gc2hvdWxkIGJlIHNldCB0byBGQUxTRSAqLwor ICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKGRlc3RWYWx1ZSwgVFJVRSk7Cit9CisKK3N0YXRp YyB2b2lkCit0cmFuc2Zvcm1TdHJpbmdUb0ludChjb25zdCBHVmFsdWUgKnNyY1ZhbHVlLCBHVmFs dWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBjb25zdCBjaGFyKiBzdHIgPSBnX3ZhbHVlX2dldF9zdHJp bmcoc3JjVmFsdWUpOworICAgIGdfdmFsdWVfc2V0X2ludChkZXN0VmFsdWUsIGF0b2koc3RyKSk7 Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiB7CiAgICAgV2ViS2l0V2Vi VmlldyAqd2ViVmlldzsKQEAgLTI2Myw2ICszNjcsMzMgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNo YXIqIGFyZ3ZbXSkKIAogICAgIG1haW5fd2luZG93ID0gY3JlYXRlV2luZG93KCZ3ZWJWaWV3KTsK IAorLyoqKioqKioqKioqKioqKioqKiogYWRkaXRpb25hbCBvcHRpb25zIHBhcnNpbmcgKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisgICAgZ192YWx1ZV9y ZWdpc3Rlcl90cmFuc2Zvcm1fZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfQk9PTEVBTiwgdHJh bnNmb3JtU3RyaW5nVG9Cb29sZWFuKTsKKyAgICBnX3ZhbHVlX3JlZ2lzdGVyX3RyYW5zZm9ybV9m dW5jKEdfVFlQRV9TVFJJTkcsIEdfVFlQRV9JTlQsIHRyYW5zZm9ybVN0cmluZ1RvSW50KTsKKwor ICAgIFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncyA9IHdlYmtpdF93ZWJfdmlld19n ZXRfc2V0dGluZ3Mod2ViVmlldyk7CisgICAgR0FycmF5ICpvcHRpb25FbnRyaWVzQXJyYXkgPSBn ZXRPcHRpb25FbnRyaWVzKHdlYmtpdFNldHRpbmdzKTsKKworICAgIEdPcHRpb25Hcm91cCAqd2Vi U2V0dGluZ3NHcm91cCA9IGdfb3B0aW9uX2dyb3VwX25ldygid2Vic2V0dGluZ3MiLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXZWJLaXRXZWJTZXR0aW5ncyB3cml0 YWJsZSBwcm9wZXJ0aWVzIGZvciBkZWZhdWx0IFdlYktpdFdlYlZpZXciLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVz IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3ZWJraXRTZXR0aW5n cywgTlVMTCk7CisgICAgZ19vcHRpb25fZ3JvdXBfYWRkX2VudHJpZXMod2ViU2V0dGluZ3NHcm91 cCwgKEdPcHRpb25FbnRyeSopIG9wdGlvbkVudHJpZXNBcnJheS0+ZGF0YSk7CisKKyAgICBHT3B0 aW9uQ29udGV4dCAqY29udGV4dCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KCJbVVJMXSIpOworICAg IGdfb3B0aW9uX2NvbnRleHRfYWRkX2dyb3VwKGNvbnRleHQsIHdlYlNldHRpbmdzR3JvdXApOwor CisgICAgR0Vycm9yICplcnJvciA9IE5VTEw7CisgICAgaWYgKCFnX29wdGlvbl9jb250ZXh0X3Bh cnNlKGNvbnRleHQsICZhcmdjLCAmYXJndiwgJmVycm9yKSkgeworICAgICAgICBnX3ByaW50KCJG YWlsZWQgdG8gcGFyc2UgYXJndW1lbnRzOiAlc1xuIiwgZXJyb3ItPm1lc3NhZ2UpOworICAgICAg ICBnX2Vycm9yX2ZyZWUoZXJyb3IpOworICAgICAgICBnX29wdGlvbl9jb250ZXh0X2ZyZWUoY29u dGV4dCk7CisgICAgICAgIHJldHVybiBlcnJvci0+Y29kZTsKKyAgICB9CisgICAgZ19vcHRpb25f Y29udGV4dF9mcmVlKGNvbnRleHQpOworICAgIGdfYXJyYXlfZnJlZShvcHRpb25FbnRyaWVzQXJy YXksIFRSVUUpOworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCiAg ICAgZ2NoYXIgKnVyaSA9KGdjaGFyKikoYXJnYyA+IDEgPyBhcmd2WzFdIDogImh0dHA6Ly93d3cu Z29vZ2xlLmNvbS8iKTsKICAgICBnY2hhciAqZmlsZVVSTCA9IGZpbGVuYW1lVG9VUkwodXJpKTsK IAo= 84893 2011-03-06 11:12:34 -0800 2011-03-06 13:32:44 -0800 General mechanism for adjusting WebKitWebSettings in GtkLauncher general2.patch text/plain 7524 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Njdl NGM1Li4zNDNiODA0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDYgIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogTWVjaGFuaXNtIGZvciBhZGp1c3RpbmcgV2ViS2l0V2ViU2V0dGluZ3MuCisgICAgICAg IChwYXJzZVdlYlNldHRpbmdzKTogQ2FsbGJhY2sgZm9yIHBhcnNpbmcgb3B0aW9uIGVudHJpZXMu IFNldHMgV2ViS2l0V2ViU2V0dGluZ3MgYWNjb3JkaW5nbHkuCisgICAgICAgIChnZXRPcHRpb25F bnRyaWVzKTogQmFzaW5nIG9uIHRoZSBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzIHByZXBh cmUgYXZhaWxhYmxlIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNmb3JtU3RyaW5nVG9C b29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBzdHJpbmcgY29udmVydGlvbiB1c2VkIGJ5 IHBhcnNlV2ViU2V0dGluZ3MuCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdUb0ludCk6IFRyYW5z Zm9ybSBmdW5jdGlvbiBmb3Igc3RyaW5nIGNvbnZlcnRpb24gdXNlZCBieSBwYXJzZVdlYlNldHRp bmdzLgorICAgICAgICAobWFpbik6IEFkZGVkIGFkZGl0aW9uYWwgb3B0aW9ucyBwYXJzaW5nIG1l Y2hhbmlzbS4KKwogMjAxMS0wMy0wMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKICAgICAgICAgVXBkYXRlIHRoZSB0ZXN0cyB0aGF0IHVzZSBXS1BhZ2VSdW5KYXZhU2Ny aXB0SW5NYWluRnJhbWUgdXNlIHRoZSBXS1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZVJlZi4KZGlmZiAt LWdpdCBhL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4u YwppbmRleCBhZDY2NmUyLi4xZTI5MmI5IDEwMDY0NAotLS0gYS9Ub29scy9HdGtMYXVuY2hlci9t YWluLmMKKysrIGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBAIC0xLDYgKzEsNyBAQAogLyoK ICAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDcgQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBM dWthc3ogU2xhY2hjaWFrCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1LDYg KzI2LDggQEAKICAqLwogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHN0ZGxpYi5o PgorI2luY2x1ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXQuaD4KIAogc3Rh dGljIGdpbnQgd2luZG93Q291bnQgPSAwOwpAQCAtMjQ4LDYgKzI1MSwxMDMgQEAgc3RhdGljIHZv aWQgZGlzYWJsZVBsdWdpbihjb25zdCBjaGFyKiBwbHVnaW5OYW1lKQogfQogI2VuZGlmCiAKKy8q KgorICAqIENhbGxiYWNrIHdoaWNoIGlzIGNhbGxlZCB3aGVuIHBhcnNpbmcgb3B0aW9uIGVudHJp ZXMuCisgICogU2V0cyBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzCisgICovCitnYm9vbGVh biBwYXJzZVdlYlNldHRpbmdzKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwgY29uc3QgZ2No YXIgKnZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdwb2ludGVyIGRhdGEsIEdF cnJvciAqKmVycm9yKQoreworICAgIFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncyA9 IChXZWJLaXRXZWJTZXR0aW5ncyAqKWRhdGE7CisgICAgZ2Jvb2xlYW4gcGFyc2VkQ29ycmVjdGx5 ID0gRkFMU0U7CisKKyAgICBpZiAoc3RybGVuKG9wdGlvbk5hbWVGdWxsKSA+IDIgJiYgd2Via2l0 U2V0dGluZ3MpIHsKKyAgICAgICAgLyogd2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28g cmVtb3ZlIHRoZW0qLworICAgICAgICBjb25zdCBnY2hhciAqb3B0aW9uTmFtZSA9IG9wdGlvbk5h bWVGdWxsICsgMjsKKyAgICAgICAgR1BhcmFtU3BlYyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2Zp bmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNTKHdlYmtpdFNldHRpbmdzKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25OYW1lKTsK KyAgICAgICAgaWYgKHNwZWMpIHsKKyAgICAgICAgICAgIC8qIGNvbnZlcnQgc3RyaW5nIHRvIHBy b3BlciB0eXBlICovCisgICAgICAgICAgICBHVmFsdWUgdmFsdWVTdHJpbmcgPSB7MCwge3swfX19 OworICAgICAgICAgICAgR1ZhbHVlIHZhbHVlUHJvcGVydHkgPSB7MCwge3swfX19OworICAgICAg ICAgICAgZ192YWx1ZV9pbml0KCZ2YWx1ZVN0cmluZywgR19UWVBFX1NUUklORyk7CisgICAgICAg ICAgICBnX3ZhbHVlX2luaXQoJnZhbHVlUHJvcGVydHksIEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBF KHNwZWMpKTsKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X3N0YXRpY19zdHJpbmcoJnZhbHVlU3Ry aW5nLCB2YWx1ZSk7CisgICAgICAgICAgICBpZiAoZ192YWx1ZV90cmFuc2Zvcm0oJnZhbHVlU3Ry aW5nLCAmdmFsdWVQcm9wZXJ0eSkpIHsKKyAgICAgICAgICAgICAgICAvKiBzZXQgV2ViS2l0V2Vi U2V0dGluZ3MgcHJvcGVydGllcyAqLworICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldF9wcm9w ZXJ0eShHX09CSkVDVCh3ZWJraXRTZXR0aW5ncyksIG9wdGlvbk5hbWUsICZ2YWx1ZVByb3BlcnR5 KTsKKyAgICAgICAgICAgICAgICBwYXJzZWRDb3JyZWN0bHkgPSBUUlVFOworICAgICAgICAgICAg fQorICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBwYXJzZWRDb3JyZWN0bHk7Cit9CisKKy8q KgorICAqIENyZWF0ZXMgR0FycmF5IG9mIEdPcHRpb25FbnRyaWVzIGJhc2luZworICAqIG9uIHRo ZSBXZWJLaXRXZWJTZXR0aW5ncyB3cml0YWJsZSBwcm9wZXJ0aWVzCisgICovCitzdGF0aWMgR0Fy cmF5KiBnZXRPcHRpb25FbnRyaWVzKFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncykK K3sKKyAgICBHUGFyYW1TcGVjICoqcHJvcGVydHlTcGVjczsKKyAgICBndWludCBudW1Qcm9wZXJ0 aWVzLCBpOworCisgICAgcHJvcGVydHlTcGVjcyA9IGdfb2JqZWN0X2NsYXNzX2xpc3RfcHJvcGVy dGllcworICAgICAgICAgICAgICAgICAgICAgICAgKEdfT0JKRUNUX0dFVF9DTEFTUyh3ZWJraXRT ZXR0aW5ncyksICZudW1Qcm9wZXJ0aWVzKTsKKworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0Fy cmF5ID0gZ19hcnJheV9uZXcoVFJVRSwgVFJVRSwgc2l6ZW9mKEdPcHRpb25FbnRyeSkpOworICAg IGlmIChvcHRpb25FbnRyaWVzQXJyYXkpIHsKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IG51bVBy b3BlcnRpZXM7IGkrKykgeworICAgICAgICAgICAgR1BhcmFtU3BlYyAqcGFyYW0gPSBwcm9wZXJ0 eVNwZWNzW2ldOworICAgICAgICAgICAgLyogb25seSBmb3Igd3JpdGFibGUgcHJvcGVydGllcyBm aWxsIGluIHN0cnVjdHVyZXMgKi8KKyAgICAgICAgICAgIGlmIChwYXJhbSAmJiBwYXJhbS0+Zmxh Z3MgJiBHX1BBUkFNX1dSSVRBQkxFKSB7CisgICAgICAgICAgICAgICAgR1R5cGUgZ1BhcmFtVHlw ZSA9IEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBFKHBhcmFtKTsKKyAgICAgICAgICAgICAgICAvKiBU T0RPIHByb3ZpZGUgc3VwcG9ydCBmb3Igb3RoZXIgcGFyYW0gdHlwZXMgKi8KKyAgICAgICAgICAg ICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBHX1RZUEVfQk9PTEVBTgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8fCBnUGFyYW1UeXBlID09IEdfVFlQRV9TVFJJTkcKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfHwgZ1BhcmFtVHlwZSA9PSBHX1RZUEVfSU5UKSB7CisgICAg ICAgICAgICAgICAgICAgIEdPcHRpb25FbnRyeSBvcHRpb25FbnRyeTsKKyAgICAgICAgICAgICAg ICAgICAgLyogY3JlYXRlIG9wdGlvbiBlbnRyeSBmaW5hbGx5ICovCisgICAgICAgICAgICAgICAg ICAgIG9wdGlvbkVudHJ5LmxvbmdfbmFtZSA9IGdfcGFyYW1fc3BlY19nZXRfbmFtZShwYXJhbSk7 CisgICAgICAgICAgICAgICAgICAgIC8qIG5vIHNob3J0IG5hbWUgZm9yIG9wdGlvbkVudHJ5Cisg ICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LnNob3J0X25hbWU9Ki8KKyAgICAgICAg ICAgICAgICAgICAgLyogZm9yIGJvb2wgYXJndW1lbnRzICJlbmFibGUiIHR5cGUgbWFrZSBvcHRp b24gYXJndW1lbnQgbm90IHJlcXVpcmVkICovCisgICAgICAgICAgICAgICAgICAgIGlmIChnUGFy YW1UeXBlID09IEdfVFlQRV9CT09MRUFOICYmIChzdHJzdHIgKG9wdGlvbkVudHJ5LmxvbmdfbmFt ZSwgImVuYWJsZSIpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmZsYWdz ID0gR19PUFRJT05fRkxBR19PUFRJT05BTF9BUkc7CisgICAgICAgICAgICAgICAgICAgIG9wdGlv bkVudHJ5LmFyZyA9IEdfT1BUSU9OX0FSR19DQUxMQkFDSzsKKyAgICAgICAgICAgICAgICAgICAg b3B0aW9uRW50cnkuYXJnX2RhdGEgPSBwYXJzZVdlYlNldHRpbmdzOworICAgICAgICAgICAgICAg ICAgICBvcHRpb25FbnRyeS5kZXNjcmlwdGlvbiA9IGdfcGFyYW1fc3BlY19nZXRfYmx1cmIocGFy YW0pOworICAgICAgICAgICAgICAgICAgICBvcHRpb25FbnRyeS5hcmdfZGVzY3JpcHRpb24gPSBn X3R5cGVfbmFtZShnUGFyYW1UeXBlKTsKKyAgICAgICAgICAgICAgICAgICAgZ19hcnJheV9hcHBl bmRfdmFsKG9wdGlvbkVudHJpZXNBcnJheSwgb3B0aW9uRW50cnkpOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKyAgICBnX2ZyZWUocHJvcGVydHlT cGVjcyk7CisKKyAgICByZXR1cm4gb3B0aW9uRW50cmllc0FycmF5OworfQorCitzdGF0aWMgdm9p ZAordHJhbnNmb3JtU3RyaW5nVG9Cb29sZWFuKGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1 ZSAqZGVzdFZhbHVlKQoreworICAgIGNvbnN0IGNoYXIqIHN0clZhbHVlID0gZ192YWx1ZV9nZXRf c3RyaW5nKHNyY1ZhbHVlKTsKKyAgICBpZiAoc3RyVmFsdWUpIHsKKyAgICAgICAgaWYgKCFnX2Fz Y2lpX3N0cmNhc2VjbXAoc3RyVmFsdWUsICJ0cnVlIikgfHwgIXN0cmNtcChzdHJWYWx1ZSwgIjEi KSkKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBUUlVFKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIEZB TFNFKTsKKyAgICB9IGVsc2UgLyogd2hlbiBubyBvcHRpb24gdmFsdWUgcHJvdmlkZWQgKi8KKyAg ICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIFRSVUUpOworfQorCitzdGF0aWMg dm9pZAordHJhbnNmb3JtU3RyaW5nVG9JbnQoY29uc3QgR1ZhbHVlICpzcmNWYWx1ZSwgR1ZhbHVl ICpkZXN0VmFsdWUpCit7CisgICAgY29uc3QgY2hhciogc3RyID0gZ192YWx1ZV9nZXRfc3RyaW5n KHNyY1ZhbHVlKTsKKyAgICBnX3ZhbHVlX3NldF9pbnQoZGVzdFZhbHVlLCBhdG9pKHN0cikpOwor fQorCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogewogICAgIFdlYktpdFdlYlZp ZXcgKndlYlZpZXc7CkBAIC0yNjMsNiArMzYzLDMzIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAKICAgICBtYWluX3dpbmRvdyA9IGNyZWF0ZVdpbmRvdygmd2ViVmlldyk7CiAK Ky8qKioqKioqKioqKioqKioqKioqIGFkZGl0aW9uYWwgb3B0aW9ucyBwYXJzaW5nICoqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworICAgIGdfdmFsdWVfcmVn aXN0ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBFX1NUUklORywgR19UWVBFX0JPT0xFQU4sIHRyYW5z Zm9ybVN0cmluZ1RvQm9vbGVhbik7CisgICAgZ192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVu YyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfSU5ULCB0cmFuc2Zvcm1TdHJpbmdUb0ludCk7CisKKyAg ICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3NldHRpbmdzKHdlYlZpZXcpOworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0FycmF5ID0gZ2V0 T3B0aW9uRW50cmllcyh3ZWJraXRTZXR0aW5ncyk7CisKKyAgICBHT3B0aW9uR3JvdXAgKndlYlNl dHRpbmdzR3JvdXAgPSBnX29wdGlvbl9ncm91cF9uZXcoIndlYnNldHRpbmdzIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiV2ViS2l0V2ViU2V0dGluZ3Mgd3JpdGFi bGUgcHJvcGVydGllcyBmb3IgZGVmYXVsdCBXZWJLaXRXZWJWaWV3IiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiV2ViS2l0V2ViU2V0dGluZ3MgcHJvcGVydGllcyIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Via2l0U2V0dGluZ3Ms IE5VTEwpOworICAgIGdfb3B0aW9uX2dyb3VwX2FkZF9lbnRyaWVzKHdlYlNldHRpbmdzR3JvdXAs IChHT3B0aW9uRW50cnkqKSBvcHRpb25FbnRyaWVzQXJyYXktPmRhdGEpOworCisgICAgR09wdGlv bkNvbnRleHQgKmNvbnRleHQgPSBnX29wdGlvbl9jb250ZXh0X25ldygiW1VSTF0iKTsKKyAgICBn X29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0LCB3ZWJTZXR0aW5nc0dyb3VwKTsKKwor ICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworICAgIGlmICghZ19vcHRpb25fY29udGV4dF9wYXJz ZShjb250ZXh0LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKyAgICAgICAgZ19wcmludCgiRmFp bGVkIHRvIHBhcnNlIGFyZ3VtZW50czogJXNcbiIsIGVycm9yLT5tZXNzYWdlKTsKKyAgICAgICAg Z19lcnJvcl9mcmVlKGVycm9yKTsKKyAgICAgICAgZ19vcHRpb25fY29udGV4dF9mcmVlKGNvbnRl eHQpOworICAgICAgICByZXR1cm4gZXJyb3ItPmNvZGU7CisgICAgfQorICAgIGdfb3B0aW9uX2Nv bnRleHRfZnJlZShjb250ZXh0KTsKKyAgICBnX2FycmF5X2ZyZWUob3B0aW9uRW50cmllc0FycmF5 LCBUUlVFKTsKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKwogICAg IGdjaGFyICp1cmkgPShnY2hhciopKGFyZ2MgPiAxID8gYXJndlsxXSA6ICJodHRwOi8vd3d3Lmdv b2dsZS5jb20vIik7CiAgICAgZ2NoYXIgKmZpbGVVUkwgPSBmaWxlbmFtZVRvVVJMKHVyaSk7CiAK 84897 2011-03-06 13:32:44 -0800 2011-04-24 00:15:40 -0700 General mechanism for adjusting WebKitWebSettings in GtkLauncher general3.patch text/plain 7563 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Njdl NGM1Li4zNDNiODA0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDYgIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogTWVjaGFuaXNtIGZvciBhZGp1c3RpbmcgV2ViS2l0V2ViU2V0dGluZ3MuCisgICAgICAg IChwYXJzZVdlYlNldHRpbmdzKTogQ2FsbGJhY2sgZm9yIHBhcnNpbmcgb3B0aW9uIGVudHJpZXMu IFNldHMgV2ViS2l0V2ViU2V0dGluZ3MgYWNjb3JkaW5nbHkuCisgICAgICAgIChnZXRPcHRpb25F bnRyaWVzKTogQmFzaW5nIG9uIHRoZSBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzIHByZXBh cmUgYXZhaWxhYmxlIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNmb3JtU3RyaW5nVG9C b29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBzdHJpbmcgY29udmVydGlvbiB1c2VkIGJ5 IHBhcnNlV2ViU2V0dGluZ3MuCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdUb0ludCk6IFRyYW5z Zm9ybSBmdW5jdGlvbiBmb3Igc3RyaW5nIGNvbnZlcnRpb24gdXNlZCBieSBwYXJzZVdlYlNldHRp bmdzLgorICAgICAgICAobWFpbik6IEFkZGVkIGFkZGl0aW9uYWwgb3B0aW9ucyBwYXJzaW5nIG1l Y2hhbmlzbS4KKwogMjAxMS0wMy0wMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKICAgICAgICAgVXBkYXRlIHRoZSB0ZXN0cyB0aGF0IHVzZSBXS1BhZ2VSdW5KYXZhU2Ny aXB0SW5NYWluRnJhbWUgdXNlIHRoZSBXS1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZVJlZi4KZGlmZiAt LWdpdCBhL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4u YwppbmRleCBhZDY2NmUyLi5hMWEwNGE4IDEwMDY0NAotLS0gYS9Ub29scy9HdGtMYXVuY2hlci9t YWluLmMKKysrIGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBAIC0xLDYgKzEsNyBAQAogLyoK ICAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDcgQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KKyAqIENvcHlyaWdodCAoQykgMjAxMSBM dWthc3ogU2xhY2hjaWFrCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1LDYg KzI2LDggQEAKICAqLwogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHN0ZGxpYi5o PgorI2luY2x1ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHdlYmtpdC93ZWJraXQuaD4KIAogc3Rh dGljIGdpbnQgd2luZG93Q291bnQgPSAwOwpAQCAtMjQ4LDYgKzI1MSwxMDMgQEAgc3RhdGljIHZv aWQgZGlzYWJsZVBsdWdpbihjb25zdCBjaGFyKiBwbHVnaW5OYW1lKQogfQogI2VuZGlmCiAKKy8q KgorICAqIENhbGxiYWNrIHdoaWNoIGlzIGNhbGxlZCB3aGVuIHBhcnNpbmcgb3B0aW9uIGVudHJp ZXMuCisgICogU2V0cyBXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzCisgICovCitnYm9vbGVh biBwYXJzZVdlYlNldHRpbmdzKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwgY29uc3QgZ2No YXIgKnZhbHVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdwb2ludGVyIGRhdGEsIEdF cnJvciAqKmVycm9yKQoreworICAgIFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncyA9 IChXZWJLaXRXZWJTZXR0aW5ncyAqKWRhdGE7CisgICAgZ2Jvb2xlYW4gcGFyc2VkQ29ycmVjdGx5 ID0gRkFMU0U7CisKKyAgICBpZiAoc3RybGVuKG9wdGlvbk5hbWVGdWxsKSA+IDIgJiYgd2Via2l0 U2V0dGluZ3MpIHsKKyAgICAgICAgLyogd2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28g cmVtb3ZlIHRoZW0qLworICAgICAgICBjb25zdCBnY2hhciAqb3B0aW9uTmFtZSA9IG9wdGlvbk5h bWVGdWxsICsgMjsKKyAgICAgICAgR1BhcmFtU3BlYyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2Zp bmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNTKHdlYmtpdFNldHRpbmdzKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25OYW1lKTsK KyAgICAgICAgaWYgKHNwZWMpIHsKKyAgICAgICAgICAgIC8qIGNvbnZlcnQgc3RyaW5nIHRvIHBy b3BlciB0eXBlICovCisgICAgICAgICAgICBHVmFsdWUgdmFsdWVTdHJpbmcgPSB7MCwge3swfX19 OworICAgICAgICAgICAgR1ZhbHVlIHZhbHVlUHJvcGVydHkgPSB7MCwge3swfX19OworICAgICAg ICAgICAgZ192YWx1ZV9pbml0KCZ2YWx1ZVN0cmluZywgR19UWVBFX1NUUklORyk7CisgICAgICAg ICAgICBnX3ZhbHVlX2luaXQoJnZhbHVlUHJvcGVydHksIEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBF KHNwZWMpKTsKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X3N0YXRpY19zdHJpbmcoJnZhbHVlU3Ry aW5nLCB2YWx1ZSk7CisgICAgICAgICAgICBpZiAoZ192YWx1ZV90cmFuc2Zvcm0oJnZhbHVlU3Ry aW5nLCAmdmFsdWVQcm9wZXJ0eSkpIHsKKyAgICAgICAgICAgICAgICAvKiBzZXQgV2ViS2l0V2Vi U2V0dGluZ3MgcHJvcGVydGllcyAqLworICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldF9wcm9w ZXJ0eShHX09CSkVDVCh3ZWJraXRTZXR0aW5ncyksIG9wdGlvbk5hbWUsICZ2YWx1ZVByb3BlcnR5 KTsKKyAgICAgICAgICAgICAgICBwYXJzZWRDb3JyZWN0bHkgPSBUUlVFOworICAgICAgICAgICAg fQorICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBwYXJzZWRDb3JyZWN0bHk7Cit9CisKKy8q KgorICAqIENyZWF0ZXMgR0FycmF5IG9mIEdPcHRpb25FbnRyaWVzIGJhc2luZworICAqIG9uIHRo ZSBXZWJLaXRXZWJTZXR0aW5ncyB3cml0YWJsZSBwcm9wZXJ0aWVzCisgICovCitzdGF0aWMgR0Fy cmF5KiBnZXRPcHRpb25FbnRyaWVzKFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncykK K3sKKyAgICBHUGFyYW1TcGVjICoqcHJvcGVydHlTcGVjczsKKyAgICBndWludCBudW1Qcm9wZXJ0 aWVzLCBpOworCisgICAgcHJvcGVydHlTcGVjcyA9IGdfb2JqZWN0X2NsYXNzX2xpc3RfcHJvcGVy dGllcworICAgICAgICAgICAgICAgICAgICAgICAgKEdfT0JKRUNUX0dFVF9DTEFTUyh3ZWJraXRT ZXR0aW5ncyksICZudW1Qcm9wZXJ0aWVzKTsKKworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0Fy cmF5ID0gZ19hcnJheV9uZXcoVFJVRSwgVFJVRSwgc2l6ZW9mKEdPcHRpb25FbnRyeSkpOworICAg IGlmIChvcHRpb25FbnRyaWVzQXJyYXkpIHsKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IG51bVBy b3BlcnRpZXM7IGkrKykgeworICAgICAgICAgICAgR1BhcmFtU3BlYyAqcGFyYW0gPSBwcm9wZXJ0 eVNwZWNzW2ldOworICAgICAgICAgICAgLyogb25seSBmb3Igd3JpdGFibGUgcHJvcGVydGllcyBm aWxsIGluIHN0cnVjdHVyZXMgKi8KKyAgICAgICAgICAgIGlmIChwYXJhbSAmJiBwYXJhbS0+Zmxh Z3MgJiBHX1BBUkFNX1dSSVRBQkxFKSB7CisgICAgICAgICAgICAgICAgR1R5cGUgZ1BhcmFtVHlw ZSA9IEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBFKHBhcmFtKTsKKyAgICAgICAgICAgICAgICAvKiBU T0RPIHByb3ZpZGUgc3VwcG9ydCBmb3Igb3RoZXIgcGFyYW0gdHlwZXMgKi8KKyAgICAgICAgICAg ICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBHX1RZUEVfQk9PTEVBTgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8fCBnUGFyYW1UeXBlID09IEdfVFlQRV9TVFJJTkcKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfHwgZ1BhcmFtVHlwZSA9PSBHX1RZUEVfSU5UKSB7CisgICAg ICAgICAgICAgICAgICAgIEdPcHRpb25FbnRyeSBvcHRpb25FbnRyeTsKKyAgICAgICAgICAgICAg ICAgICAgLyogY3JlYXRlIG9wdGlvbiBlbnRyeSBmaW5hbGx5ICovCisgICAgICAgICAgICAgICAg ICAgIG9wdGlvbkVudHJ5LmxvbmdfbmFtZSA9IGdfcGFyYW1fc3BlY19nZXRfbmFtZShwYXJhbSk7 CisgICAgICAgICAgICAgICAgICAgIC8qIG5vIHNob3J0IG5hbWUgZm9yIG9wdGlvbkVudHJ5Cisg ICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LnNob3J0X25hbWU9Ki8KKyAgICAgICAg ICAgICAgICAgICAgLyogZm9yIGJvb2wgYXJndW1lbnRzICJlbmFibGUiIHR5cGUgbWFrZSBvcHRp b24gYXJndW1lbnQgbm90IHJlcXVpcmVkICovCisgICAgICAgICAgICAgICAgICAgIGlmIChnUGFy YW1UeXBlID09IEdfVFlQRV9CT09MRUFOICYmIChzdHJzdHIgKG9wdGlvbkVudHJ5LmxvbmdfbmFt ZSwgImVuYWJsZSIpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmZsYWdz ID0gR19PUFRJT05fRkxBR19PUFRJT05BTF9BUkc7CisgICAgICAgICAgICAgICAgICAgIG9wdGlv bkVudHJ5LmFyZyA9IEdfT1BUSU9OX0FSR19DQUxMQkFDSzsKKyAgICAgICAgICAgICAgICAgICAg b3B0aW9uRW50cnkuYXJnX2RhdGEgPSBwYXJzZVdlYlNldHRpbmdzOworICAgICAgICAgICAgICAg ICAgICBvcHRpb25FbnRyeS5kZXNjcmlwdGlvbiA9IGdfcGFyYW1fc3BlY19nZXRfYmx1cmIocGFy YW0pOworICAgICAgICAgICAgICAgICAgICBvcHRpb25FbnRyeS5hcmdfZGVzY3JpcHRpb24gPSBn X3R5cGVfbmFtZShnUGFyYW1UeXBlKTsKKyAgICAgICAgICAgICAgICAgICAgZ19hcnJheV9hcHBl bmRfdmFsKG9wdGlvbkVudHJpZXNBcnJheSwgb3B0aW9uRW50cnkpOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKyAgICBnX2ZyZWUocHJvcGVydHlT cGVjcyk7CisKKyAgICByZXR1cm4gb3B0aW9uRW50cmllc0FycmF5OworfQorCitzdGF0aWMgdm9p ZAordHJhbnNmb3JtU3RyaW5nVG9Cb29sZWFuKGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1 ZSAqZGVzdFZhbHVlKQoreworICAgIGNvbnN0IGNoYXIqIHN0clZhbHVlID0gZ192YWx1ZV9nZXRf c3RyaW5nKHNyY1ZhbHVlKTsKKyAgICBpZiAoc3RyVmFsdWUpIHsKKyAgICAgICAgaWYgKCFnX2Fz Y2lpX3N0cmNhc2VjbXAoc3RyVmFsdWUsICJ0cnVlIikgfHwgIXN0cmNtcChzdHJWYWx1ZSwgIjEi KSkKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBUUlVFKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIEZB TFNFKTsKKyAgICB9IGVsc2UgLyogd2hlbiBubyBvcHRpb24gdmFsdWUgcHJvdmlkZWQgKi8KKyAg ICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIFRSVUUpOworfQorCitzdGF0aWMg dm9pZAordHJhbnNmb3JtU3RyaW5nVG9JbnQoY29uc3QgR1ZhbHVlICpzcmNWYWx1ZSwgR1ZhbHVl ICpkZXN0VmFsdWUpCit7CisgICAgY29uc3QgY2hhciogc3RyID0gZ192YWx1ZV9nZXRfc3RyaW5n KHNyY1ZhbHVlKTsKKyAgICBnX3ZhbHVlX3NldF9pbnQoZGVzdFZhbHVlLCBhdG9pKHN0cikpOwor fQorCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogewogICAgIFdlYktpdFdlYlZp ZXcgKndlYlZpZXc7CkBAIC0yNjMsNiArMzYzLDM0IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAKICAgICBtYWluX3dpbmRvdyA9IGNyZWF0ZVdpbmRvdygmd2ViVmlldyk7CiAK Ky8qKioqKioqKioqKioqKioqKioqIGFkZGl0aW9uYWwgb3B0aW9ucyBwYXJzaW5nICoqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworICAgIGdfdmFsdWVfcmVn aXN0ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBFX1NUUklORywgR19UWVBFX0JPT0xFQU4sIHRyYW5z Zm9ybVN0cmluZ1RvQm9vbGVhbik7CisgICAgZ192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVu YyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfSU5ULCB0cmFuc2Zvcm1TdHJpbmdUb0ludCk7CisKKyAg ICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3NldHRpbmdzKHdlYlZpZXcpOworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0FycmF5ID0gZ2V0 T3B0aW9uRW50cmllcyh3ZWJraXRTZXR0aW5ncyk7CisKKyAgICBHT3B0aW9uR3JvdXAgKndlYlNl dHRpbmdzR3JvdXAgPSBnX29wdGlvbl9ncm91cF9uZXcoIndlYnNldHRpbmdzIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiV2ViS2l0V2ViU2V0dGluZ3Mgd3JpdGFi bGUgcHJvcGVydGllcyBmb3IgZGVmYXVsdCBXZWJLaXRXZWJWaWV3IiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiV2ViS2l0V2ViU2V0dGluZ3MgcHJvcGVydGllcyIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Via2l0U2V0dGluZ3Ms IE5VTEwpOworICAgIGdfb3B0aW9uX2dyb3VwX2FkZF9lbnRyaWVzKHdlYlNldHRpbmdzR3JvdXAs IChHT3B0aW9uRW50cnkqKSBvcHRpb25FbnRyaWVzQXJyYXktPmRhdGEpOworCisgICAgR09wdGlv bkNvbnRleHQgKmNvbnRleHQgPSBnX29wdGlvbl9jb250ZXh0X25ldygiW1VSTF0iKTsKKyAgICBn X29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0LCB3ZWJTZXR0aW5nc0dyb3VwKTsKKwor ICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworICAgIGlmICghZ19vcHRpb25fY29udGV4dF9wYXJz ZShjb250ZXh0LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKyAgICAgICAgZ19wcmludCgiRmFp bGVkIHRvIHBhcnNlIGFyZ3VtZW50czogJXNcbiIsIGVycm9yLT5tZXNzYWdlKTsKKyAgICAgICAg Z19lcnJvcl9mcmVlKGVycm9yKTsKKyAgICAgICAgZ19vcHRpb25fY29udGV4dF9mcmVlKGNvbnRl eHQpOworICAgICAgICBnX2FycmF5X2ZyZWUob3B0aW9uRW50cmllc0FycmF5LCBUUlVFKTsKKyAg ICAgICAgcmV0dXJuIDE7CisgICAgfQorICAgIGdfb3B0aW9uX2NvbnRleHRfZnJlZShjb250ZXh0 KTsKKyAgICBnX2FycmF5X2ZyZWUob3B0aW9uRW50cmllc0FycmF5LCBUUlVFKTsKKy8qKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKwogICAgIGdjaGFyICp1cmkgPShnY2hh ciopKGFyZ2MgPiAxID8gYXJndlsxXSA6ICJodHRwOi8vd3d3Lmdvb2dsZS5jb20vIik7CiAgICAg Z2NoYXIgKmZpbGVVUkwgPSBmaWxlbmFtZVRvVVJMKHVyaSk7CiAK 90875 2011-04-24 00:15:40 -0700 2011-06-18 05:58:03 -0700 General mechanism for adjusting WebKitWebSettings in GtkLauncher general6.patch text/plain 7833 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OGVk NjlhLi4yM2IwZWJiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMjMgIEx1a2FzeiBTbGFjaGNpYWsgIDxs dWthc3ouc2xhY2hjaWFrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5n IFdlYktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVy L21haW4uYzogQWRkZWQgZ2VuZXJhbCBtZWNoYW5pc20gZm9yIGFkanVzdGluZyBXZWJLaXRXZWJT ZXR0aW5ncy4KKyAgICAgICAgKHBhcnNlT3B0aW9uRW50cnlDYWxsYmFjayk6IENhbGxiYWNrIGZv ciBwYXJzaW5nIG9wdGlvbiBlbnRyeS4KKyAgICAgICAgKGdldE9wdGlvbkVudHJpZXNGcm9tV2Vi S2l0V2ViU2V0dGluZ3MpOiBCYXNpbmcgb24gdGhlIFdlYktpdFdlYlNldHRpbmdzIHByb3BlcnRp ZXMgcHJlcGFyZQorICAgICAgICBsaXN0IG9mIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJh bnNmb3JtU3RyaW5nVG9Cb29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBib29sZWFuIGNv bnZlcnRpb24gdXNlZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFu c2Zvcm1TdHJpbmdUb0ludCk6IFRyYW5zZm9ybSBmdW5jdGlvbiBmb3IgaW50IGNvbnZlcnRpb24g dXNlZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zvcm1TdHJp bmdUb0Zsb2F0KTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBmbG9hdCBjb252ZXJ0aW9uIHVzZWQg YnkgcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrLgorICAgICAgICAocGFyc2VBZGRpdGlvbmFsT3B0 aW9ucyk6IEhlbHAgZnVuY3Rpb24gcGFyc2luZyBhZGRpdGlvbmFsIGNvbW1hbmRsaW5lIG9wdGlv bnMuCisgICAgICAgIChtYWluKTogQWRkZWQgY2FsbCB0byBwYXJzZUFkZGl0aW9uYWxPcHRpb25z LgorCiAyMDExLTA0LTIyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODQ2MjcuCmRpZmYgLS1naXQg YS9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMgYi9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5k ZXggYTFiYWYwNS4uZTFjNWI4MSAxMDA2NDQKLS0tIGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5j CisrKyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBD b3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA3 IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgTHVrYXN6 IFNsYWNoY2lhawogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSw2ICsyNiw4 IEBACiAgKi8KIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4KKyNp bmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAKIHN0YXRpYyBn aW50IHdpbmRvd0NvdW50ID0gMDsKQEAgLTIzMCw2ICsyMzMsMTM4IEBAIHN0YXRpYyBnY2hhciog ZmlsZW5hbWVUb1VSTChjb25zdCBjaGFyKiBmaWxlbmFtZSkKICAgICByZXR1cm4gZmlsZVVSTDsK IH0KIAorZ2Jvb2xlYW4gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrKGNvbnN0IGdjaGFyICpvcHRp b25OYW1lRnVsbCwgY29uc3QgZ2NoYXIgKnZhbHVlLCBncG9pbnRlciBkYXRhLCBHRXJyb3IgKipl cnJvcikKK3sKKyAgICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSAoV2ViS2l0 V2ViU2V0dGluZ3MgKilkYXRhOworCisgICAgaWYgKHN0cmxlbihvcHRpb25OYW1lRnVsbCkgPD0g MiB8fCAhd2Via2l0U2V0dGluZ3MpCisgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgIC8qIFdl IGhhdmUgdHdvIC0tIGluIG9wdGlvbiBuYW1lIHNvIHJlbW92ZSB0aGVtLiAqLworICAgIGNvbnN0 IGdjaGFyICpvcHRpb25OYW1lID0gb3B0aW9uTmFtZUZ1bGwgKyAyOworICAgIEdQYXJhbVNwZWMg KnNwZWMgPSBnX29iamVjdF9jbGFzc19maW5kX3Byb3BlcnR5KEdfT0JKRUNUX0dFVF9DTEFTUyh3 ZWJraXRTZXR0aW5ncyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgb3B0aW9uTmFtZSk7CisgICAgaWYgKCFzcGVjKQorICAgICAgICByZXR1cm4g RkFMU0U7CisKKyAgICAvKiBDb252ZXJ0IHN0cmluZyB0byBwcm9wZXIgdHlwZS4gKi8KKyAgICBH VmFsdWUgdmFsdWVTdHJpbmcgPSB7MCwge3swfX19OworICAgIEdWYWx1ZSB2YWx1ZVByb3BlcnR5 ID0gezAsIHt7MH19fTsKKyAgICBnX3ZhbHVlX2luaXQoJnZhbHVlU3RyaW5nLCBHX1RZUEVfU1RS SU5HKTsKKyAgICBnX3ZhbHVlX2luaXQoJnZhbHVlUHJvcGVydHksIEdfUEFSQU1fU1BFQ19WQUxV RV9UWVBFKHNwZWMpKTsKKyAgICBnX3ZhbHVlX3NldF9zdGF0aWNfc3RyaW5nKCZ2YWx1ZVN0cmlu ZywgdmFsdWUpOworICAgIGlmICghZ192YWx1ZV90cmFuc2Zvcm0oJnZhbHVlU3RyaW5nLCAmdmFs dWVQcm9wZXJ0eSkpCisgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgIC8qIFNldCBXZWJLaXRX ZWJTZXR0aW5ncyBwcm9wZXJ0aWVzLiAqLworICAgIGdfb2JqZWN0X3NldF9wcm9wZXJ0eShHX09C SkVDVCh3ZWJraXRTZXR0aW5ncyksIG9wdGlvbk5hbWUsICZ2YWx1ZVByb3BlcnR5KTsKKworICAg IHJldHVybiBUUlVFOworfQorCitzdGF0aWMgR0FycmF5KiBnZXRPcHRpb25FbnRyaWVzRnJvbVdl YktpdFdlYlNldHRpbmdzKFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncykKK3sKKyAg ICBHUGFyYW1TcGVjICoqcHJvcGVydHlTcGVjczsKKyAgICBHQXJyYXkgKm9wdGlvbkVudHJpZXNB cnJheTsKKyAgICBndWludCBudW1Qcm9wZXJ0aWVzLCBpOworCisgICAgcHJvcGVydHlTcGVjcyA9 IGdfb2JqZWN0X2NsYXNzX2xpc3RfcHJvcGVydGllcyhHX09CSkVDVF9HRVRfQ0xBU1Mod2Via2l0 U2V0dGluZ3MpLCAmbnVtUHJvcGVydGllcyk7CisgICAgaWYgKCFwcm9wZXJ0eVNwZWNzKQorICAg ICAgICByZXR1cm4gTlVMTDsKKworICAgIG9wdGlvbkVudHJpZXNBcnJheSA9IGdfYXJyYXlfbmV3 KFRSVUUsIFRSVUUsIHNpemVvZihHT3B0aW9uRW50cnkpKTsKKyAgICBpZiAoIW9wdGlvbkVudHJp ZXNBcnJheSkgeworICAgICAgICBnX2ZyZWUocHJvcGVydHlTcGVjcyk7CisgICAgICAgIHJldHVy biBOVUxMOworICAgIH0KKworICAgIGZvciAoaSA9IDA7IGkgPCBudW1Qcm9wZXJ0aWVzOyBpKysp IHsKKyAgICAgICAgR1BhcmFtU3BlYyAqcGFyYW0gPSBwcm9wZXJ0eVNwZWNzW2ldOworCisgICAg ICAgIC8qIEZpbGwgaW4gc3RydWN0dXJlcyBvbmx5IGZvciB3cml0YWJsZSBwcm9wZXJ0aWVzLiAq LworICAgICAgICBpZiAocGFyYW0gJiYgcGFyYW0tPmZsYWdzICYgR19QQVJBTV9XUklUQUJMRSkg eworICAgICAgICAgICAgR1R5cGUgZ1BhcmFtVHlwZSA9IEdfUEFSQU1fU1BFQ19WQUxVRV9UWVBF KHBhcmFtKTsKKyAgICAgICAgICAgIC8qIE9ubHkgaW50LCBib29sZWFuLCBmbG9hdCBhbmQgc3Ry aW5nIHdyaXRhYmxlIHByb3BlcnRpZXMgYXJlIHN1cHBvcnRlZC4gKi8KKyAgICAgICAgICAgIGlm IChnUGFyYW1UeXBlID09IEdfVFlQRV9CT09MRUFOIHx8IGdQYXJhbVR5cGUgPT0gR19UWVBFX1NU UklORyB8fCBnUGFyYW1UeXBlID09IEdfVFlQRV9JTlQKKyAgICAgICAgICAgICAgICB8fCBnUGFy YW1UeXBlID09IEdfVFlQRV9GTE9BVCkgeworICAgICAgICAgICAgICAgIEdPcHRpb25FbnRyeSBv cHRpb25FbnRyeTsKKyAgICAgICAgICAgICAgICAvKiBDcmVhdGUgb3B0aW9uIGVudHJ5LiAqLwor ICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmxvbmdfbmFtZSA9IGdfcGFyYW1fc3BlY19nZXRf bmFtZShwYXJhbSk7CisgICAgICAgICAgICAgICAgLyogTm8gc2hvcnQgbmFtZSBmb3Igb3B0aW9u RW50cnkuCisgICAgICAgICAgICAgICAgICAgb3B0aW9uRW50cnkuc2hvcnRfbmFtZT0qLworICAg ICAgICAgICAgICAgIC8qIEZvciBib29sIGFyZ3VtZW50cyAiZW5hYmxlIiB0eXBlIG1ha2Ugb3B0 aW9uIGFyZ3VtZW50IG5vdCByZXF1aXJlZC4gKi8KKyAgICAgICAgICAgICAgICBpZiAoZ1BhcmFt VHlwZSA9PSBHX1RZUEVfQk9PTEVBTiAmJiAoc3Ryc3RyIChvcHRpb25FbnRyeS5sb25nX25hbWUs ICJlbmFibGUiKSkpCisgICAgICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmZsYWdzID0gR19P UFRJT05fRkxBR19PUFRJT05BTF9BUkc7CisgICAgICAgICAgICAgICAgb3B0aW9uRW50cnkuYXJn ID0gR19PUFRJT05fQVJHX0NBTExCQUNLOworICAgICAgICAgICAgICAgIG9wdGlvbkVudHJ5LmFy Z19kYXRhID0gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrOworICAgICAgICAgICAgICAgIG9wdGlv bkVudHJ5LmRlc2NyaXB0aW9uID0gZ19wYXJhbV9zcGVjX2dldF9ibHVyYihwYXJhbSk7CisgICAg ICAgICAgICAgICAgb3B0aW9uRW50cnkuYXJnX2Rlc2NyaXB0aW9uID0gZ190eXBlX25hbWUoZ1Bh cmFtVHlwZSk7CisgICAgICAgICAgICAgICAgZ19hcnJheV9hcHBlbmRfdmFsKG9wdGlvbkVudHJp ZXNBcnJheSwgb3B0aW9uRW50cnkpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQor ICAgIGdfZnJlZShwcm9wZXJ0eVNwZWNzKTsKKworICAgIHJldHVybiBvcHRpb25FbnRyaWVzQXJy YXk7Cit9CisKK3N0YXRpYyB2b2lkIHRyYW5zZm9ybVN0cmluZ1RvQm9vbGVhbihjb25zdCBHVmFs dWUgKnNyY1ZhbHVlLCBHVmFsdWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBjb25zdCBjaGFyKiBzdHJW YWx1ZSA9IGdfdmFsdWVfZ2V0X3N0cmluZyhzcmNWYWx1ZSk7CisgICAgaWYgKHN0clZhbHVlKSB7 CisgICAgICAgIGlmICghZ19hc2NpaV9zdHJjYXNlY21wKHN0clZhbHVlLCAidHJ1ZSIpIHx8ICFz dHJjbXAoc3RyVmFsdWUsICIxIikpCisgICAgICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKGRl c3RWYWx1ZSwgVFJVRSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X2Jv b2xlYW4oZGVzdFZhbHVlLCBGQUxTRSk7CisgICAgfSBlbHNlIC8qIFdoZW4gbm8gb3B0aW9uIHZh bHVlIHByb3ZpZGVkLCBzZXQgIlRSVUUiIGJ5IGRlZmF1bHQuICovCisgICAgICAgIGdfdmFsdWVf c2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBUUlVFKTsKK30KKworc3RhdGljIHZvaWQgdHJhbnNmb3Jt U3RyaW5nVG9JbnQoY29uc3QgR1ZhbHVlICpzcmNWYWx1ZSwgR1ZhbHVlICpkZXN0VmFsdWUpCit7 CisgICAgY29uc3QgY2hhciogc3RyID0gZ192YWx1ZV9nZXRfc3RyaW5nKHNyY1ZhbHVlKTsKKyAg ICBnX3ZhbHVlX3NldF9pbnQoZGVzdFZhbHVlLCBhdG9pKHN0cikpOworfQorCitzdGF0aWMgdm9p ZCB0cmFuc2Zvcm1TdHJpbmdUb0Zsb2F0KGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1ZSAq ZGVzdFZhbHVlKQoreworICAgIGNvbnN0IGNoYXIqIHN0ciA9IGdfdmFsdWVfZ2V0X3N0cmluZyhz cmNWYWx1ZSk7CisgICAgZ192YWx1ZV9zZXRfZmxvYXQoZGVzdFZhbHVlLCBhdG9mKHN0cikpOwor fQorCitzdGF0aWMgZ2Jvb2xlYW4gcGFyc2VBZGRpdGlvbmFsT3B0aW9ucyhXZWJLaXRXZWJWaWV3 ICp3ZWJWaWV3LCBpbnQgYXJnYywgY2hhciogYXJndltdKQoreworICAgIGdfdmFsdWVfcmVnaXN0 ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBFX1NUUklORywgR19UWVBFX0JPT0xFQU4sIHRyYW5zZm9y bVN0cmluZ1RvQm9vbGVhbik7CisgICAgZ192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVuYyhH X1RZUEVfU1RSSU5HLCBHX1RZUEVfSU5ULCB0cmFuc2Zvcm1TdHJpbmdUb0ludCk7CisgICAgZ192 YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfRkxPQVQs IHRyYW5zZm9ybVN0cmluZ1RvRmxvYXQpOworCisKKyAgICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Vi a2l0U2V0dGluZ3MgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHdlYlZpZXcpOworICAg IEdBcnJheSAqb3B0aW9uRW50cmllc0FycmF5ID0gZ2V0T3B0aW9uRW50cmllc0Zyb21XZWJLaXRX ZWJTZXR0aW5ncyh3ZWJraXRTZXR0aW5ncyk7CisKKyAgICBHT3B0aW9uR3JvdXAgKndlYlNldHRp bmdzR3JvdXAgPSBnX29wdGlvbl9ncm91cF9uZXcoIndlYnNldHRpbmdzIiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIldlYktpdFdlYlNl dHRpbmdzIHdyaXRhYmxlIHByb3BlcnRpZXMgZm9yIGRlZmF1bHQgV2ViS2l0V2ViVmlldyIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJX ZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Via2l0U2V0dGluZ3MsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOworICAg IGdfb3B0aW9uX2dyb3VwX2FkZF9lbnRyaWVzKHdlYlNldHRpbmdzR3JvdXAsIChHT3B0aW9uRW50 cnkqKSBvcHRpb25FbnRyaWVzQXJyYXktPmRhdGEpOworCisgICAgR09wdGlvbkNvbnRleHQgKmNv bnRleHQgPSBnX29wdGlvbl9jb250ZXh0X25ldygiW1VSTF0iKTsKKyAgICBnX29wdGlvbl9jb250 ZXh0X2FkZF9ncm91cChjb250ZXh0LCB3ZWJTZXR0aW5nc0dyb3VwKTsKKworICAgIEdFcnJvciAq ZXJyb3IgPSBOVUxMOworICAgIGlmICghZ19vcHRpb25fY29udGV4dF9wYXJzZShjb250ZXh0LCAm YXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKyAgICAgICAgZ19wcmludCgiRmFpbGVkIHRvIHBhcnNl IGFyZ3VtZW50czogJXNcbiIsIGVycm9yLT5tZXNzYWdlKTsKKyAgICAgICAgZ19lcnJvcl9mcmVl KGVycm9yKTsKKyAgICAgICAgZ19vcHRpb25fY29udGV4dF9mcmVlKGNvbnRleHQpOworICAgICAg ICBnX2FycmF5X2ZyZWUob3B0aW9uRW50cmllc0FycmF5LCBUUlVFKTsKKyAgICAgICAgcmV0dXJu IEZBTFNFOworICAgIH0KKyAgICBnX29wdGlvbl9jb250ZXh0X2ZyZWUoY29udGV4dCk7CisgICAg Z19hcnJheV9mcmVlKG9wdGlvbkVudHJpZXNBcnJheSwgVFJVRSk7CisgICAgcmV0dXJuIFRSVUU7 Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiB7CiAgICAgV2ViS2l0V2Vi VmlldyAqd2ViVmlldzsKQEAgLTI0MSw2ICszNzYsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hh ciogYXJndltdKQogCiAgICAgbWFpbl93aW5kb3cgPSBjcmVhdGVXaW5kb3coJndlYlZpZXcpOwog CisgICAgaWYgKCFwYXJzZUFkZGl0aW9uYWxPcHRpb25zKHdlYlZpZXcsIGFyZ2MsIGFyZ3YpKQor ICAgICAgICByZXR1cm4gMTsKKwogICAgIGdjaGFyICp1cmkgPShnY2hhciopKGFyZ2MgPiAxID8g YXJndlsxXSA6ICJodHRwOi8vd3d3Lmdvb2dsZS5jb20vIik7CiAgICAgZ2NoYXIgKmZpbGVVUkwg PSBmaWxlbmFtZVRvVVJMKHVyaSk7CiAK 97698 2011-06-18 05:58:03 -0700 2011-06-18 06:00:41 -0700 General mechanism for adjusting WebKitWebSettings in GtkLauncher generalPatch7.patch text/plain 7579 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxY2Q1 MWU5Li5mMzk1MGZkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogQWRkZWQgZ2VuZXJhbCBtZWNoYW5pc20gZm9yIGFkanVzdGluZyBXZWJLaXRXZWJTZXR0 aW5ncy4KKyAgICAgICAgKHBhcnNlT3B0aW9uRW50cnlDYWxsYmFjayk6IENhbGxiYWNrIGZvciBw YXJzaW5nIG9wdGlvbiBlbnRyeS4KKyAgICAgICAgKGdldE9wdGlvbkVudHJpZXNGcm9tV2ViS2l0 V2ViU2V0dGluZ3MpOiBCYXNpbmcgb24gdGhlIFdlYktpdFdlYlNldHRpbmdzIHByb3BlcnRpZXMg cHJlcGFyZQorICAgICAgICBsaXN0IG9mIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNm b3JtU3RyaW5nVG9Cb29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBib29sZWFuIGNvbnZl cnRpb24gdXNlZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zv cm1TdHJpbmdUb0ludCk6IFRyYW5zZm9ybSBmdW5jdGlvbiBmb3IgaW50IGNvbnZlcnRpb24gdXNl ZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdU b0Zsb2F0KTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBmbG9hdCBjb252ZXJ0aW9uIHVzZWQgYnkg cGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrLgorICAgICAgICAocGFyc2VBZGRpdGlvbmFsT3B0aW9u cyk6IEhlbHAgZnVuY3Rpb24gcGFyc2luZyBhZGRpdGlvbmFsIGNvbW1hbmRsaW5lIG9wdGlvbnMu CisgICAgICAgIChtYWluKTogQWRkZWQgY2FsbCB0byBwYXJzZUFkZGl0aW9uYWxPcHRpb25zLgor CiAyMDExLTA1LTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBCcmlhbiBXZWluc3RlaW4uCmRpZmYgLS1naXQgYS9Ub29scy9HdGtM YXVuY2hlci9tYWluLmMgYi9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5kZXggYWVhMDE3Zi4u MzNlYzg2ZSAxMDA2NDQKLS0tIGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xz L0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDYsIDIwMDcgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8 YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgTHVrYXN6IFNsYWNoY2lhawog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSw2ICsyNiw4IEBACiAgKi8KIAog I2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDxzdHJp bmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAKIHN0YXRpYyBnaW50IHdpbmRvd0Nv dW50ID0gMDsKQEAgLTIzNiw2ICsyMzksMTM1IEBAIHN0YXRpYyBnY2hhciogZmlsZW5hbWVUb1VS TChjb25zdCBjaGFyKiBmaWxlbmFtZSkKICAgICByZXR1cm4gZmlsZVVSTDsKIH0KIAorZ2Jvb2xl YW4gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwg Y29uc3QgZ2NoYXIgKnZhbHVlLCBncG9pbnRlciBkYXRhLCBHRXJyb3IgKiplcnJvcikKK3sKKyAg ICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSAoV2ViS2l0V2ViU2V0dGluZ3Mg KilkYXRhOworCisgICAgZ19hc3NlcnQod2Via2l0U2V0dGluZ3MpOworCisgICAgaWYgKHN0cmxl bihvcHRpb25OYW1lRnVsbCkgPD0gMikKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgLyog V2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28gcmVtb3ZlIHRoZW0uICovCisgICAgY29u c3QgZ2NoYXIgKm9wdGlvbk5hbWUgPSBvcHRpb25OYW1lRnVsbCArIDI7CisgICAgR1BhcmFtU3Bl YyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNT KHdlYmtpdFNldHRpbmdzKSxvcHRpb25OYW1lKTsKKyAgICBpZiAoIXNwZWMpCisgICAgICAgIHJl dHVybiBGQUxTRTsKKworICAgIC8qIENvbnZlcnQgc3RyaW5nIHRvIHByb3BlciB0eXBlLiAqLwor ICAgIEdWYWx1ZSB2YWx1ZVN0cmluZyA9IHswLCB7ezB9fX07CisgICAgR1ZhbHVlIHZhbHVlUHJv cGVydHkgPSB7MCwge3swfX19OworICAgIGdfdmFsdWVfaW5pdCgmdmFsdWVTdHJpbmcsIEdfVFlQ RV9TVFJJTkcpOworICAgIGdfdmFsdWVfaW5pdCgmdmFsdWVQcm9wZXJ0eSwgR19QQVJBTV9TUEVD X1ZBTFVFX1RZUEUoc3BlYykpOworICAgIGdfdmFsdWVfc2V0X3N0YXRpY19zdHJpbmcoJnZhbHVl U3RyaW5nLCB2YWx1ZSk7CisgICAgaWYgKCFnX3ZhbHVlX3RyYW5zZm9ybSgmdmFsdWVTdHJpbmcs ICZ2YWx1ZVByb3BlcnR5KSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgLyogU2V0IFdl YktpdFdlYlNldHRpbmdzIHByb3BlcnRpZXMuICovCisgICAgZ19vYmplY3Rfc2V0X3Byb3BlcnR5 KEdfT0JKRUNUKHdlYmtpdFNldHRpbmdzKSwgb3B0aW9uTmFtZSwgJnZhbHVlUHJvcGVydHkpOwor CisgICAgcmV0dXJuIFRSVUU7Cit9CisKK3N0YXRpYyBHQXJyYXkqIGdldE9wdGlvbkVudHJpZXNG cm9tV2ViS2l0V2ViU2V0dGluZ3MoV2ViS2l0V2ViU2V0dGluZ3MgKndlYmtpdFNldHRpbmdzKQor eworICAgIEdQYXJhbVNwZWMgKipwcm9wZXJ0eVNwZWNzOworICAgIEdBcnJheSAqb3B0aW9uRW50 cmllc0FycmF5OworICAgIGd1aW50IG51bVByb3BlcnRpZXMsIGk7CisKKyAgICBwcm9wZXJ0eVNw ZWNzID0gZ19vYmplY3RfY2xhc3NfbGlzdF9wcm9wZXJ0aWVzKEdfT0JKRUNUX0dFVF9DTEFTUyh3 ZWJraXRTZXR0aW5ncyksICZudW1Qcm9wZXJ0aWVzKTsKKyAgICBpZiAoIXByb3BlcnR5U3BlY3Mp CisgICAgICAgIHJldHVybiBOVUxMOworCisgICAgb3B0aW9uRW50cmllc0FycmF5ID0gZ19hcnJh eV9uZXcoVFJVRSwgVFJVRSwgc2l6ZW9mKEdPcHRpb25FbnRyeSkpOworICAgIGlmICghb3B0aW9u RW50cmllc0FycmF5KSB7CisgICAgICAgIGdfZnJlZShwcm9wZXJ0eVNwZWNzKTsKKyAgICAgICAg cmV0dXJuIE5VTEw7CisgICAgfQorCisgICAgZm9yIChpID0gMDsgaSA8IG51bVByb3BlcnRpZXM7 IGkrKykgeworICAgICAgICBHUGFyYW1TcGVjICpwYXJhbSA9IHByb3BlcnR5U3BlY3NbaV07CisK KyAgICAgICAgLyogRmlsbCBpbiBzdHJ1Y3R1cmVzIG9ubHkgZm9yIHdyaXRhYmxlIHByb3BlcnRp ZXMuICovCisgICAgICAgIGlmICghcGFyYW0gfHwgIShwYXJhbS0+ZmxhZ3MgJiBHX1BBUkFNX1dS SVRBQkxFKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisJCUdUeXBlIGdQYXJhbVR5cGUgPSBH X1BBUkFNX1NQRUNfVkFMVUVfVFlQRShwYXJhbSk7CisgICAgICAgIGlmIChnUGFyYW1UeXBlID09 IEdfVFlQRV9CT09MRUFOIHx8IGdQYXJhbVR5cGUgPT0gR19UWVBFX1NUUklORyB8fCBnUGFyYW1U eXBlID09IEdfVFlQRV9JTlQKKyAgICAgICAgICAgIHx8IGdQYXJhbVR5cGUgPT0gR19UWVBFX0ZM T0FUKSB7CisgICAgICAgICAgICBHT3B0aW9uRW50cnkgb3B0aW9uRW50cnk7CisgICAgICAgICAg ICBvcHRpb25FbnRyeS5sb25nX25hbWUgPSBnX3BhcmFtX3NwZWNfZ2V0X25hbWUocGFyYW0pOwor ICAgICAgICAgICAgLyogVGhlcmUgaXMgbm8gZWFzeSB3YXkgdG8gZmlndXJlIG91ciBzaG9ydCBu YW1lIGZvciBnZW5lcmF0ZWQgb3B0aW9uIGVudHJpZXMuCisgICAgICAgICAgICAgICBvcHRpb25F bnRyeS5zaG9ydF9uYW1lPSovCisgICAgICAgICAgICAvKiBGb3IgYm9vbCBhcmd1bWVudHMgImVu YWJsZSIgdHlwZSBtYWtlIG9wdGlvbiBhcmd1bWVudCBub3QgcmVxdWlyZWQuICovCisgICAgICAg ICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBHX1RZUEVfQk9PTEVBTiAmJiAoc3Ryc3RyKG9wdGlvbkVu dHJ5LmxvbmdfbmFtZSwgImVuYWJsZSIpKSkKKyAgICAgICAgICAgICAgICBvcHRpb25FbnRyeS5m bGFncyA9IEdfT1BUSU9OX0ZMQUdfT1BUSU9OQUxfQVJHOworICAgICAgICAgICAgb3B0aW9uRW50 cnkuYXJnID0gR19PUFRJT05fQVJHX0NBTExCQUNLOworICAgICAgICAgICAgb3B0aW9uRW50cnku YXJnX2RhdGEgPSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2s7CisgICAgICAgICAgICBvcHRpb25F bnRyeS5kZXNjcmlwdGlvbiA9IGdfcGFyYW1fc3BlY19nZXRfYmx1cmIocGFyYW0pOworICAgICAg ICAgICAgb3B0aW9uRW50cnkuYXJnX2Rlc2NyaXB0aW9uID0gZ190eXBlX25hbWUoZ1BhcmFtVHlw ZSk7CisgICAgICAgICAgICBnX2FycmF5X2FwcGVuZF92YWwob3B0aW9uRW50cmllc0FycmF5LCBv cHRpb25FbnRyeSk7CisgICAgICAgIH0KKyAgICB9CisgICAgZ19mcmVlKHByb3BlcnR5U3BlY3Mp OworCisgICAgcmV0dXJuIG9wdGlvbkVudHJpZXNBcnJheTsKK30KKworc3RhdGljIHZvaWQgdHJh bnNmb3JtU3RyaW5nVG9Cb29sZWFuKGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1ZSAqZGVz dFZhbHVlKQoreworICAgIGNvbnN0IGNoYXIqIHN0clZhbHVlID0gZ192YWx1ZV9nZXRfc3RyaW5n KHNyY1ZhbHVlKTsKKyAgICBpZiAoc3RyVmFsdWUpIHsKKyAgICAgICAgaWYgKCFnX2FzY2lpX3N0 cmNhc2VjbXAoc3RyVmFsdWUsICJ0cnVlIikgfHwgIXN0cmNtcChzdHJWYWx1ZSwgIjEiKSkKKyAg ICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBUUlVFKTsKKyAgICAgICAg ZWxzZQorICAgICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIEZBTFNFKTsK KyAgICB9IGVsc2UgLyogV2hlbiBubyBvcHRpb24gdmFsdWUgcHJvdmlkZWQsIHNldCAiVFJVRSIg YnkgZGVmYXVsdC4gKi8KKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIFRS VUUpOworfQorCitzdGF0aWMgdm9pZCB0cmFuc2Zvcm1TdHJpbmdUb0ludChjb25zdCBHVmFsdWUg KnNyY1ZhbHVlLCBHVmFsdWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBnX3ZhbHVlX3NldF9pbnQoZGVz dFZhbHVlLCBhdG9pKGdfdmFsdWVfZ2V0X3N0cmluZyhzcmNWYWx1ZSkpKTsKK30KKworc3RhdGlj IHZvaWQgdHJhbnNmb3JtU3RyaW5nVG9GbG9hdChjb25zdCBHVmFsdWUgKnNyY1ZhbHVlLCBHVmFs dWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBnX3ZhbHVlX3NldF9mbG9hdChkZXN0VmFsdWUsIGF0b2Yo Z192YWx1ZV9nZXRfc3RyaW5nKHNyY1ZhbHVlKSkpOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gcGFy c2VBZGRpdGlvbmFsT3B0aW9ucyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBpbnQgYXJnYywgY2hh ciogYXJndltdKQoreworICAgIGdfdmFsdWVfcmVnaXN0ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBF X1NUUklORywgR19UWVBFX0JPT0xFQU4sIHRyYW5zZm9ybVN0cmluZ1RvQm9vbGVhbik7CisgICAg Z192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfSU5U LCB0cmFuc2Zvcm1TdHJpbmdUb0ludCk7CisgICAgZ192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1f ZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfRkxPQVQsIHRyYW5zZm9ybVN0cmluZ1RvRmxvYXQp OworCisKKyAgICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X3NldHRpbmdzKHdlYlZpZXcpOworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0Fy cmF5ID0gZ2V0T3B0aW9uRW50cmllc0Zyb21XZWJLaXRXZWJTZXR0aW5ncyh3ZWJraXRTZXR0aW5n cyk7CisKKyAgICBHT3B0aW9uR3JvdXAgKndlYlNldHRpbmdzR3JvdXAgPSBnX29wdGlvbl9ncm91 cF9uZXcoIndlYnNldHRpbmdzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIldlYktpdFdlYlNldHRpbmdzIHdyaXRhYmxlIHByb3BlcnRp ZXMgZm9yIGRlZmF1bHQgV2ViS2l0V2ViVmlldyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0 aWVzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgd2Via2l0U2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOworICAgIGdfb3B0aW9uX2dyb3VwX2FkZF9lbnRy aWVzKHdlYlNldHRpbmdzR3JvdXAsIChHT3B0aW9uRW50cnkqKSBvcHRpb25FbnRyaWVzQXJyYXkt PmRhdGEpOworCisgICAgR09wdGlvbkNvbnRleHQgKmNvbnRleHQgPSBnX29wdGlvbl9jb250ZXh0 X25ldygiW1VSTF0iKTsKKyAgICBnX29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0LCB3 ZWJTZXR0aW5nc0dyb3VwKTsKKworICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworICAgIGlmICgh Z19vcHRpb25fY29udGV4dF9wYXJzZShjb250ZXh0LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsK KyAgICAgICAgZ19wcmludCgiRmFpbGVkIHRvIHBhcnNlIGFyZ3VtZW50czogJXNcbiIsIGVycm9y LT5tZXNzYWdlKTsKKyAgICAgICAgZ19lcnJvcl9mcmVlKGVycm9yKTsKKyAgICAgICAgZ19vcHRp b25fY29udGV4dF9mcmVlKGNvbnRleHQpOworICAgICAgICBnX2FycmF5X2ZyZWUob3B0aW9uRW50 cmllc0FycmF5LCBUUlVFKTsKKyAgICAgICAgcmV0dXJuIEZBTFNFOworICAgIH0KKyAgICBnX29w dGlvbl9jb250ZXh0X2ZyZWUoY29udGV4dCk7CisgICAgZ19hcnJheV9mcmVlKG9wdGlvbkVudHJp ZXNBcnJheSwgVFJVRSk7CisgICAgcmV0dXJuIFRSVUU7Cit9CiBpbnQgbWFpbihpbnQgYXJnYywg Y2hhciogYXJndltdKQogewogICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXc7CkBAIC0yNjAsNiAr MzkyLDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIAogICAgIG1haW5fd2lu ZG93ID0gY3JlYXRlV2luZG93KCZ3ZWJWaWV3KTsKIAorICAgIGlmICghcGFyc2VBZGRpdGlvbmFs T3B0aW9ucyh3ZWJWaWV3LCBhcmdjLCBhcmd2KSkKKyAgICAgICAgcmV0dXJuIDE7CisKICAgICBn Y2hhciAqdXJpID0oZ2NoYXIqKShhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5nb29n bGUuY29tLyIpOwogICAgIGdjaGFyICpmaWxlVVJMID0gZmlsZW5hbWVUb1VSTCh1cmkpOwogCg== 97699 2011-06-18 06:00:41 -0700 2011-06-18 06:02:49 -0700 General mechanism for adjusting WebKitWebSettings in GtkLauncher generalPatch8.patch text/plain 7579 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxY2Q1 MWU5Li5mMzk1MGZkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogQWRkZWQgZ2VuZXJhbCBtZWNoYW5pc20gZm9yIGFkanVzdGluZyBXZWJLaXRXZWJTZXR0 aW5ncy4KKyAgICAgICAgKHBhcnNlT3B0aW9uRW50cnlDYWxsYmFjayk6IENhbGxiYWNrIGZvciBw YXJzaW5nIG9wdGlvbiBlbnRyeS4KKyAgICAgICAgKGdldE9wdGlvbkVudHJpZXNGcm9tV2ViS2l0 V2ViU2V0dGluZ3MpOiBCYXNpbmcgb24gdGhlIFdlYktpdFdlYlNldHRpbmdzIHByb3BlcnRpZXMg cHJlcGFyZQorICAgICAgICBsaXN0IG9mIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNm b3JtU3RyaW5nVG9Cb29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBib29sZWFuIGNvbnZl cnRpb24gdXNlZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zv cm1TdHJpbmdUb0ludCk6IFRyYW5zZm9ybSBmdW5jdGlvbiBmb3IgaW50IGNvbnZlcnRpb24gdXNl ZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdU b0Zsb2F0KTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBmbG9hdCBjb252ZXJ0aW9uIHVzZWQgYnkg cGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrLgorICAgICAgICAocGFyc2VBZGRpdGlvbmFsT3B0aW9u cyk6IEhlbHAgZnVuY3Rpb24gcGFyc2luZyBhZGRpdGlvbmFsIGNvbW1hbmRsaW5lIG9wdGlvbnMu CisgICAgICAgIChtYWluKTogQWRkZWQgY2FsbCB0byBwYXJzZUFkZGl0aW9uYWxPcHRpb25zLgor CiAyMDExLTA1LTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBCcmlhbiBXZWluc3RlaW4uCmRpZmYgLS1naXQgYS9Ub29scy9HdGtM YXVuY2hlci9tYWluLmMgYi9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5kZXggYWVhMDE3Zi4u MzNlYzg2ZSAxMDA2NDQKLS0tIGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xz L0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDYsIDIwMDcgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8 YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgTHVrYXN6IFNsYWNoY2lhawog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSw2ICsyNiw4IEBACiAgKi8KIAog I2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDxzdHJp bmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAKIHN0YXRpYyBnaW50IHdpbmRvd0Nv dW50ID0gMDsKQEAgLTIzNiw2ICsyMzksMTM1IEBAIHN0YXRpYyBnY2hhciogZmlsZW5hbWVUb1VS TChjb25zdCBjaGFyKiBmaWxlbmFtZSkKICAgICByZXR1cm4gZmlsZVVSTDsKIH0KIAorZ2Jvb2xl YW4gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwg Y29uc3QgZ2NoYXIgKnZhbHVlLCBncG9pbnRlciBkYXRhLCBHRXJyb3IgKiplcnJvcikKK3sKKyAg ICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSAoV2ViS2l0V2ViU2V0dGluZ3Mg KilkYXRhOworCisgICAgZ19hc3NlcnQod2Via2l0U2V0dGluZ3MpOworCisgICAgaWYgKHN0cmxl bihvcHRpb25OYW1lRnVsbCkgPD0gMikKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgLyog V2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28gcmVtb3ZlIHRoZW0uICovCisgICAgY29u c3QgZ2NoYXIgKm9wdGlvbk5hbWUgPSBvcHRpb25OYW1lRnVsbCArIDI7CisgICAgR1BhcmFtU3Bl YyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNT KHdlYmtpdFNldHRpbmdzKSxvcHRpb25OYW1lKTsKKyAgICBpZiAoIXNwZWMpCisgICAgICAgIHJl dHVybiBGQUxTRTsKKworICAgIC8qIENvbnZlcnQgc3RyaW5nIHRvIHByb3BlciB0eXBlLiAqLwor ICAgIEdWYWx1ZSB2YWx1ZVN0cmluZyA9IHswLCB7ezB9fX07CisgICAgR1ZhbHVlIHZhbHVlUHJv cGVydHkgPSB7MCwge3swfX19OworICAgIGdfdmFsdWVfaW5pdCgmdmFsdWVTdHJpbmcsIEdfVFlQ RV9TVFJJTkcpOworICAgIGdfdmFsdWVfaW5pdCgmdmFsdWVQcm9wZXJ0eSwgR19QQVJBTV9TUEVD X1ZBTFVFX1RZUEUoc3BlYykpOworICAgIGdfdmFsdWVfc2V0X3N0YXRpY19zdHJpbmcoJnZhbHVl U3RyaW5nLCB2YWx1ZSk7CisgICAgaWYgKCFnX3ZhbHVlX3RyYW5zZm9ybSgmdmFsdWVTdHJpbmcs ICZ2YWx1ZVByb3BlcnR5KSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgLyogU2V0IFdl YktpdFdlYlNldHRpbmdzIHByb3BlcnRpZXMuICovCisgICAgZ19vYmplY3Rfc2V0X3Byb3BlcnR5 KEdfT0JKRUNUKHdlYmtpdFNldHRpbmdzKSwgb3B0aW9uTmFtZSwgJnZhbHVlUHJvcGVydHkpOwor CisgICAgcmV0dXJuIFRSVUU7Cit9CisKK3N0YXRpYyBHQXJyYXkqIGdldE9wdGlvbkVudHJpZXNG cm9tV2ViS2l0V2ViU2V0dGluZ3MoV2ViS2l0V2ViU2V0dGluZ3MgKndlYmtpdFNldHRpbmdzKQor eworICAgIEdQYXJhbVNwZWMgKipwcm9wZXJ0eVNwZWNzOworICAgIEdBcnJheSAqb3B0aW9uRW50 cmllc0FycmF5OworICAgIGd1aW50IG51bVByb3BlcnRpZXMsIGk7CisKKyAgICBwcm9wZXJ0eVNw ZWNzID0gZ19vYmplY3RfY2xhc3NfbGlzdF9wcm9wZXJ0aWVzKEdfT0JKRUNUX0dFVF9DTEFTUyh3 ZWJraXRTZXR0aW5ncyksICZudW1Qcm9wZXJ0aWVzKTsKKyAgICBpZiAoIXByb3BlcnR5U3BlY3Mp CisgICAgICAgIHJldHVybiBOVUxMOworCisgICAgb3B0aW9uRW50cmllc0FycmF5ID0gZ19hcnJh eV9uZXcoVFJVRSwgVFJVRSwgc2l6ZW9mKEdPcHRpb25FbnRyeSkpOworICAgIGlmICghb3B0aW9u RW50cmllc0FycmF5KSB7CisgICAgICAgIGdfZnJlZShwcm9wZXJ0eVNwZWNzKTsKKyAgICAgICAg cmV0dXJuIE5VTEw7CisgICAgfQorCisgICAgZm9yIChpID0gMDsgaSA8IG51bVByb3BlcnRpZXM7 IGkrKykgeworICAgICAgICBHUGFyYW1TcGVjICpwYXJhbSA9IHByb3BlcnR5U3BlY3NbaV07CisK KyAgICAgICAgLyogRmlsbCBpbiBzdHJ1Y3R1cmVzIG9ubHkgZm9yIHdyaXRhYmxlIHByb3BlcnRp ZXMuICovCisgICAgICAgIGlmICghcGFyYW0gfHwgIShwYXJhbS0+ZmxhZ3MgJiBHX1BBUkFNX1dS SVRBQkxFKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisJCUdUeXBlIGdQYXJhbVR5cGUgPSBH X1BBUkFNX1NQRUNfVkFMVUVfVFlQRShwYXJhbSk7CisgICAgICAgIGlmIChnUGFyYW1UeXBlID09 IEdfVFlQRV9CT09MRUFOIHx8IGdQYXJhbVR5cGUgPT0gR19UWVBFX1NUUklORyB8fCBnUGFyYW1U eXBlID09IEdfVFlQRV9JTlQKKyAgICAgICAgICAgIHx8IGdQYXJhbVR5cGUgPT0gR19UWVBFX0ZM T0FUKSB7CisgICAgICAgICAgICBHT3B0aW9uRW50cnkgb3B0aW9uRW50cnk7CisgICAgICAgICAg ICBvcHRpb25FbnRyeS5sb25nX25hbWUgPSBnX3BhcmFtX3NwZWNfZ2V0X25hbWUocGFyYW0pOwor ICAgICAgICAgICAgLyogVGhlcmUgaXMgbm8gZWFzeSB3YXkgdG8gZmlndXJlIG91ciBzaG9ydCBu YW1lIGZvciBnZW5lcmF0ZWQgb3B0aW9uIGVudHJpZXMuCisgICAgICAgICAgICAgICBvcHRpb25F bnRyeS5zaG9ydF9uYW1lPSovCisgICAgICAgICAgICAvKiBGb3IgYm9vbCBhcmd1bWVudHMgImVu YWJsZSIgdHlwZSBtYWtlIG9wdGlvbiBhcmd1bWVudCBub3QgcmVxdWlyZWQuICovCisgICAgICAg ICAgICBpZiAoZ1BhcmFtVHlwZSA9PSBHX1RZUEVfQk9PTEVBTiAmJiAoc3Ryc3RyKG9wdGlvbkVu dHJ5LmxvbmdfbmFtZSwgImVuYWJsZSIpKSkKKyAgICAgICAgICAgICAgICBvcHRpb25FbnRyeS5m bGFncyA9IEdfT1BUSU9OX0ZMQUdfT1BUSU9OQUxfQVJHOworICAgICAgICAgICAgb3B0aW9uRW50 cnkuYXJnID0gR19PUFRJT05fQVJHX0NBTExCQUNLOworICAgICAgICAgICAgb3B0aW9uRW50cnku YXJnX2RhdGEgPSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2s7CisgICAgICAgICAgICBvcHRpb25F bnRyeS5kZXNjcmlwdGlvbiA9IGdfcGFyYW1fc3BlY19nZXRfYmx1cmIocGFyYW0pOworICAgICAg ICAgICAgb3B0aW9uRW50cnkuYXJnX2Rlc2NyaXB0aW9uID0gZ190eXBlX25hbWUoZ1BhcmFtVHlw ZSk7CisgICAgICAgICAgICBnX2FycmF5X2FwcGVuZF92YWwob3B0aW9uRW50cmllc0FycmF5LCBv cHRpb25FbnRyeSk7CisgICAgICAgIH0KKyAgICB9CisgICAgZ19mcmVlKHByb3BlcnR5U3BlY3Mp OworCisgICAgcmV0dXJuIG9wdGlvbkVudHJpZXNBcnJheTsKK30KKworc3RhdGljIHZvaWQgdHJh bnNmb3JtU3RyaW5nVG9Cb29sZWFuKGNvbnN0IEdWYWx1ZSAqc3JjVmFsdWUsIEdWYWx1ZSAqZGVz dFZhbHVlKQoreworICAgIGNvbnN0IGNoYXIqIHN0clZhbHVlID0gZ192YWx1ZV9nZXRfc3RyaW5n KHNyY1ZhbHVlKTsKKyAgICBpZiAoc3RyVmFsdWUpIHsKKyAgICAgICAgaWYgKCFnX2FzY2lpX3N0 cmNhc2VjbXAoc3RyVmFsdWUsICJ0cnVlIikgfHwgIXN0cmNtcChzdHJWYWx1ZSwgIjEiKSkKKyAg ICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBUUlVFKTsKKyAgICAgICAg ZWxzZQorICAgICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIEZBTFNFKTsK KyAgICB9IGVsc2UgLyogV2hlbiBubyBvcHRpb24gdmFsdWUgcHJvdmlkZWQsIHNldCAiVFJVRSIg YnkgZGVmYXVsdC4gKi8KKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbihkZXN0VmFsdWUsIFRS VUUpOworfQorCitzdGF0aWMgdm9pZCB0cmFuc2Zvcm1TdHJpbmdUb0ludChjb25zdCBHVmFsdWUg KnNyY1ZhbHVlLCBHVmFsdWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBnX3ZhbHVlX3NldF9pbnQoZGVz dFZhbHVlLCBhdG9pKGdfdmFsdWVfZ2V0X3N0cmluZyhzcmNWYWx1ZSkpKTsKK30KKworc3RhdGlj IHZvaWQgdHJhbnNmb3JtU3RyaW5nVG9GbG9hdChjb25zdCBHVmFsdWUgKnNyY1ZhbHVlLCBHVmFs dWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBnX3ZhbHVlX3NldF9mbG9hdChkZXN0VmFsdWUsIGF0b2Yo Z192YWx1ZV9nZXRfc3RyaW5nKHNyY1ZhbHVlKSkpOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gcGFy c2VBZGRpdGlvbmFsT3B0aW9ucyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBpbnQgYXJnYywgY2hh ciogYXJndltdKQoreworICAgIGdfdmFsdWVfcmVnaXN0ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBF X1NUUklORywgR19UWVBFX0JPT0xFQU4sIHRyYW5zZm9ybVN0cmluZ1RvQm9vbGVhbik7CisgICAg Z192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1fZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfSU5U LCB0cmFuc2Zvcm1TdHJpbmdUb0ludCk7CisgICAgZ192YWx1ZV9yZWdpc3Rlcl90cmFuc2Zvcm1f ZnVuYyhHX1RZUEVfU1RSSU5HLCBHX1RZUEVfRkxPQVQsIHRyYW5zZm9ybVN0cmluZ1RvRmxvYXQp OworCisKKyAgICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X3NldHRpbmdzKHdlYlZpZXcpOworICAgIEdBcnJheSAqb3B0aW9uRW50cmllc0Fy cmF5ID0gZ2V0T3B0aW9uRW50cmllc0Zyb21XZWJLaXRXZWJTZXR0aW5ncyh3ZWJraXRTZXR0aW5n cyk7CisKKyAgICBHT3B0aW9uR3JvdXAgKndlYlNldHRpbmdzR3JvdXAgPSBnX29wdGlvbl9ncm91 cF9uZXcoIndlYnNldHRpbmdzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIldlYktpdFdlYlNldHRpbmdzIHdyaXRhYmxlIHByb3BlcnRp ZXMgZm9yIGRlZmF1bHQgV2ViS2l0V2ViVmlldyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0 aWVzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgd2Via2l0U2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOworICAgIGdfb3B0aW9uX2dyb3VwX2FkZF9lbnRy aWVzKHdlYlNldHRpbmdzR3JvdXAsIChHT3B0aW9uRW50cnkqKSBvcHRpb25FbnRyaWVzQXJyYXkt PmRhdGEpOworCisgICAgR09wdGlvbkNvbnRleHQgKmNvbnRleHQgPSBnX29wdGlvbl9jb250ZXh0 X25ldygiW1VSTF0iKTsKKyAgICBnX29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0LCB3 ZWJTZXR0aW5nc0dyb3VwKTsKKworICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworICAgIGlmICgh Z19vcHRpb25fY29udGV4dF9wYXJzZShjb250ZXh0LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsK KyAgICAgICAgZ19wcmludCgiRmFpbGVkIHRvIHBhcnNlIGFyZ3VtZW50czogJXNcbiIsIGVycm9y LT5tZXNzYWdlKTsKKyAgICAgICAgZ19lcnJvcl9mcmVlKGVycm9yKTsKKyAgICAgICAgZ19vcHRp b25fY29udGV4dF9mcmVlKGNvbnRleHQpOworICAgICAgICBnX2FycmF5X2ZyZWUob3B0aW9uRW50 cmllc0FycmF5LCBUUlVFKTsKKyAgICAgICAgcmV0dXJuIEZBTFNFOworICAgIH0KKyAgICBnX29w dGlvbl9jb250ZXh0X2ZyZWUoY29udGV4dCk7CisgICAgZ19hcnJheV9mcmVlKG9wdGlvbkVudHJp ZXNBcnJheSwgVFJVRSk7CisgICAgcmV0dXJuIFRSVUU7Cit9CiBpbnQgbWFpbihpbnQgYXJnYywg Y2hhciogYXJndltdKQogewogICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXc7CkBAIC0yNjAsNiAr MzkyLDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIAogICAgIG1haW5fd2lu ZG93ID0gY3JlYXRlV2luZG93KCZ3ZWJWaWV3KTsKIAorICAgIGlmICghcGFyc2VBZGRpdGlvbmFs T3B0aW9ucyh3ZWJWaWV3LCBhcmdjLCBhcmd2KSkKKyAgICAgICAgcmV0dXJuIDE7CisKICAgICBn Y2hhciAqdXJpID0oZ2NoYXIqKShhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5nb29n bGUuY29tLyIpOwogICAgIGdjaGFyICpmaWxlVVJMID0gZmlsZW5hbWVUb1VSTCh1cmkpOwogCg== 97700 2011-06-18 06:02:49 -0700 2011-06-20 09:25:33 -0700 General mechanism for adjusting WebKitWebSettings in GtkLauncher generalPatch9.patch text/plain 7586 l.slachciak ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxY2Q1 MWU5Li5mMzk1MGZkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxs LnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbR1RLXSBHZW5lcmFsIG1lY2hhbmlzbSBmb3IgYWRqdXN0aW5nIFdl YktpdFdlYlNldHRpbmdzIGluIEd0a0xhdW5jaGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzMDgKKworICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzogQWRkZWQgZ2VuZXJhbCBtZWNoYW5pc20gZm9yIGFkanVzdGluZyBXZWJLaXRXZWJTZXR0 aW5ncy4KKyAgICAgICAgKHBhcnNlT3B0aW9uRW50cnlDYWxsYmFjayk6IENhbGxiYWNrIGZvciBw YXJzaW5nIG9wdGlvbiBlbnRyeS4KKyAgICAgICAgKGdldE9wdGlvbkVudHJpZXNGcm9tV2ViS2l0 V2ViU2V0dGluZ3MpOiBCYXNpbmcgb24gdGhlIFdlYktpdFdlYlNldHRpbmdzIHByb3BlcnRpZXMg cHJlcGFyZQorICAgICAgICBsaXN0IG9mIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAodHJhbnNm b3JtU3RyaW5nVG9Cb29sZWFuKTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBib29sZWFuIGNvbnZl cnRpb24gdXNlZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zv cm1TdHJpbmdUb0ludCk6IFRyYW5zZm9ybSBmdW5jdGlvbiBmb3IgaW50IGNvbnZlcnRpb24gdXNl ZCBieSBwYXJzZU9wdGlvbkVudHJ5Q2FsbGJhY2suCisgICAgICAgICh0cmFuc2Zvcm1TdHJpbmdU b0Zsb2F0KTogVHJhbnNmb3JtIGZ1bmN0aW9uIGZvciBmbG9hdCBjb252ZXJ0aW9uIHVzZWQgYnkg cGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrLgorICAgICAgICAocGFyc2VBZGRpdGlvbmFsT3B0aW9u cyk6IEhlbHAgZnVuY3Rpb24gcGFyc2luZyBhZGRpdGlvbmFsIGNvbW1hbmRsaW5lIG9wdGlvbnMu CisgICAgICAgIChtYWluKTogQWRkZWQgY2FsbCB0byBwYXJzZUFkZGl0aW9uYWxPcHRpb25zLgor CiAyMDExLTA1LTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBCcmlhbiBXZWluc3RlaW4uCmRpZmYgLS1naXQgYS9Ub29scy9HdGtM YXVuY2hlci9tYWluLmMgYi9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5kZXggYWVhMDE3Zi4u MTllNWJiZSAxMDA2NDQKLS0tIGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xz L0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDYsIDIwMDcgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8 YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgTHVrYXN6IFNsYWNoY2lhawog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSw2ICsyNiw4IEBACiAgKi8KIAog I2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDxzdHJp bmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAKIHN0YXRpYyBnaW50IHdpbmRvd0Nv dW50ID0gMDsKQEAgLTIzNiw2ICsyMzksMTM1IEBAIHN0YXRpYyBnY2hhciogZmlsZW5hbWVUb1VS TChjb25zdCBjaGFyKiBmaWxlbmFtZSkKICAgICByZXR1cm4gZmlsZVVSTDsKIH0KIAorZ2Jvb2xl YW4gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrKGNvbnN0IGdjaGFyICpvcHRpb25OYW1lRnVsbCwg Y29uc3QgZ2NoYXIgKnZhbHVlLCBncG9pbnRlciBkYXRhLCBHRXJyb3IgKiplcnJvcikKK3sKKyAg ICBXZWJLaXRXZWJTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MgPSAoV2ViS2l0V2ViU2V0dGluZ3Mg KilkYXRhOworCisgICAgZ19hc3NlcnQod2Via2l0U2V0dGluZ3MpOworCisgICAgaWYgKHN0cmxl bihvcHRpb25OYW1lRnVsbCkgPD0gMikKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgLyog V2UgaGF2ZSB0d28gLS0gaW4gb3B0aW9uIG5hbWUgc28gcmVtb3ZlIHRoZW0uICovCisgICAgY29u c3QgZ2NoYXIgKm9wdGlvbk5hbWUgPSBvcHRpb25OYW1lRnVsbCArIDI7CisgICAgR1BhcmFtU3Bl YyAqc3BlYyA9IGdfb2JqZWN0X2NsYXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNT KHdlYmtpdFNldHRpbmdzKSwgb3B0aW9uTmFtZSk7CisgICAgaWYgKCFzcGVjKQorICAgICAgICBy ZXR1cm4gRkFMU0U7CisKKyAgICAvKiBDb252ZXJ0IHN0cmluZyB0byBwcm9wZXIgdHlwZS4gKi8K KyAgICBHVmFsdWUgdmFsdWVTdHJpbmcgPSB7MCwge3swfX19OworICAgIEdWYWx1ZSB2YWx1ZVBy b3BlcnR5ID0gezAsIHt7MH19fTsKKyAgICBnX3ZhbHVlX2luaXQoJnZhbHVlU3RyaW5nLCBHX1RZ UEVfU1RSSU5HKTsKKyAgICBnX3ZhbHVlX2luaXQoJnZhbHVlUHJvcGVydHksIEdfUEFSQU1fU1BF Q19WQUxVRV9UWVBFKHNwZWMpKTsKKyAgICBnX3ZhbHVlX3NldF9zdGF0aWNfc3RyaW5nKCZ2YWx1 ZVN0cmluZywgdmFsdWUpOworICAgIGlmICghZ192YWx1ZV90cmFuc2Zvcm0oJnZhbHVlU3RyaW5n LCAmdmFsdWVQcm9wZXJ0eSkpCisgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgIC8qIFNldCBX ZWJLaXRXZWJTZXR0aW5ncyBwcm9wZXJ0aWVzLiAqLworICAgIGdfb2JqZWN0X3NldF9wcm9wZXJ0 eShHX09CSkVDVCh3ZWJraXRTZXR0aW5ncyksIG9wdGlvbk5hbWUsICZ2YWx1ZVByb3BlcnR5KTsK KworICAgIHJldHVybiBUUlVFOworfQorCitzdGF0aWMgR0FycmF5KiBnZXRPcHRpb25FbnRyaWVz RnJvbVdlYktpdFdlYlNldHRpbmdzKFdlYktpdFdlYlNldHRpbmdzICp3ZWJraXRTZXR0aW5ncykK K3sKKyAgICBHUGFyYW1TcGVjICoqcHJvcGVydHlTcGVjczsKKyAgICBHQXJyYXkgKm9wdGlvbkVu dHJpZXNBcnJheTsKKyAgICBndWludCBudW1Qcm9wZXJ0aWVzLCBpOworCisgICAgcHJvcGVydHlT cGVjcyA9IGdfb2JqZWN0X2NsYXNzX2xpc3RfcHJvcGVydGllcyhHX09CSkVDVF9HRVRfQ0xBU1Mo d2Via2l0U2V0dGluZ3MpLCAmbnVtUHJvcGVydGllcyk7CisgICAgaWYgKCFwcm9wZXJ0eVNwZWNz KQorICAgICAgICByZXR1cm4gTlVMTDsKKworICAgIG9wdGlvbkVudHJpZXNBcnJheSA9IGdfYXJy YXlfbmV3KFRSVUUsIFRSVUUsIHNpemVvZihHT3B0aW9uRW50cnkpKTsKKyAgICBpZiAoIW9wdGlv bkVudHJpZXNBcnJheSkgeworICAgICAgICBnX2ZyZWUocHJvcGVydHlTcGVjcyk7CisgICAgICAg IHJldHVybiBOVUxMOworICAgIH0KKworICAgIGZvciAoaSA9IDA7IGkgPCBudW1Qcm9wZXJ0aWVz OyBpKyspIHsKKyAgICAgICAgR1BhcmFtU3BlYyAqcGFyYW0gPSBwcm9wZXJ0eVNwZWNzW2ldOwor CisgICAgICAgIC8qIEZpbGwgaW4gc3RydWN0dXJlcyBvbmx5IGZvciB3cml0YWJsZSBwcm9wZXJ0 aWVzLiAqLworICAgICAgICBpZiAoIXBhcmFtIHx8ICEocGFyYW0tPmZsYWdzICYgR19QQVJBTV9X UklUQUJMRSkpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBHVHlwZSBnUGFyYW1U eXBlID0gR19QQVJBTV9TUEVDX1ZBTFVFX1RZUEUocGFyYW0pOworICAgICAgICBpZiAoZ1BhcmFt VHlwZSA9PSBHX1RZUEVfQk9PTEVBTiB8fCBnUGFyYW1UeXBlID09IEdfVFlQRV9TVFJJTkcgfHwg Z1BhcmFtVHlwZSA9PSBHX1RZUEVfSU5UCisgICAgICAgICAgICB8fCBnUGFyYW1UeXBlID09IEdf VFlQRV9GTE9BVCkgeworICAgICAgICAgICAgR09wdGlvbkVudHJ5IG9wdGlvbkVudHJ5OworICAg ICAgICAgICAgb3B0aW9uRW50cnkubG9uZ19uYW1lID0gZ19wYXJhbV9zcGVjX2dldF9uYW1lKHBh cmFtKTsKKyAgICAgICAgICAgIC8qIFRoZXJlIGlzIG5vIGVhc3kgd2F5IHRvIGZpZ3VyZSBvdXIg c2hvcnQgbmFtZSBmb3IgZ2VuZXJhdGVkIG9wdGlvbiBlbnRyaWVzLgorICAgICAgICAgICAgICAg b3B0aW9uRW50cnkuc2hvcnRfbmFtZT0qLworICAgICAgICAgICAgLyogRm9yIGJvb2wgYXJndW1l bnRzICJlbmFibGUiIHR5cGUgbWFrZSBvcHRpb24gYXJndW1lbnQgbm90IHJlcXVpcmVkLiAqLwor ICAgICAgICAgICAgaWYgKGdQYXJhbVR5cGUgPT0gR19UWVBFX0JPT0xFQU4gJiYgKHN0cnN0cihv cHRpb25FbnRyeS5sb25nX25hbWUsICJlbmFibGUiKSkpCisgICAgICAgICAgICAgICAgb3B0aW9u RW50cnkuZmxhZ3MgPSBHX09QVElPTl9GTEFHX09QVElPTkFMX0FSRzsKKyAgICAgICAgICAgIG9w dGlvbkVudHJ5LmFyZyA9IEdfT1BUSU9OX0FSR19DQUxMQkFDSzsKKyAgICAgICAgICAgIG9wdGlv bkVudHJ5LmFyZ19kYXRhID0gcGFyc2VPcHRpb25FbnRyeUNhbGxiYWNrOworICAgICAgICAgICAg b3B0aW9uRW50cnkuZGVzY3JpcHRpb24gPSBnX3BhcmFtX3NwZWNfZ2V0X2JsdXJiKHBhcmFtKTsK KyAgICAgICAgICAgIG9wdGlvbkVudHJ5LmFyZ19kZXNjcmlwdGlvbiA9IGdfdHlwZV9uYW1lKGdQ YXJhbVR5cGUpOworICAgICAgICAgICAgZ19hcnJheV9hcHBlbmRfdmFsKG9wdGlvbkVudHJpZXNB cnJheSwgb3B0aW9uRW50cnkpOworICAgICAgICB9CisgICAgfQorICAgIGdfZnJlZShwcm9wZXJ0 eVNwZWNzKTsKKworICAgIHJldHVybiBvcHRpb25FbnRyaWVzQXJyYXk7Cit9CisKK3N0YXRpYyB2 b2lkIHRyYW5zZm9ybVN0cmluZ1RvQm9vbGVhbihjb25zdCBHVmFsdWUgKnNyY1ZhbHVlLCBHVmFs dWUgKmRlc3RWYWx1ZSkKK3sKKyAgICBjb25zdCBjaGFyKiBzdHJWYWx1ZSA9IGdfdmFsdWVfZ2V0 X3N0cmluZyhzcmNWYWx1ZSk7CisgICAgaWYgKHN0clZhbHVlKSB7CisgICAgICAgIGlmICghZ19h c2NpaV9zdHJjYXNlY21wKHN0clZhbHVlLCAidHJ1ZSIpIHx8ICFzdHJjbXAoc3RyVmFsdWUsICIx IikpCisgICAgICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKGRlc3RWYWx1ZSwgVFJVRSk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZhbHVlLCBG QUxTRSk7CisgICAgfSBlbHNlIC8qIFdoZW4gbm8gb3B0aW9uIHZhbHVlIHByb3ZpZGVkLCBzZXQg IlRSVUUiIGJ5IGRlZmF1bHQuICovCisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4oZGVzdFZh bHVlLCBUUlVFKTsKK30KKworc3RhdGljIHZvaWQgdHJhbnNmb3JtU3RyaW5nVG9JbnQoY29uc3Qg R1ZhbHVlICpzcmNWYWx1ZSwgR1ZhbHVlICpkZXN0VmFsdWUpCit7CisgICAgZ192YWx1ZV9zZXRf aW50KGRlc3RWYWx1ZSwgYXRvaShnX3ZhbHVlX2dldF9zdHJpbmcoc3JjVmFsdWUpKSk7Cit9CisK K3N0YXRpYyB2b2lkIHRyYW5zZm9ybVN0cmluZ1RvRmxvYXQoY29uc3QgR1ZhbHVlICpzcmNWYWx1 ZSwgR1ZhbHVlICpkZXN0VmFsdWUpCit7CisgICAgZ192YWx1ZV9zZXRfZmxvYXQoZGVzdFZhbHVl LCBhdG9mKGdfdmFsdWVfZ2V0X3N0cmluZyhzcmNWYWx1ZSkpKTsKK30KKworc3RhdGljIGdib29s ZWFuIHBhcnNlQWRkaXRpb25hbE9wdGlvbnMoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgaW50IGFy Z2MsIGNoYXIqIGFyZ3ZbXSkKK3sKKyAgICBnX3ZhbHVlX3JlZ2lzdGVyX3RyYW5zZm9ybV9mdW5j KEdfVFlQRV9TVFJJTkcsIEdfVFlQRV9CT09MRUFOLCB0cmFuc2Zvcm1TdHJpbmdUb0Jvb2xlYW4p OworICAgIGdfdmFsdWVfcmVnaXN0ZXJfdHJhbnNmb3JtX2Z1bmMoR19UWVBFX1NUUklORywgR19U WVBFX0lOVCwgdHJhbnNmb3JtU3RyaW5nVG9JbnQpOworICAgIGdfdmFsdWVfcmVnaXN0ZXJfdHJh bnNmb3JtX2Z1bmMoR19UWVBFX1NUUklORywgR19UWVBFX0ZMT0FULCB0cmFuc2Zvcm1TdHJpbmdU b0Zsb2F0KTsKKworCisgICAgV2ViS2l0V2ViU2V0dGluZ3MgKndlYmtpdFNldHRpbmdzID0gd2Vi a2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh3ZWJWaWV3KTsKKyAgICBHQXJyYXkgKm9wdGlvbkVu dHJpZXNBcnJheSA9IGdldE9wdGlvbkVudHJpZXNGcm9tV2ViS2l0V2ViU2V0dGluZ3Mod2Via2l0 U2V0dGluZ3MpOworCisgICAgR09wdGlvbkdyb3VwICp3ZWJTZXR0aW5nc0dyb3VwID0gZ19vcHRp b25fZ3JvdXBfbmV3KCJ3ZWJzZXR0aW5ncyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXZWJLaXRXZWJTZXR0aW5ncyB3cml0YWJsZSBw cm9wZXJ0aWVzIGZvciBkZWZhdWx0IFdlYktpdFdlYlZpZXciLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiV2ViS2l0V2ViU2V0dGluZ3Mg cHJvcGVydGllcyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHdlYmtpdFNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKKyAgICBnX29wdGlvbl9ncm91cF9h ZGRfZW50cmllcyh3ZWJTZXR0aW5nc0dyb3VwLCAoR09wdGlvbkVudHJ5Kikgb3B0aW9uRW50cmll c0FycmF5LT5kYXRhKTsKKworICAgIEdPcHRpb25Db250ZXh0ICpjb250ZXh0ID0gZ19vcHRpb25f Y29udGV4dF9uZXcoIltVUkxdIik7CisgICAgZ19vcHRpb25fY29udGV4dF9hZGRfZ3JvdXAoY29u dGV4dCwgd2ViU2V0dGluZ3NHcm91cCk7CisKKyAgICBHRXJyb3IgKmVycm9yID0gTlVMTDsKKyAg ICBpZiAoIWdfb3B0aW9uX2NvbnRleHRfcGFyc2UoY29udGV4dCwgJmFyZ2MsICZhcmd2LCAmZXJy b3IpKSB7CisgICAgICAgIGdfcHJpbnQoIkZhaWxlZCB0byBwYXJzZSBhcmd1bWVudHM6ICVzXG4i LCBlcnJvci0+bWVzc2FnZSk7CisgICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7CisgICAgICAg IGdfb3B0aW9uX2NvbnRleHRfZnJlZShjb250ZXh0KTsKKyAgICAgICAgZ19hcnJheV9mcmVlKG9w dGlvbkVudHJpZXNBcnJheSwgVFJVRSk7CisgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICB9Cisg ICAgZ19vcHRpb25fY29udGV4dF9mcmVlKGNvbnRleHQpOworICAgIGdfYXJyYXlfZnJlZShvcHRp b25FbnRyaWVzQXJyYXksIFRSVUUpOworICAgIHJldHVybiBUUlVFOworfQogaW50IG1haW4oaW50 IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIHsKICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3OwpAQCAt MjYwLDYgKzM5Miw5IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAKICAgICBt YWluX3dpbmRvdyA9IGNyZWF0ZVdpbmRvdygmd2ViVmlldyk7CiAKKyAgICBpZiAoIXBhcnNlQWRk aXRpb25hbE9wdGlvbnMod2ViVmlldywgYXJnYywgYXJndikpCisgICAgICAgIHJldHVybiAxOwor CiAgICAgZ2NoYXIgKnVyaSA9KGdjaGFyKikoYXJnYyA+IDEgPyBhcmd2WzFdIDogImh0dHA6Ly93 d3cuZ29vZ2xlLmNvbS8iKTsKICAgICBnY2hhciAqZmlsZVVSTCA9IGZpbGVuYW1lVG9VUkwodXJp KTsKIAo=