17585 2008-02-27 20:23:59 -0800 [gtk] get|set encoding api 2014-04-08 17:56:24 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED WONTFIX Gtk P2 Enhancement --- 1 diegoe webkit-unassigned alp ap christian cosimoc mrobinson xan.lopez oldest_to_newest 72222 0 diegoe 2008-02-27 20:23:59 -0800 Attached patch implementes a get|set for encoding in webview, it's half-working because it seems I'm doing something silly with the string returned. Attached to the patch is the epiphany part consuming this API, it's there for reference. What ephy needs is: - a way to get the current encoding for the page so the view > encoding menu can be displayed correctly (the proper current encoding selected) - a way to tell the current web view to override the default-encoding of websettings for the current website (and reload the page when the encoding is changed). The patch provides the two first thing (with bugs), the second thing should be a matter of adding a reload() somewhere in the code, right now setting the encoding and manually reloading changes nothing, I guess it's in part fault of my buggy implementation. Please comment so I can learn the ways of C++ :) 72223 1 19427 diegoe 2008-02-27 20:25:01 -0800 Created attachment 19427 A first draft Go ahead and comment! 76452 2 alp 2008-04-06 20:04:18 -0700 We usually avoid g_strdup() for returned strings in favour of const gchar* and caching the value for API consistency. I'll try to look over this for correctness soon (incl. comparing with how the other ports do this) unless someone beats me to it. Thanks for the patch. 88181 3 alp 2008-08-10 11:08:50 -0700 (In reply to comment #1) > Created an attachment (id=19427) [edit] > A first draft > > Go ahead and comment! > Does this change the encoding of the currently loaded document? Mac WebView does it a little differently: http://developer.apple.com/documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html#//apple_ref/occ/instm/WebView/setCustomTextEncodingName: 110376 4 27827 xan.lopez 2009-02-20 03:35:38 -0800 Created attachment 27827 encoding.patch This does what Mac and Win do as far as I can tell. 111181 5 27827 zecke 2009-02-26 07:47:23 -0800 Comment on attachment 27827 encoding.patch > + if (!overrideEncoding.isEmpty()) { > + WebKitWebViewPrivate* priv = webView->priv; > + g_free (priv->customEncoding); > + priv->customEncoding = g_strdup(overrideEncoding.utf8().data()); > + return priv->customEncoding; > + } else > + return NULL; > +} looks like two style issues here. "g_free (" and two instead of four spaces to indent... please fix when landing. 111189 6 zecke 2009-02-26 08:22:06 -0800 Landed in r41247. 111275 7 christian 2009-02-26 12:43:44 -0800 We need to add two things were overlooked initially: A property 'custom-encoding' A read-only function/ property 'encoding' that returns the default value 111290 8 28034 christian 2009-02-26 13:07:40 -0800 Created attachment 28034 Add _get_encoding and properties 111544 9 christian 2009-02-27 14:01:28 -0800 (In reply to comment #8) > Created an attachment (id=28034) [review] > Add _get_encoding and properties Meanwhile I implemented menu items for this to properly test the patch. _get_encoding seems to return the custom encoding, ie. loader()->encoding() actually has the custom value after the custom encoding set for the first time. I'm not sure yet how to overcome this. 111613 10 27827 gustavo 2009-02-28 06:00:15 -0800 Comment on attachment 27827 encoding.patch Clearing the review flag so that it stops showing up as a pending commit 'till we got the other one reviewed. 111699 11 28034 zecke 2009-03-01 07:47:52 -0800 Comment on attachment 28034 Add _get_encoding and properties > + /** > + * WebKitWebView:custom-encoding: > + * > + * The custom encoding of the web view. > + * > + * Since: 1.1.1 > + */ may I get another space here? 111718 12 christian 2009-03-01 11:01:35 -0800 2009-03-01 Christian Dywan <christian@twotoasts.de> Reviewed by Holger Freyther. * webkit/webkitprivate.h: * webkit/webkitwebview.cpp: (webkit_web_view_get_encoding): * webkit/webkitwebview.h: Implement 'encoding' and 'custom-encoding' properties as well as webkit_web_view_get_encoding. 111719 13 christian 2009-03-01 11:02:57 -0800 Note that I changed the Since tags of the properties to 0.1.2, but I'm unsure whether that's the right version. We should discuss that. Leaving the bug open for now. 111737 14 xan.lopez 2009-03-01 13:48:26 -0800 (In reply to comment #9) > (In reply to comment #8) > > Created an attachment (id=28034) [review] [review] > > Add _get_encoding and properties > > Meanwhile I implemented menu items for this to properly test the patch. > _get_encoding seems to return the custom encoding, ie. loader()->encoding() > actually has the custom value after the custom encoding set for the first time. > I'm not sure yet how to overcome this. > If this is really the case it might make sense to just have one function, get_encoding, and another one to check whether or not the encoding is automatic or forced by the user. Not much sense in having two getters that return the same thing, I think. 111760 15 christian 2009-03-01 16:02:30 -0800 (In reply to comment #14) > (In reply to comment #9) > > (In reply to comment #8) > > > Created an attachment (id=28034) [review] [review] [review] > > > Add _get_encoding and properties > > > > Meanwhile I implemented menu items for this to properly test the patch. > > _get_encoding seems to return the custom encoding, ie. loader()->encoding() > > actually has the custom value after the custom encoding set for the first time. > > I'm not sure yet how to overcome this. > > > > If this is really the case it might make sense to just have one function, > get_encoding, and another one to check whether or not the encoding is automatic > or forced by the user. Not much sense in having two getters that return the > same thing, I think. Well, it's not expected to make any sense, it's a bug afterall. As we discussed, the API should allow for seeing the default encoding even if it was overridden. To me it looks like a bug in WebCore at this point, but I have to give that a closer look since I'm not familiar with where that's coming from. Otherwise we need to workaround it in WebKit I guess. 998942 16 mrobinson 2014-04-08 17:56:24 -0700 WebKit1GTK+ has been removed. 19427 2008-02-27 20:25:01 -0800 2009-02-20 03:35:38 -0800 A first draft webkit_encoding.diff text/plain 1809 diegoe SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbiAzMDY0MykKKysr IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x OTM1LDQgKzE5MzUsMzUgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3RyYW5zcGFyZW50KFdl YgogICAgIGZyYW1lLT52aWV3KCktPnNldFRyYW5zcGFyZW50KGZsYWcpOwogfQogCisvKioKKyAq IHdlYmtpdF93ZWJfdmlld19zZXRfZW5jb2Rpbmc6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdl YlZpZXcKKyAqIEBlbmNvZGluZzogdGhlIG5ldyBlbmNvZGluZworICoKKyAqIFNldHMgdGhlIGN1 cnJlbnQgI1dlYktpdFdlYlZpZXcgZW5jb2RpbmcsIHdpdGhvdXQgbW9kaWZ5aW5nIHRoZSBkZWZh dWx0IG9uZS4KKyAqIAorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfZW5jb2RpbmcoV2Vi S2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogZW5jb2RpbmcpCit7CisgICAgZ19yZXR1 cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAgY29yZSh3ZWJW aWV3KS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5zZXRFbmNvZGluZyhlbmNvZGluZywgVFJVRSk7 Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X3NldF9lbmNvZGluZzoKKyAqIEB3ZWJfdmll dzogYSAjV2ViS2l0V2ViVmlldworICoKKyAqIFJldHVybnMgdGhlIGN1cnJlbnQgZW5jb2Rpbmcg b2YgdGhlICNXZWJLaXRXZWJWaWV3LCBub3QgdGhlIGRlZmF1bHQtZW5jb2RpbmcgCisgKiBvZiBX ZWJLaXRXZWJTZXR0aW5ncy4KKyAqCisgKiBSZXR1cm4gdmFsdWU6IEEgc3RyaW5nIGNvbnRhaW5p bmcgdGhlIGN1cnJlbnQgZW5jb2RpbmcgZm9yIEB3ZWJfdmlldy4KKyAqLworY2hhciogd2Via2l0 X3dlYl92aWV3X2dldF9lbmNvZGluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdf cmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgTlVMTCk7Cisg ICAgCisgICAgcmV0dXJuIGdfc3RyZHVwKGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgpLT5sb2Fk ZXIoKS0+ZW5jb2RpbmcoKS51dGY4KCkuZGF0YSgpKTsKK30KKwogfQpJbmRleDogV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuaAkocmV2aXNpb24gMzA2NDMpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxNyw2ICsyMTcsMTIgQEAgd2Via2l0 X3dlYl92aWV3X2dldF90cmFuc3BhcmVudCAoV2ViS2l0VwogV0VCS0lUX0FQSSB2b2lkCiB3ZWJr aXRfd2ViX3ZpZXdfc2V0X3RyYW5zcGFyZW50IChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgZ2Jv b2xlYW4gZmxhZyk7CiAKK1dFQktJVF9BUEkgY2hhcioKK3dlYmtpdF93ZWJfdmlld19nZXRfZW5j b2RpbmcgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJr aXRfd2ViX3ZpZXdfc2V0X2VuY29kaW5nIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgY29uc3Qg Y2hhciogZW5jb2RpbmcpOworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYK 27827 2009-02-20 03:35:38 -0800 2009-02-28 06:00:15 -0800 encoding.patch encoding.patch text/plain 5660 xan.lopez RnJvbSA1NjYyNzFhMTcyYjVhYjcwOTA3Y2Q2MDliOTM3OTE4OTFjOWZlNzY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IEZyaSwg MjAgRmViIDIwMDkgMTM6MzQ6MzYgKzAyMDAKU3ViamVjdDogW1BBVENIXSAyMDA5LTAyLTIwICBY YW4gTG9wZXogIDx4YW5AZ25vbWUub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NTg1CiAgICAgICAgW2d0a10gZ2V0fHNldCBlbmNvZGluZyBhcGkKCiAgICAgICAgQWRkIGZ1bmN0 aW9ucyB0byBnZXQgYW5kIHNldCBhIGN1c3RvbSBlbmNvZGluZyBhbiBhIHZpZXcuCgogICAgICAg ICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoKICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcDoKICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF9jdXN0b21fZW5jb2RpbmcpOgogICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2N1c3RvbV9lbmNvZGluZyk6CiAgICAgICAgKiB3ZWJr aXQvd2Via2l0d2Vidmlldy5oOgotLS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgIHwgICAxNSArKysrKysrKysKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaCAg IHwgICAgMSArCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCB8ICAgNTUgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuaCAgIHwgICAgNyArKysrCiA0IGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMo KyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9X ZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA2YjBjZjg1Li5iMzViMjQxIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDA5LTAyLTIwICBYYW4gTG9wZXogIDx4YW5AZ25vbWUub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU4NQorICAgICAgICBbZ3RrXSBnZXR8c2V0IGVuY29k aW5nIGFwaQorCisgICAgICAgIEFkZCBmdW5jdGlvbnMgdG8gZ2V0IGFuZCBzZXQgYSBjdXN0b20g ZW5jb2RpbmcgYW4gYSB2aWV3LgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoK KyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2Vi X3ZpZXdfc2V0X2N1c3RvbV9lbmNvZGluZyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0 X2N1c3RvbV9lbmNvZGluZyk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuaDoKKwog MjAwOS0wMi0xOSAgWGFuIExvcGV6ICA8eGFuQGdub21lLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHByaXZhdGUuaCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCBhY2U5 OTZkLi43NGYzODQzIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRl LmgKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC0xMDEsNiArMTAx LDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgICAgIEd0a0FkanVzdG1lbnQqIHZlcnRpY2FsQWRqdXN0 bWVudDsKIAogICAgICAgICBnYm9vbGVhbiB6b29tRnVsbENvbnRlbnQ7CisgICAgICAgIGNoYXIq IGN1c3RvbUVuY29kaW5nOwogICAgIH07CiAKICAgICAjZGVmaW5lIFdFQktJVF9XRUJfRlJBTUVf R0VUX1BSSVZBVEUob2JqKSAgICAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBX RUJLSVRfVFlQRV9XRUJfRlJBTUUsIFdlYktpdFdlYkZyYW1lUHJpdmF0ZSkpCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDQxYjNjNzMuLjkwMzA3YmIgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAiQ29udGV4dE1l bnVDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiQ3Vyc29yLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQu aCIKKyNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkRyYWdDbGllbnRHdGsu aCIKICNpbmNsdWRlICJFZGl0b3IuaCIKICNpbmNsdWRlICJFZGl0b3JDbGllbnRHdGsuaCIKQEAg LTg2NCw2ICs4NjUsMTYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Rpc3Bvc2UoR09i amVjdCogb2JqZWN0KQogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19wYXJlbnRf Y2xhc3MpLT5kaXNwb3NlKG9iamVjdCk7CiB9CiAKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19maW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCit7CisgICAgV2ViS2l0V2ViVmlldyogd2ViVmll dyA9IFdFQktJVF9XRUJfVklFVyhvYmplY3QpOworICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBw cml2ID0gd2ViVmlldy0+cHJpdjsKKworICAgIGdfZnJlZShwcml2LT5jdXN0b21FbmNvZGluZyk7 CisKKyAgICBHX09CSkVDVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfcGFyZW50X2NsYXNzKS0+Zmlu YWxpemUob2JqZWN0KTsKK30KKwogc3RhdGljIGdib29sZWFuIHdlYmtpdF9jcmVhdGVfd2ViX3Zp ZXdfcmVxdWVzdF9oYW5kbGVkKEdTaWduYWxJbnZvY2F0aW9uSGludCogaWhpbnQsIEdWYWx1ZSog cmV0dXJuQWNjdSwgY29uc3QgR1ZhbHVlKiBoYW5kbGVyUmV0dXJuLCBncG9pbnRlciBkdW1teSkK IHsKICAgICBncG9pbnRlciBuZXdXZWJWaWV3ID0gZ192YWx1ZV9nZXRfb2JqZWN0KGhhbmRsZXJS ZXR1cm4pOwpAQCAtMTM5Niw2ICsxNDA3LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAKICAgICBHT2Jq ZWN0Q2xhc3MqIG9iamVjdENsYXNzID0gR19PQkpFQ1RfQ0xBU1Mod2ViVmlld0NsYXNzKTsKICAg ICBvYmplY3RDbGFzcy0+ZGlzcG9zZSA9IHdlYmtpdF93ZWJfdmlld19kaXNwb3NlOworICAgIG9i amVjdENsYXNzLT5maW5hbGl6ZSA9IHdlYmtpdF93ZWJfdmlld19maW5hbGl6ZTsKICAgICBvYmpl Y3RDbGFzcy0+Z2V0X3Byb3BlcnR5ID0gd2Via2l0X3dlYl92aWV3X2dldF9wcm9wZXJ0eTsKICAg ICBvYmplY3RDbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0X3dlYl92aWV3X3NldF9wcm9wZXJ0 eTsKIApAQCAtMjc1NywzICsyNzY5LDQ2IEBAIFNvdXBTZXNzaW9uKiB3ZWJraXRfZ2V0X2RlZmF1 bHRfc2Vzc2lvbiAoKQogfQogCiB9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X3NldF9jdXN0 b21fZW5jb2Rpbmc6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqIEBlbmNvZGlu ZzogdGhlIG5ldyBlbmNvZGluZywgb3IgJU5VTEwgdG8gcmVzdG9yZSB0aGUgZGVmYXVsdCBlbmNv ZGluZworICoKKyAqIFNldHMgdGhlIGN1cnJlbnQgI1dlYktpdFdlYlZpZXcgZW5jb2RpbmcsIHdp dGhvdXQgbW9kaWZ5aW5nIHRoZSBkZWZhdWx0IG9uZSwKKyAqIGFuZCByZWxvYWRzIHRoZSBwYWdl LgorICogCisgKiBTaW5jZTogMS4xLjEKKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X2N1 c3RvbV9lbmNvZGluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBjaGFyKiBlbmNvZGlu ZykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7 CisKKyAgICBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPnJlbG9hZFdpdGhP dmVycmlkZUVuY29kaW5nKFN0cmluZzo6ZnJvbVVURjgoZW5jb2RpbmcpKTsKK30KKworLyoqCisg KiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2N1c3RvbV9lbmNvZGluZzoKKyAqIEB3ZWJfdmlldzogYSAj V2ViS2l0V2ViVmlldworICoKKyAqIFJldHVybnMgdGhlIGN1cnJlbnQgZW5jb2Rpbmcgb2YgdGhl ICNXZWJLaXRXZWJWaWV3LCBub3QgdGhlIGRlZmF1bHQtZW5jb2RpbmcgCisgKiBvZiBXZWJLaXRX ZWJTZXR0aW5ncy4KKyAqCisgKiBSZXR1cm4gdmFsdWU6IGEgc3RyaW5nIGNvbnRhaW5pbmcgdGhl IGN1cnJlbnQgY3VzdG9tIGVuY29kaW5nIGZvciBAd2ViX3ZpZXcsIG9yICVOVUxMIGlmIHRoZXJl J3Mgbm9uZSBzZXQuCisgKgorICogU2luY2U6IDEuMS4xCisgKi8KK2NvbnN0IGNoYXIqIHdlYmtp dF93ZWJfdmlld19nZXRfY3VzdG9tX2VuY29kaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7 CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBO VUxMKTsKKyAgICAKKyAgICBTdHJpbmcgb3ZlcnJpZGVFbmNvZGluZyA9IGNvcmUod2ViVmlldykt Pm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+b3ZlcnJpZGVFbmNvZGlu ZygpOworCisgICAgaWYgKCFvdmVycmlkZUVuY29kaW5nLmlzRW1wdHkoKSkgeworICAgICAgV2Vi S2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgICAgZ19mcmVlIChw cml2LT5jdXN0b21FbmNvZGluZyk7CisgICAgICBwcml2LT5jdXN0b21FbmNvZGluZyA9IGdfc3Ry ZHVwKG92ZXJyaWRlRW5jb2RpbmcudXRmOCgpLmRhdGEoKSk7CisgICAgICByZXR1cm4gcHJpdi0+ Y3VzdG9tRW5jb2Rpbmc7CisgICAgfSBlbHNlCisgICAgICByZXR1cm4gTlVMTDsKK30KZGlmZiAt LWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaCBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuaAppbmRleCA0Y2MzNTY5Li5jZmMwOTAwIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2Vidmlldy5oCkBAIC0zMDgsNiArMzA4LDEzIEBAIHdlYmtpdF93ZWJfdmlld19zZXRf ZnVsbF9jb250ZW50X3pvb20gICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAqd2ViX3Zp ZXcsCiBXRUJLSVRfQVBJIFNvdXBTZXNzaW9uKgogd2Via2l0X2dldF9kZWZhdWx0X3Nlc3Npb24g ICAgICAgICAgICAgICAgICAgICAgKHZvaWQpOwogCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93 ZWJfdmlld19zZXRfY3VzdG9tX2VuY29kaW5nICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAg ICAgICAqIHdlYlZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKiBlbmNvZGluZyk7CisKK1dFQktJVF9BUEkg Y29uc3QgY2hhcioKK3dlYmtpdF93ZWJfdmlld19nZXRfY3VzdG9tX2VuY29kaW5nICAgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAqIHdlYlZpZXcpOworCiBHX0VORF9ERUNMUwogCiAj ZW5kaWYKLS0gCjEuNi4xCgo= 28034 2009-02-26 13:07:40 -0800 2009-03-04 11:10:17 -0800 Add _get_encoding and properties webviewencoding.diff text/plain 5237 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaCBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCA3NGYzODQzLi40NzA5NDQ3IDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC0xMDEsNiArMTAxLDcgQEAgZXh0ZXJuICJDIiB7CiAg ICAgICAgIEd0a0FkanVzdG1lbnQqIHZlcnRpY2FsQWRqdXN0bWVudDsKIAogICAgICAgICBnYm9v bGVhbiB6b29tRnVsbENvbnRlbnQ7CisgICAgICAgIGNoYXIqIGVuY29kaW5nOwogICAgICAgICBj aGFyKiBjdXN0b21FbmNvZGluZzsKICAgICB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCmluZGV4IDZjZDE4YWEuLmMzYzAxODYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCkBAIC0xNDgsNyArMTQ4LDkgQEAgZW51bSB7CiAgICAgUFJPUF9XSU5ET1dfRkVBVFVSRVMs CiAgICAgUFJPUF9UUkFOU1BBUkVOVCwKICAgICBQUk9QX1pPT01fTEVWRUwsCi0gICAgUFJPUF9G VUxMX0NPTlRFTlRfWk9PTQorICAgIFBST1BfRlVMTF9DT05URU5UX1pPT00sCisgICAgUFJPUF9F TkNPRElORywKKyAgICBQUk9QX0NVU1RPTV9FTkNPRElORwogfTsKIAogc3RhdGljIGd1aW50IHdl YmtpdF93ZWJfdmlld19zaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAgLTMwNiw2ICsz MDgsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2dldF9wcm9wZXJ0eShHT2JqZWN0 KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYWx1ZSoKICAgICBjYXNlIFBST1BfRlVMTF9DT05U RU5UX1pPT006CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF93ZWJf dmlld19nZXRfZnVsbF9jb250ZW50X3pvb20od2ViVmlldykpOwogICAgICAgICBicmVhazsKKyAg ICBjYXNlIFBST1BfRU5DT0RJTkc6CisgICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwg d2Via2l0X3dlYl92aWV3X2dldF9lbmNvZGluZyh3ZWJWaWV3KSk7CisgICAgICAgIGJyZWFrOwor ICAgIGNhc2UgUFJPUF9DVVNUT01fRU5DT0RJTkc6CisgICAgICAgIGdfdmFsdWVfc2V0X3N0cmlu Zyh2YWx1ZSwgd2Via2l0X3dlYl92aWV3X2dldF9jdXN0b21fZW5jb2Rpbmcod2ViVmlldykpOwor ICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFM SURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgfQpAQCAtMzM0LDYg KzM0Miw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfcHJvcGVydHkoR09iamVj dCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBjb25zdCBHCiAgICAgY2FzZSBQUk9QX0ZVTExfQ09O VEVOVF9aT09NOgogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X2Z1bGxfY29udGVudF96b29t KHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKICAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBQUk9QX0NVU1RPTV9FTkNPRElORzoKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3Nl dF9jdXN0b21fZW5jb2Rpbmcod2ViVmlldywgZ192YWx1ZV9nZXRfc3RyaW5nKHZhbHVlKSk7Cisg ICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJ RF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICB9CkBAIC04NzcsNiAr ODg4LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2ZpbmFsaXplKEdPYmplY3QqIG9i amVjdCkKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKG9iamVj dCk7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwogCisg ICAgZ19mcmVlKHByaXYtPmVuY29kaW5nKTsKICAgICBnX2ZyZWUocHJpdi0+Y3VzdG9tRW5jb2Rp bmcpOwogCiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X3BhcmVudF9jbGFzcykt PmZpbmFsaXplKG9iamVjdCk7CkBAIC0xNTg5LDYgKzE2MDEsMzQgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3Mp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBGQUxTRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJVEUpKTsKIAorICAgIC8qKgorICAgICogV2Vi S2l0V2ViVmlldzplbmNvZGluZzoKKyAgICAqCisgICAgKiBUaGUgZGVmYXVsdCBlbmNvZGluZyBv ZiB0aGUgd2ViIHZpZXcuCisgICAgKgorICAgICogU2luY2U6IDEuMS4xCisgICAgKi8KKyAgICBn X29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX0VOQ09ESU5H LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmlu ZygiZW5jb2RpbmciLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiRW5jb2RpbmciLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiVGhlIGRlZmF1bHQgZW5jb2Rpbmcgb2YgdGhlIHdl YiB2aWV3IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7CisKKyAgICAvKioKKyAgICAq IFdlYktpdFdlYlZpZXc6Y3VzdG9tLWVuY29kaW5nOgorICAgICoKKyAgICAqIFRoZSBjdXN0b20g ZW5jb2Rpbmcgb2YgdGhlIHdlYiB2aWV3LgorICAgICoKKyAgICAqIFNpbmNlOiAxLjEuMQorICAg ICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShvYmplY3RDbGFzcywgUFJP UF9DVVNUT01fRU5DT0RJTkcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBn X3BhcmFtX3NwZWNfc3RyaW5nKCJjdXN0b20tZW5jb2RpbmciLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ3VzdG9tIEVuY29kaW5nIiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IlRoZSBjdXN0b20gZW5jb2Rpbmcgb2YgdGhlIHdlYiB2aWV3IiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFN X1JFQURXUklURSkpOworCiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFz cywgc2l6ZW9mKFdlYktpdFdlYlZpZXdQcml2YXRlKSk7CiB9CiAKQEAgLTI3NzgsNiArMjgxOCwz MSBAQCBTb3VwU2Vzc2lvbiogd2Via2l0X2dldF9kZWZhdWx0X3Nlc3Npb24gKCkKIH0KIAogLyoq CisgKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2VuY29kaW5nOgorICogQHdlYl92aWV3OiBhICNXZWJL aXRXZWJWaWV3CisgKgorICogUmV0dXJucyB0aGUgZGVmYXVsdCBlbmNvZGluZyBvZiB0aGUgI1dl YktpdFdlYlZpZXcuCisgKgorICogUmV0dXJuIHZhbHVlOiB0aGUgZGVmYXVsdCBlbmNvZGluZwor ICoKKyAqIFNpbmNlOiAxLjEuMQorICovCitjb25zdCBnY2hhciogd2Via2l0X3dlYl92aWV3X2dl dF9lbmNvZGluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgTlVMTCk7CisKKyAgICBTdHJpbmcg ZW5jb2RpbmcgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmVuY29kaW5n KCk7CisKKyAgICBpZiAoIWVuY29kaW5nLmlzRW1wdHkoKSkgeworICAgICAgICBXZWJLaXRXZWJW aWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisgICAgICAgIGdfZnJlZShwcml2LT5l bmNvZGluZyk7CisgICAgICAgIHByaXYtPmVuY29kaW5nID0gZ19zdHJkdXAoZW5jb2RpbmcudXRm OCgpLmRhdGEoKSk7CisgICAgICAgIHJldHVybiBwcml2LT5lbmNvZGluZzsKKyAgICB9IGVsc2UK KyAgICAgIHJldHVybiBOVUxMOworfQorCisvKioKICAqIHdlYmtpdF93ZWJfdmlld19zZXRfY3Vz dG9tX2VuY29kaW5nOgogICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKiBAZW5jb2Rp bmc6IHRoZSBuZXcgZW5jb2RpbmcsIG9yICVOVUxMIHRvIHJlc3RvcmUgdGhlIGRlZmF1bHQgZW5j b2RpbmcKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaCBiL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAppbmRleCBjZmMwOTAwLi41NDNjNzc3IDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCkBAIC0zMDgsNiArMzA4LDkgQEAgd2Via2l0X3dl Yl92aWV3X3NldF9mdWxsX2NvbnRlbnRfem9vbSAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAg ICAgICp3ZWJfdmlldywKIFdFQktJVF9BUEkgU291cFNlc3Npb24qCiB3ZWJraXRfZ2V0X2RlZmF1 bHRfc2Vzc2lvbiAgICAgICAgICAgICAgICAgICAgICAodm9pZCk7CiAKK1dFQktJVF9BUEkgY29u c3QgZ2NoYXIqCit3ZWJraXRfd2ViX3ZpZXdfZ2V0X2VuY29kaW5nICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0V2ViVmlldyAgICAgICAgKiB3ZWJWaWV3KTsKKwogV0VCS0lUX0FQSSB2b2lkCiB3 ZWJraXRfd2ViX3ZpZXdfc2V0X2N1c3RvbV9lbmNvZGluZyAgICAgICAgICAgICAoV2ViS2l0V2Vi VmlldyAgICAgICAgKiB3ZWJWaWV3LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICogZW5jb2RpbmcpOwo=