16042 2007-11-18 14:19:49 -0800 [GTK] Eliminate webkit_init() 2007-12-17 12:56:11 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All All RESOLVED FIXED Gtk P2 Normal --- 1 alp webkit-unassigned christian xan.lopez oldest_to_newest 61591 0 alp 2007-11-18 14:19:49 -0800 webkit_init() goes against our API goals of keeping things simple and following conventions set by existing widgets. Initialisation of the WebKit framework should be done behind the scenes. There's nothing here that can't be initialised as-needed AFAICT, except for threading, due to a bug (which I don't think has been reported yet). webkitgtkglobal.cpp: void webkit_init(void) { WebCore::InitializeLoggingChannelsIfNecessary(); WebCore::initializeThreading(); #if ENABLE(DATABASE) // FIXME: It should be possible for client applications to override this default location gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL); WebCore::DatabaseTracker::tracker().setDatabasePath(databaseDirectory); g_free(databaseDirectory); #endif } 64093 1 17875 jasuarez 2007-12-13 11:07:26 -0800 Created attachment 17875 Move webkit initalization to WebView class initialization This patch moves the initialization code to Gtk WebView class initialization, in a similar way as the other ports do it. 64138 2 17889 jasuarez 2007-12-14 02:03:29 -0800 Created attachment 17889 Move webkit initalization to WebView class initialization This patch drops webkit_init from main, which in previous patch was commented. 64150 3 alp 2007-12-14 04:24:36 -0800 (In reply to comment #2) > Created an attachment (id=17889) [edit] > Move webkit initalization to WebView class initialization > > This patch drops webkit_init from main, which in previous patch was commented. > Looks good. Two things to consider. Do we want to keep around the entry point for a while as a g_warning() no-op? We might want to consider creating a small deprecation cycle here since the last API changes left some users upset. Do we want to keep the static initialisation code in a private function so it can be called by other initialisers so it's easier to call when we add non-visual View/Frame classes? Just thinking out loud. Any thoughts? Thanks for the patch. 64153 4 jasuarez 2007-12-14 07:09:33 -0800 (In reply to comment #3) > Do we want to keep around the entry point for a while as a g_warning() no-op? > We might want to consider creating a small deprecation cycle here since the > last API changes left some users upset. Is there any "way" to put a function in deprecated mode? You're right that dropping webkit_init function from api may upset some users. > > Do we want to keep the static initialisation code in a private function so it > can be called by other initialisers so it's easier to call when we add > non-visual View/Frame classes? It looks good for me having a private initialization function. Mainly to init database paths, as at least in other ports it is in a different function. 64247 5 17889 alp 2007-12-15 01:24:33 -0800 Comment on attachment 17889 Move webkit initalization to WebView class initialization This is good, but please move the initialization function to webkitprivate.h so it can be re-used by other _class_inits if necessary. 64293 6 xan.lopez 2007-12-15 06:44:01 -0800 Just a quick remark: AFAIK class_init can be called several times in a normal program; according to the docs when the last instance of a class is destroyed its class data is destroyed too, so the next instantiation would re-create the class and thus call class_init again. (Probably doing a testcase would be the best idea here :)) Anyway, it's probably good to ensure that the initialization will be only done the first time, and not always. 64552 7 17889 alp 2007-12-17 12:49:59 -0800 Comment on attachment 17889 Move webkit initalization to WebView class initialization OK with the minor changes discussed. 64555 8 alp 2007-12-17 12:56:11 -0800 Landed in r28818. 17875 2007-12-13 11:07:26 -0800 2007-12-14 02:03:29 -0800 Move webkit initalization to WebView class initialization remove_webkit_init.patch text/plain 8760 jasuarez SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODY4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDctMTItMTMgIEp1YW4gQS4gU3VhcmV6IFJvbWVybyAgPGphc3Vh cmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNDIKKyAg ICAgICAgW0dUS10gRWxpbWluYXRlIHdlYmtpdF9pbml0KCkKKworICAgICAgICBNb3Zpbmcgd2Vi a2l0IGluaXRpYWxpemF0aW9uIHRvIFdlYlZpZXcgY2xhc3MgaW5pdC4KKworICAgICAgICBXQVJO SU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIFdlYkNvcmUu cHJvOgorCiAyMDA3LTEyLTEzICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBCdWlsZCBmaXgKSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gMjg2ODcpCisrKyBXZWJDb3JlL1dlYkNv cmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC05NDYsNyArOTQ2LDYgQEAgZ3RrLXBvcnQgewogICAg ICAgICAuLi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9DbGlwYm9hcmRHdGsuaCBcCiAgICAgICAgIC4u L1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXQuaCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2Vi Vmlldy93ZWJraXRkZWZpbmVzLmggXAotICAgICAgICAuLi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Vi a2l0Z2xvYmFsLmggXAogICAgICAgICAuLi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0bmV0d29y a3JlcXVlc3QuaCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2YXRl LmggXAogICAgICAgICAuLi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0c2V0dGluZ3MuaCBcCkBA IC0xMDIyLDcgKzEwMjEsNiBAQCBndGstcG9ydCB7CiAgICAgICAgIHBsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL2JtcC9CTVBJbWFnZURlY29kZXIuY3BwIFwKICAgICAgICAgcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvaWNvL0lDT0ltYWdlRGVjb2Rlci5jcHAgXAogICAgICAgICBwbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy94Ym0vWEJNSW1hZ2VEZWNvZGVyLmNwcCBcCi0gICAgICAgIC4uL1dlYktpdC9n dGsvV2ViVmlldy93ZWJraXRnbG9iYWwuY3BwIFwKICAgICAgICAgLi4vV2ViS2l0L2d0ay9XZWJW aWV3L3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmNwcCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2Vi Vmlldy93ZWJraXRwcml2YXRlLmNwcCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93 ZWJraXRzZXR0aW5ncy5jcHAgXApJbmRleDogV2ViS2l0L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4Njg3KQorKysgV2ViS2l0L2d0 ay9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAwNy0xMi0xMyAg SnVhbiBBLiBTdWFyZXogUm9tZXJvICA8amFzdWFyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA0MgorICAgICAgICBbR1RLXSBFbGltaW5hdGUgd2Via2l0 X2luaXQoKQorCisgICAgICAgIE1vdmluZyB3ZWJraXQgaW5pdGlhbGl6YXRpb24gdG8gV2ViVmll dyBjbGFzcyBpbml0LgorCisgICAgICAgICogV2ViVmlldy9oZWFkZXJzLnByaToKKyAgICAgICAg KiBXZWJWaWV3L3dlYmtpdC5oOgorICAgICAgICAqIFdlYlZpZXcvd2Via2l0Z2xvYmFsLmNwcDog UmVtb3ZlZC4KKyAgICAgICAgKiBXZWJWaWV3L3dlYmtpdGdsb2JhbC5oOiBSZW1vdmVkLgorICAg ICAgICAqIFdlYlZpZXcvd2Via2l0d2Vidmlldy5jcHA6CisKIDIwMDctMTItMTIgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWlu aWcKSW5kZXg6IFdlYktpdC9ndGsvV2ViVmlldy9oZWFkZXJzLnByaQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvZ3RrL1dlYlZpZXcvaGVhZGVycy5wcmkJKHJldmlzaW9uIDI4Njg3KQorKysgV2ViS2l0 L2d0ay9XZWJWaWV3L2hlYWRlcnMucHJpCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNSBAQAog V0VCS0lUX0FQSV9IRUFERVJTID0gJCRQV0Qvd2Via2l0LmggXAogICAgICAgICAgICAgICAgICAg ICAgJCRQV0Qvd2Via2l0ZGVmaW5lcy5oIFwKLSAgICAgICAgICAgICAgICAgICAgICQkUFdEL3dl YmtpdGdsb2JhbC5oIFwKICAgICAgICAgICAgICAgICAgICAgICQkUFdEL3dlYmtpdG5ldHdvcmty ZXF1ZXN0LmggXAogICAgICAgICAgICAgICAgICAgICAgJCRQV0Qvd2Via2l0d2ViZnJhbWUuaCBc CiAgICAgICAgICAgICAgICAgICAgICAkJFBXRC93ZWJraXR3ZWJ2aWV3LmgKSW5kZXg6IFdlYktp dC9ndGsvV2ViVmlldy93ZWJraXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcv d2Via2l0LmgJKHJldmlzaW9uIDI4Njg3KQorKysgV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdC5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsyMSw2IEBACiAjZGVmaW5lIF9fV0VCS0lUX0hfXwog CiAjaW5jbHVkZSA8d2Via2l0ZGVmaW5lcy5oPgotI2luY2x1ZGUgPHdlYmtpdGdsb2JhbC5oPgog I2luY2x1ZGUgPHdlYmtpdG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0d2ViZnJh bWUuaD4KICNpbmNsdWRlIDx3ZWJraXR3ZWJ2aWV3Lmg+CkluZGV4OiBXZWJLaXQvZ3RrL1dlYlZp ZXcvd2Via2l0Z2xvYmFsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Vi a2l0Z2xvYmFsLmNwcAkocmV2aXNpb24gMjg2ODcpCisrKyBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Vi a2l0Z2xvYmFsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw0MiArMCwwIEBACi0vKgotICogQ29w eXJpZ2h0IChDKSAyMDA3IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCi0gKgotICogVGhpcyBs aWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgot ICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQ dWJsaWMKLSAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb247IGVpdGhlcgotICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBv cHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJVEhPVVQg QU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKLSAqIE1F UkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0 aGUgR05VCi0gKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KLSAqCi0gKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsg c2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhlIEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9v ciwKLSAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgotICovCi0KLSNpbmNsdWRlICJjb25m aWcuaCIKLSNpbmNsdWRlICJ3ZWJraXRnbG9iYWwuaCIKLQotI2luY2x1ZGUgIkxvZ2dpbmcuaCIK LSNpbmNsdWRlICJEYXRhYmFzZVRyYWNrZXIuaCIKLQotI2luY2x1ZGUgPGdsaWIuaD4KLQotZXh0 ZXJuICJDIiB7Ci12b2lkIHdlYmtpdF9pbml0KHZvaWQpCi17Ci0gICAgV2ViQ29yZTo6SW5pdGlh bGl6ZUxvZ2dpbmdDaGFubmVsc0lmTmVjZXNzYXJ5KCk7Ci0KLSAgICBXZWJDb3JlOjppbml0aWFs aXplVGhyZWFkaW5nKCk7Ci0KLSNpZiBFTkFCTEUoREFUQUJBU0UpCi0gICAgLy8gRklYTUU6IEl0 IHNob3VsZCBiZSBwb3NzaWJsZSBmb3IgY2xpZW50IGFwcGxpY2F0aW9ucyB0byBvdmVycmlkZSB0 aGlzIGRlZmF1bHQgbG9jYXRpb24KLSAgICBnY2hhciogZGF0YWJhc2VEaXJlY3RvcnkgPSBnX2J1 aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfZGF0YV9kaXIoKSwgIndlYmtpdCIsICJkYXRhYmFzZXMi LCBOVUxMKTsKLSAgICBXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zZXREYXRh YmFzZVBhdGgoZGF0YWJhc2VEaXJlY3RvcnkpOwotICAgIGdfZnJlZShkYXRhYmFzZURpcmVjdG9y eSk7Ci0jZW5kaWYKLX0KLX0KSW5kZXg6IFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXRnbG9iYWwu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFsLmgJKHJldmlz aW9uIDI4Njg3KQorKysgV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdGdsb2JhbC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMyICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgSG9sZ2Vy IEhhbnMgUGV0ZXIgRnJleXRoZXIKLSAqCi0gKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhl IHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhcyBw dWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCi0gKiB2ZXJz aW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNp b24uCi0gKgotICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQg aXQgd2lsbCBiZSB1c2VmdWwsCi0gKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQg ZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgotICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKLSAqIExpYnJhcnkgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgotICoKLSAqIFlvdSBzaG91bGQg aGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExp Y2Vuc2UKLSAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5M SUIuICBJZiBub3QsIHdyaXRlIHRvCi0gKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ bmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAotICogQm9zdG9uLCBNQSAwMjEx MC0xMzAxLCBVU0EuCi0gKi8KLQotI2lmbmRlZiBXRUJLSVRfR0xPQkFMX0gKLSNkZWZpbmUgV0VC S0lUX0dMT0JBTF9ICi0KLSNpbmNsdWRlICJ3ZWJraXRkZWZpbmVzLmgiCi0KLUdfQkVHSU5fREVD TFMKLQotV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfaW5pdCAodm9pZCk7Ci0KLUdfRU5EX0RFQ0xT Ci0KLSNlbmRpZgpJbmRleDogV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcAkocmV2aXNp b24gMjg2ODcpCisrKyBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU0LDYgKzU0LDkgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQu aCIKICNpbmNsdWRlICJTdWJzdGl0dXRlRGF0YS5oIgogCisjaW5jbHVkZSAiTG9nZ2luZy5oIgor I2luY2x1ZGUgIkRhdGFiYXNlVHJhY2tlci5oIgorCiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMu aD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTQ0Myw2ICs0NDYsMTYgQEAgc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoVwogewogICAgIEd0a0JpbmRpbmdTZXQq IGJpbmRpbmdfc2V0OwogCisgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZVRocmVhZGluZygpOworICAg IFdlYkNvcmU6OkluaXRpYWxpemVMb2dnaW5nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOworCisjaWYg RU5BQkxFKERBVEFCQVNFKQorICAgIC8vIEZJWE1FOiBJdCBzaG91bGQgYmUgcG9zc2libGUgZm9y IGNsaWVudCBhcHBsaWNhdGlvbnMgdG8gb3ZlcnJpZGUgdGhpcyBkZWZhdWx0IGxvY2F0aW9uCisg ICAgZ2NoYXIqIGRhdGFiYXNlRGlyZWN0b3J5ID0gZ19idWlsZF9maWxlbmFtZShnX2dldF91c2Vy X2RhdGFfZGlyKCksICJ3ZWJraXQiLCAiZGF0YWJhc2VzIiwgTlVMTCk7CisgICAgV2ViQ29yZTo6 RGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuc2V0RGF0YWJhc2VQYXRoKGRhdGFiYXNlRGlyZWN0 b3J5KTsKKyAgICBnX2ZyZWUoZGF0YWJhc2VEaXJlY3RvcnkpOworI2VuZGlmCisgICAgCiAgICAg Z190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFzcywgc2l6ZW9mKFdlYktpdFdlYlZp ZXdQcml2YXRlKSk7CiAKICAgICAvKgpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjg2ODcpCisrKyBXZWJL aXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwNy0x Mi0xMyAgSnVhbiBBLiBTdWFyZXogUm9tZXJvICA8amFzdWFyZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA0MgorICAgICAgICBbR1RLXSBFbGltaW5hdGUg d2Via2l0X2luaXQoKQorCisgICAgICAgIE1vdmluZyB3ZWJraXQgaW5pdGlhbGl6YXRpb24gdG8g V2ViVmlldyBjbGFzcyBpbml0LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBS ZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIEd0a0xhdW5jaGVyL21h aW4uYzoKKyAgICAgICAgKG1haW4pOgorCiAyMDA3LTEyLTExICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtLgpJbmRleDogV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCShy ZXZpc2lvbiAyODY4NykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNyw3ICsyMzcsNiBAQCBpbnQgbWFpbihp bnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICB9CiAKICAgICBndGtfaW5pdCgmYXJnYywg JmFyZ3YpOwotICAgIHdlYmtpdF9pbml0KCk7CiAKICAgICB2aWV3ID0gV0VCS0lUX1dFQl9WSUVX KHdlYmtpdF93ZWJfdmlld19uZXcoKSk7CiAgICAgbWFpbkZyYW1lID0gd2Via2l0X3dlYl92aWV3 X2dldF9tYWluX2ZyYW1lKHZpZXcpOwpJbmRleDogV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFp bi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwkocmV2aXNp b24gMjg2ODcpCisrKyBXZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMJKHdvcmtpbmcgY29w eSkKQEAgLTE3Niw3ICsxNzYsNyBAQCBpbnQKIG1haW4gKGludCBhcmdjLCBjaGFyKiBhcmd2W10p CiB7CiAgICAgZ3RrX2luaXQgKCZhcmdjLCAmYXJndik7Ci0gICAgd2Via2l0X2luaXQgKCk7Cisv KiAgICAgd2Via2l0X2luaXQgKCk7ICovCiAKICAgICBHdGtXaWRnZXQqIHZib3ggPSBndGtfdmJv eF9uZXcgKEZBTFNFLCAwKTsKICAgICBndGtfYm94X3BhY2tfc3RhcnQgKEdUS19CT1ggKHZib3gp LCBjcmVhdGVfdG9vbGJhciAoKSwgRkFMU0UsIEZBTFNFLCAwKTsK 17889 2007-12-14 02:03:29 -0800 2007-12-17 12:49:59 -0800 Move webkit initalization to WebView class initialization remove_webkit_init_v2.patch text/plain 8780 jasuarez SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODcxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDctMTItMTQgIEp1YW4gQS4gU3VhcmV6IFJvbWVybyAgPGphc3Vh cmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNDIKKyAg ICAgICAgW0dUS10gRWxpbWluYXRlIHdlYmtpdF9pbml0KCkKKworICAgICAgICBNb3Zpbmcgd2Vi a2l0IGluaXRpYWxpemF0aW9uIHRvIFdlYlZpZXcgY2xhc3MgaW5pdC4KKworICAgICAgICBXQVJO SU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIFdlYkNvcmUu cHJvOgorCiAyMDA3LTEyLTEzICBBbHAgVG9rZXIgIDxhbHBAYXRva2VyLmNvbT4KIAogICAgICAg ICBjdXJsIGJhY2tlbmQgYnVpbGQgZml4IGZvciBicmVha2FnZSBpbnRyb2R1Y2VkIGluIHIyODcw OS4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJD b3JlLnBybwkocmV2aXNpb24gMjg3MTEpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5n IGNvcHkpCkBAIC05NDYsNyArOTQ2LDYgQEAgZ3RrLXBvcnQgewogICAgICAgICAuLi9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9DbGlwYm9hcmRHdGsuaCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2Vi Vmlldy93ZWJraXQuaCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRkZWZp bmVzLmggXAotICAgICAgICAuLi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFsLmggXAog ICAgICAgICAuLi9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0bmV0d29ya3JlcXVlc3QuaCBcCiAg ICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2YXRlLmggXAogICAgICAgICAu Li9XZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0c2V0dGluZ3MuaCBcCkBAIC0xMDIyLDcgKzEwMjEs NiBAQCBndGstcG9ydCB7CiAgICAgICAgIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2JtcC9CTVBJ bWFnZURlY29kZXIuY3BwIFwKICAgICAgICAgcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvaWNvL0lD T0ltYWdlRGVjb2Rlci5jcHAgXAogICAgICAgICBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy94Ym0v WEJNSW1hZ2VEZWNvZGVyLmNwcCBcCi0gICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJr aXRnbG9iYWwuY3BwIFwKICAgICAgICAgLi4vV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdG5ldHdv cmtyZXF1ZXN0LmNwcCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRwcml2 YXRlLmNwcCBcCiAgICAgICAgIC4uL1dlYktpdC9ndGsvV2ViVmlldy93ZWJraXRzZXR0aW5ncy5j cHAgXApJbmRleDogV2ViS2l0L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0 ay9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NzExKQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAwNy0xMi0xNCAgSnVhbiBBLiBTdWFyZXog Um9tZXJvICA8amFzdWFyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjA0MgorICAgICAgICBbR1RLXSBFbGltaW5hdGUgd2Via2l0X2luaXQoKQorCisgICAg ICAgIE1vdmluZyB3ZWJraXQgaW5pdGlhbGl6YXRpb24gdG8gV2ViVmlldyBjbGFzcyBpbml0Lgor CisgICAgICAgICogV2ViVmlldy9oZWFkZXJzLnByaToKKyAgICAgICAgKiBXZWJWaWV3L3dlYmtp dC5oOgorICAgICAgICAqIFdlYlZpZXcvd2Via2l0Z2xvYmFsLmNwcDogUmVtb3ZlZC4KKyAgICAg ICAgKiBXZWJWaWV3L3dlYmtpdGdsb2JhbC5oOiBSZW1vdmVkLgorICAgICAgICAqIFdlYlZpZXcv d2Via2l0d2Vidmlldy5jcHA6CisKIDIwMDctMTItMTIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcKSW5kZXg6IFdlYktp dC9ndGsvV2ViVmlldy9oZWFkZXJzLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZp ZXcvaGVhZGVycy5wcmkJKHJldmlzaW9uIDI4NzExKQorKysgV2ViS2l0L2d0ay9XZWJWaWV3L2hl YWRlcnMucHJpCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNSBAQAogV0VCS0lUX0FQSV9IRUFE RVJTID0gJCRQV0Qvd2Via2l0LmggXAogICAgICAgICAgICAgICAgICAgICAgJCRQV0Qvd2Via2l0 ZGVmaW5lcy5oIFwKLSAgICAgICAgICAgICAgICAgICAgICQkUFdEL3dlYmtpdGdsb2JhbC5oIFwK ICAgICAgICAgICAgICAgICAgICAgICQkUFdEL3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmggXAogICAg ICAgICAgICAgICAgICAgICAgJCRQV0Qvd2Via2l0d2ViZnJhbWUuaCBcCiAgICAgICAgICAgICAg ICAgICAgICAkJFBXRC93ZWJraXR3ZWJ2aWV3LmgKSW5kZXg6IFdlYktpdC9ndGsvV2ViVmlldy93 ZWJraXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0LmgJKHJldmlz aW9uIDI4NzExKQorKysgV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdC5oCSh3b3JraW5nIGNvcHkp CkBAIC0yMSw3ICsyMSw2IEBACiAjZGVmaW5lIF9fV0VCS0lUX0hfXwogCiAjaW5jbHVkZSA8d2Vi a2l0ZGVmaW5lcy5oPgotI2luY2x1ZGUgPHdlYmtpdGdsb2JhbC5oPgogI2luY2x1ZGUgPHdlYmtp dG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0d2ViZnJhbWUuaD4KICNpbmNsdWRl IDx3ZWJraXR3ZWJ2aWV3Lmg+CkluZGV4OiBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFsLmNwcAko cmV2aXNpb24gMjg3MTEpCisrKyBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw0MiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA3 IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCi0gKgotICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUg c29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgotICogbW9kaWZ5IGl0IHVu ZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKLSAqIExpY2Vu c2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgot ICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRl ciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9w ZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKLSAqIE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCi0gKiBMaWJy YXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KLSAqCi0gKiBZb3Ug c2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENP UFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKLSAqIEJvc3Rvbiwg TUEgMDIxMTAtMTMwMSwgVVNBLgotICovCi0KLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRl ICJ3ZWJraXRnbG9iYWwuaCIKLQotI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNsdWRlICJEYXRh YmFzZVRyYWNrZXIuaCIKLQotI2luY2x1ZGUgPGdsaWIuaD4KLQotZXh0ZXJuICJDIiB7Ci12b2lk IHdlYmtpdF9pbml0KHZvaWQpCi17Ci0gICAgV2ViQ29yZTo6SW5pdGlhbGl6ZUxvZ2dpbmdDaGFu bmVsc0lmTmVjZXNzYXJ5KCk7Ci0KLSAgICBXZWJDb3JlOjppbml0aWFsaXplVGhyZWFkaW5nKCk7 Ci0KLSNpZiBFTkFCTEUoREFUQUJBU0UpCi0gICAgLy8gRklYTUU6IEl0IHNob3VsZCBiZSBwb3Nz aWJsZSBmb3IgY2xpZW50IGFwcGxpY2F0aW9ucyB0byBvdmVycmlkZSB0aGlzIGRlZmF1bHQgbG9j YXRpb24KLSAgICBnY2hhciogZGF0YWJhc2VEaXJlY3RvcnkgPSBnX2J1aWxkX2ZpbGVuYW1lKGdf Z2V0X3VzZXJfZGF0YV9kaXIoKSwgIndlYmtpdCIsICJkYXRhYmFzZXMiLCBOVUxMKTsKLSAgICBX ZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zZXREYXRhYmFzZVBhdGgoZGF0YWJh c2VEaXJlY3RvcnkpOwotICAgIGdfZnJlZShkYXRhYmFzZURpcmVjdG9yeSk7Ci0jZW5kaWYKLX0K LX0KSW5kZXg6IFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXRnbG9iYWwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0Z2xvYmFsLmgJKHJldmlzaW9uIDI4NzExKQorKysg V2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdGdsb2JhbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMy ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJl eXRoZXIKLSAqCi0gKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp c3RyaWJ1dGUgaXQgYW5kL29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhl IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCi0gKiB2ZXJzaW9uIDIgb2YgdGhlIExp Y2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCi0gKgotICogVGhp cyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2Vm dWwsCi0gKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGll ZCB3YXJyYW50eSBvZgotICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKLSAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgotICoKLSAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBh IGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKLSAqIGFsb25n IHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdy aXRlIHRvCi0gKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xp biBTdHJlZXQsIEZpZnRoIEZsb29yLAotICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCi0g Ki8KLQotI2lmbmRlZiBXRUJLSVRfR0xPQkFMX0gKLSNkZWZpbmUgV0VCS0lUX0dMT0JBTF9ICi0K LSNpbmNsdWRlICJ3ZWJraXRkZWZpbmVzLmgiCi0KLUdfQkVHSU5fREVDTFMKLQotV0VCS0lUX0FQ SSB2b2lkCi13ZWJraXRfaW5pdCAodm9pZCk7Ci0KLUdfRU5EX0RFQ0xTCi0KLSNlbmRpZgpJbmRl eDogV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcAkocmV2aXNpb24gMjg3MTEpCisrKyBX ZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0 LDYgKzU0LDkgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJT dWJzdGl0dXRlRGF0YS5oIgogCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIkRhdGFi YXNlVHJhY2tlci5oIgorCiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KIAogdXNpbmcgbmFt ZXNwYWNlIFdlYktpdDsKQEAgLTQ0Myw2ICs0NDYsMTYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X2NsYXNzX2luaXQoVwogewogICAgIEd0a0JpbmRpbmdTZXQqIGJpbmRpbmdfc2V0Owog CisgICAgV2ViQ29yZTo6aW5pdGlhbGl6ZVRocmVhZGluZygpOworICAgIFdlYkNvcmU6OkluaXRp YWxpemVMb2dnaW5nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOworCisjaWYgRU5BQkxFKERBVEFCQVNF KQorICAgIC8vIEZJWE1FOiBJdCBzaG91bGQgYmUgcG9zc2libGUgZm9yIGNsaWVudCBhcHBsaWNh dGlvbnMgdG8gb3ZlcnJpZGUgdGhpcyBkZWZhdWx0IGxvY2F0aW9uCisgICAgZ2NoYXIqIGRhdGFi YXNlRGlyZWN0b3J5ID0gZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFfZGlyKCksICJ3 ZWJraXQiLCAiZGF0YWJhc2VzIiwgTlVMTCk7CisgICAgV2ViQ29yZTo6RGF0YWJhc2VUcmFja2Vy Ojp0cmFja2VyKCkuc2V0RGF0YWJhc2VQYXRoKGRhdGFiYXNlRGlyZWN0b3J5KTsKKyAgICBnX2Zy ZWUoZGF0YWJhc2VEaXJlY3RvcnkpOworI2VuZGlmCisgICAgCiAgICAgZ190eXBlX2NsYXNzX2Fk ZF9wcml2YXRlKHdlYlZpZXdDbGFzcywgc2l6ZW9mKFdlYktpdFdlYlZpZXdQcml2YXRlKSk7CiAK ICAgICAvKgpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjg3MTEpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwNy0xMi0xNCAgSnVhbiBBLiBT dWFyZXogUm9tZXJvICA8amFzdWFyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjA0MgorICAgICAgICBbR1RLXSBFbGltaW5hdGUgd2Via2l0X2luaXQoKQor CisgICAgICAgIE1vdmluZyB3ZWJraXQgaW5pdGlhbGl6YXRpb24gdG8gV2ViVmlldyBjbGFzcyBp bml0LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoK KyAgICAgICAgKG1haW4pOgorICAgICAgICAqIEd0a0xhdW5jaGVyL21haW4uYzoKKyAgICAgICAg KG1haW4pOgorCiAyMDA3LTEyLTEzICBLZXZpbiBNY0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0uCkluZGV4OiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAJKHJldmlzaW9uIDI4 NzExKQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM3LDcgKzIzNyw2IEBAIGludCBtYWluKGludCBhcmdjLCBj aGFyKiBhcmd2W10pCiAgICAgICAgIH0KIAogICAgIGd0a19pbml0KCZhcmdjLCAmYXJndik7Ci0g ICAgd2Via2l0X2luaXQoKTsKIAogICAgIHZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Via2l0X3dl Yl92aWV3X25ldygpKTsKICAgICBtYWluRnJhbWUgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5f ZnJhbWUodmlldyk7CkluZGV4OiBXZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCShyZXZpc2lvbiAyODcxMSkK KysrIFdlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwkod29ya2luZyBjb3B5KQpAQCAtMTc2 LDcgKzE3Niw2IEBAIGludAogbWFpbiAoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIHsKICAgICBn dGtfaW5pdCAoJmFyZ2MsICZhcmd2KTsKLSAgICB3ZWJraXRfaW5pdCAoKTsKIAogICAgIEd0a1dp ZGdldCogdmJveCA9IGd0a192Ym94X25ldyAoRkFMU0UsIDApOwogICAgIGd0a19ib3hfcGFja19z dGFydCAoR1RLX0JPWCAodmJveCksIGNyZWF0ZV90b29sYmFyICgpLCBGQUxTRSwgRkFMU0UsIDAp Owo=