17176 2008-02-04 10:45:52 -0800 [GTK] API: hovering-over-link and webkit_web_view_open /_load_foo 2009-02-28 12:14:15 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Other Linux RESOLVED FIXED Gtk P2 Major --- 14141 1 christian christian cosimoc gustavo pierre-luc.beaudoin xan.lopez oldest_to_newest 69361 0 christian 2008-02-04 10:45:52 -0800 The API of WebKitWebView has two remaining quirks. 1) If you want to load content into the view, you currently have the following functions: webkit_web_view_open webkit_web_view_load_string webkit_web_view_load_html_string webkit_web_frame_load_request That is plain chaos right now. So my suggestion instead is the following: webkit_web_view_load_uri webkit_web_view_load_string webkit_web_view_load_request webkit_web_frame_load_uri webkit_web_frame_load_string webkit_web_frame_load_request 2) WebKitWebView has a signal "hovering-over-link" with the random signature (WebKitWebView*, const gchar* tooltip, const gchar* uri). I suggest to remove this in favor of "element-motion". Now the uneasy question is what the signature is going to be. In the long term you will probably have a function looking like webkit_web_view_get_element_at_pos returning a DOM element. Right now we should just try to provide the very most common values, which are from my experience: link_uri image_uri is_control is_editable_control is_password_control As for how to represent that in API I'm hesitating. Suggestions, opinions, ideas welcome, especially from hackers that might have a use for something as fancy as custom context menu items. 83898 1 marco.barisione 2008-06-19 11:23:56 -0700 (In reply to comment #0) > 1) If you want to load content into the view, you currently have the following > functions: > webkit_web_view_open > webkit_web_view_load_string > webkit_web_view_load_html_string > webkit_web_frame_load_request > > That is plain chaos right now. So my suggestion instead is the following: > > webkit_web_view_load_uri > webkit_web_view_load_string > webkit_web_view_load_request > > webkit_web_frame_load_uri > webkit_web_frame_load_string > webkit_web_frame_load_request I completely agree on this. Alp: what do you think about this API change? If the new API seems ok I can make the required changes and submit a patch for review. > 2) WebKitWebView has a signal "hovering-over-link" with the random signature > (WebKitWebView*, const gchar* tooltip, const gchar* uri). > > I suggest to remove this in favor of "element-motion". Now the uneasy question > is what the signature is going to be. In the long term you will probably have a > function looking like webkit_web_view_get_element_at_pos returning a DOM > element. Right now we should just try to provide the very most common values, > which are from my experience: > > link_uri > image_uri > is_control > is_editable_control > is_password_control > > As for how to represent that in API I'm hesitating. How about something similar to HitTestResult? At the beginning it could contain just the most important things like a get_link_uri() method, later we can add a method returning the DOM element for more advanced uses. 106902 2 27005 christian 2009-01-24 21:33:04 -0800 Created attachment 27005 Readjust view and frame loading functions As suggested above, this patch deprecates: webkit_web_view_open webkit_web_view_load_html_string and introduces: webkit_web_view_load_uri webkit_web_view_load_request webkit_web_frame_load_uri webkit_web_frame_load_string For consistency I implemented all functions on the view using the according frame functions. 107027 3 zecke 2009-01-26 05:26:27 -0800 Could you post the thread init patch somewhere else? or rs=me on that and just commit it. 107041 4 27039 christian 2009-01-26 10:52:58 -0800 Created attachment 27039 Readjust view and frame loading functions #2 I want for the rubber stamp for the threading change. Updated patch to not include it anymore. 109527 5 27039 christian 2009-02-12 11:47:09 -0800 Comment on attachment 27039 Readjust view and frame loading functions #2 2009-02-12 Christian Dywan <christian@twotoasts.de> Reviewed by Holger Freyther. http://bugs.webkit.org/show_bug.cgi?id=17176 [GTK] API: hovering-over-link and webkit_web_view_open /_load_foo * webkit/webkitwebframe.cpp: * webkit/webkitwebframe.h: * webkit/webkitwebview.cpp: * webkit/webkitwebview.h: Introduce webkit_web_frame_load_uri, webkit_web_frame_load_string, webkit_web_view_load_uri and webkit_web_view_load_request and unify implementations. 111272 6 28030 christian 2009-02-26 12:28:35 -0800 Created attachment 28030 Support file paths in _open for compatibility As discussed, webkit_web_view_open used to support local paths until very recently and some applications rely on this. So this patch adds a test if the string is actually a local path. We are not changing webkit_web_view_load_uri because that function is new and we don't really encourage this kind of "guessing" on WebKit's side. I tested it with devhelp, which doesn't show any content anymore due to this regression. Another example would be liferea. 111599 7 gustavo 2009-02-27 20:02:47 -0800 (In reply to comment #6) > Created an attachment (id=28030) [review] > Support file paths in _open for compatibility Looks good to me, and is release critical in my opinion - we need to get this in before we release. 111637 8 28030 zecke 2009-02-28 11:42:27 -0800 Comment on attachment 28030 Support file paths in _open for compatibility Okay, you might want to do undo my change to open the results of the webkit tests as well. 111641 9 christian 2009-02-28 12:14:15 -0800 2009-02-28 Christian Dywan <christian@twotoasts.de> Reviewed by Holger Freyther. * webkit/webkitwebview.cpp: Let webkit_web_view_open add file:// if a locale path is passed for compatibility, since we used to support that. 27005 2009-01-24 21:33:04 -0800 2009-01-26 10:52:58 -0800 Readjust view and frame loading functions p.diff text/plain 10082 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAppbmRleCAzOGUyM2E0Li5hYjY3ZDRiIDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5j bHVkZSAiUmVuZGVyVHJlZUFzVGV4dC5oIgogI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2lu Y2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJTdWJzdGl0dXRlRGF0YS5oIgog CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQVBJQ2FzdC5oPgogCkBAIC0zNzMsNiArMzc0LDYw IEBAIFdlYktpdFdlYkZyYW1lKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9wYXJlbnQoV2ViS2l0V2Vi RnJhbWUqIGZyYW1lKQogfQogCiAvKioKKyAqIHdlYmtpdF93ZWJfZnJhbWVfbG9hZF91cmk6Cisg KiBAZnJhbWU6IGEgI1dlYktpdFdlYkZyYW1lCisgKiBAdXJpOiBhbiBVUkkgc3RyaW5nCisgKgor ICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVSSSBzdHJpbmcuCisgKgorICog U2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl9mcmFtZV9sb2FkX3VyaShXZWJLaXRX ZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdjaGFyKiB1cmkpCit7CisgICAgZ19yZXR1cm5faWZfZmFp bChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSk7CisgICAgZ19yZXR1cm5faWZfZmFpbCh1cmkp OworCisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOworICAgIGlmICghY29yZUZy YW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBjb3JlRnJhbWUtPmxvYWRlcigpLT5sb2FkKFJl c291cmNlUmVxdWVzdChLVVJMKFN0cmluZzo6ZnJvbVVURjgodXJpKSkpKTsKK30KKworLyoqCisg KiB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfc3RyaW5nOgorICogQGZyYW1lOiBhICNXZWJLaXRXZWJG cmFtZQorICogQGNvbnRlbnQ6IGFuIFVSSSBzdHJpbmcKKyAqIEBtaW1lX3R5cGU6IHRoZSBNSU1F IHR5cGUsIG9yICVOVUxMCisgKiBAZW5jb2Rpbmc6IHRoZSBlbmNvZGluZywgb3IgJU5VTEwKKyAq IEBiYXNlX3VyaTogdGhlIGJhc2UgVVJJIGZvciByZWxhdGl2ZSBsb2NhdGlvbnMKKyAqCisgKiBS ZXF1ZXN0cyBsb2FkaW5nIG9mIHRoZSBnaXZlbiBAY29udGVudCB3aXRoIHRoZSBzcGVjaWZpZWQg QG1pbWVfdHlwZSwKKyAqIEBlbmNvZGluZyBhbmQgQGJhc2VfdXJpLgorICoKKyAqIElmIEBtaW1l X3R5cGUgaXMgJU5VTEwsICJ0ZXh0L2h0bWwiIGlzIGFzc3VtZWQuCisgKgorICogSWYgQGVuY29k aW5nIGlzICVOVUxMLCAiVVRGLTgiIGlzIGFzc3VtZWQuCisgKgorICogU2luY2U6IDEuMS4xCisg Ki8KK3ZvaWQgd2Via2l0X3dlYl9mcmFtZV9sb2FkX3N0cmluZyhXZWJLaXRXZWJGcmFtZSogZnJh bWUsIGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hhciogY29udGVudE1pbWVUeXBlLCBj b25zdCBnY2hhciogY29udGVudEVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkKK3sKKyAg ICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpKTsKKyAgICBnX3Jl dHVybl9pZl9mYWlsKGNvbnRlbnQpOworCisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJh bWUpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBLVVJMIHVy bChiYXNlVXJpID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKKyAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50 LCBzdHJsZW4oY29udGVudCkpOworICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNo YXJlZEJ1ZmZlci5yZWxlYXNlKCksIGNvbnRlbnRNaW1lVHlwZSA/IFN0cmluZyhjb250ZW50TWlt ZVR5cGUpIDogInRleHQvaHRtbCIsIGNvbnRlbnRFbmNvZGluZyA/IFN0cmluZyhjb250ZW50RW5j b2RpbmcpIDogIlVURi04IiwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKKworICAgIGNvcmVG cmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KHVybCksIHN1YnN0aXR1dGVEYXRh KTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfcmVxdWVzdDoKICAqIEBmcmFt ZTogYSAjV2ViS2l0V2ViRnJhbWUKICAqIEByZXF1ZXN0OiBhICNXZWJLaXROZXR3b3JrUmVxdWVz dApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmgKaW5kZXggZmNkYWNlNi4uN2UyNDU2NSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5oCkBAIC04MSw2ICs4MSwxNyBAQCBXRUJLSVRfQVBJ IFdlYktpdFdlYkZyYW1lKgogd2Via2l0X3dlYl9mcmFtZV9nZXRfcGFyZW50ICAgICAgICAgKFdl YktpdFdlYkZyYW1lICAgICAgICpmcmFtZSk7CiAKIFdFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl9mcmFtZV9sb2FkX3VyaSAgICAgICAgICAgKFdlYktpdFdlYkZyYW1lICAgICAgICpmcmFtZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAqdXJpKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfc3RyaW5n ICAgICAgICAoV2ViS2l0V2ViRnJhbWUgICAgICAgKmZyYW1lLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICpjb250ZW50LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICptaW1l X3R5cGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmVuY29kaW5nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGdjaGFyICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dFQktJVF9BUEkgdm9pZAogd2Vi a2l0X3dlYl9mcmFtZV9sb2FkX3JlcXVlc3QgICAgICAgKFdlYktpdFdlYkZyYW1lICAgICAgICpm cmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXROZXR3b3Jr UmVxdWVzdCAqcmVxdWVzdCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXgg MzU4YWNlOS4uZGMxYWE1MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi dmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTYx LDcgKzYxLDYgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJT Y3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgotI2luY2x1ZGUgIlN1YnN0aXR1 dGVEYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0dPd25QdHIuaD4KIAogI2luY2x1ZGUgPGdkay9nZGtr ZXlzeW1zLmg+CkBAIC0yMDQ3LDEzICsyMDQ2LDIwIEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmll d19jYW5fZ29fZm9yd2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIHJldHVybiBUUlVF OwogfQogCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19vcGVuOgorICogQHdlYl92aWV3OiBhICNX ZWJLaXRXZWJWaWV3CisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVS SSBzdHJpbmcuCisgKgorICogRGVwcmVjYXRlZDogMS4xLjE6IFVzZSB3ZWJraXRfd2ViX3ZpZXdf bG9hZF91cmkoKSBpbnN0ZWFkLgorICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld19vcGVuKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAgZ19yZXR1cm5faWZf ZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwo dXJpKTsKIAotICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgpOwot ICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNvdXJjZVJlcXVlc3QoS1VSTChTdHJpbmc6OmZy b21VVEY4KHVyaSkpKSk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcsIHVy aSk7CiB9CiAKIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlbG9hZChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQpAQCAtMjA3OCwyMCArMjA4NCw1OCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWxvYWRf YnlwYXNzX2NhY2hlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgY29yZSh3ZWJWaWV3KS0+ bWFpbkZyYW1lKCktPmxvYWRlcigpLT5yZWxvYWQodHJ1ZSk7CiB9CiAKLXZvaWQgd2Via2l0X3dl Yl92aWV3X2xvYWRfc3RyaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBj b250ZW50LCBjb25zdCBnY2hhciogY29udGVudE1pbWVUeXBlLCBjb25zdCBnY2hhciogY29udGVu dEVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfdXJpOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAdXJpOiBhbiBV Ukkgc3RyaW5nCisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVSSSBz dHJpbmcuCisgKgorICogU2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xv YWRfdXJpKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAg Z19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwotICAgIGdfcmV0 dXJuX2lmX2ZhaWwoY29udGVudCk7CisgICAgZ19yZXR1cm5faWZfZmFpbCh1cmkpOwogCi0gICAg RnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CisgICAgV2ViS2l0V2Vi RnJhbWUqIGZyYW1lID0gd2ViVmlldy0+cHJpdi0+bWFpbkZyYW1lOworICAgIHdlYmtpdF93ZWJf ZnJhbWVfbG9hZF91cmkoZnJhbWUsIHVyaSk7Cit9CiAKLSAgICBLVVJMIHVybChiYXNlVXJpID8g U3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVy PiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50LCBzdHJsZW4oY29u dGVudCkpOwotICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNoYXJlZEJ1ZmZlci5y ZWxlYXNlKCksIGNvbnRlbnRNaW1lVHlwZSA/IFN0cmluZyhjb250ZW50TWltZVR5cGUpIDogInRl eHQvaHRtbCIsIGNvbnRlbnRFbmNvZGluZyA/IFN0cmluZyhjb250ZW50RW5jb2RpbmcpIDogIlVU Ri04IiwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfc3RyaW5nOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVu dDogYW4gVVJJIHN0cmluZworICogQG1pbWVfdHlwZTogdGhlIE1JTUUgdHlwZSwgb3IgJU5VTEwK KyAqIEBlbmNvZGluZzogdGhlIGVuY29kaW5nLCBvciAlTlVMTAorICogQGJhc2VfdXJpOiB0aGUg YmFzZSBVUkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucworICoKKyAqIFJlcXVlc3RzIGxvYWRpbmcg b2YgdGhlIGdpdmVuIEBjb250ZW50IHdpdGggdGhlIHNwZWNpZmllZCBAbWltZV90eXBlLAorICog QGVuY29kaW5nIGFuZCBAYmFzZV91cmkuCisgKgorICogSWYgQG1pbWVfdHlwZSBpcyAlTlVMTCwg InRleHQvaHRtbCIgaXMgYXNzdW1lZC4KKyAqCisgKiBJZiBAZW5jb2RpbmcgaXMgJU5VTEwsICJV VEYtOCIgaXMgYXNzdW1lZC4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9zdHJpbmco V2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNvbnN0IGdjaGFy KiBtaW1lVHlwZSwgY29uc3QgZ2NoYXIqIGVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChjb250ZW50KTsKIAotICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9h ZChSZXNvdXJjZVJlcXVlc3QodXJsKSwgc3Vic3RpdHV0ZURhdGEpOworICAgIFdlYktpdFdlYkZy YW1lKiBmcmFtZSA9IHdlYlZpZXctPnByaXYtPm1haW5GcmFtZTsKKyAgICB3ZWJraXRfd2ViX2Zy YW1lX2xvYWRfc3RyaW5nKGZyYW1lLCBjb250ZW50LCBtaW1lVHlwZSwgZW5jb2RpbmcsIGJhc2VV cmkpOwogfQogCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nOgorICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogYW4gVVJJIHN0cmluZwor ICogQGJhc2VfdXJpOiB0aGUgYmFzZSBVUkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucworICoKKyAq IFJlcXVlc3RzIGxvYWRpbmcgb2YgdGhlIGdpdmVuIEBjb250ZW50IHdpdGggdGhlIHNwZWNpZmll ZCBAYmFzZV91cmkuCisgKgorICogRGVwcmVjYXRlZDogMS4xLjE6IFVzZSB3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9zdHJpbmcoKSBpbnN0ZWFkLgorICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk X2h0bWxfc3RyaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBjb250ZW50 LCBjb25zdCBnY2hhciogYmFzZVVyaSkKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19XRUJfVklFVyh3ZWJWaWV3KSk7CkBAIC0yMTAwLDYgKzIxNDQsMjggQEAgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBn Y2hhciogY29udGUKICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9zdHJpbmcod2ViVmlldywgY29u dGVudCwgTlVMTCwgTlVMTCwgYmFzZVVyaSk7CiB9CiAKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfcmVxdWVzdDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHJlcXVl c3Q6IGEgI1dlYktpdE5ldHdvcmtSZXF1ZXN0CisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0 aGUgc3BlY2lmaWVkIGFzeW5jaHJvbm91cyBjbGllbnQgcmVxdWVzdC4KKyAqCisgKiBDcmVhdGVz IGEgcHJvdmlzaW9uYWwgZGF0YSBzb3VyY2UgdGhhdCB3aWxsIHRyYW5zaXRpb24gdG8gYSBjb21t aXR0ZWQgZGF0YQorICogc291cmNlIG9uY2UgYW55IGRhdGEgaGFzIGJlZW4gcmVjZWl2ZWQuIFVz ZSB3ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKCkgdG8KKyAqIHN0b3AgdGhlIGxvYWQuCisg KgorICogU2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfcmVxdWVz dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVxdWVzdCkK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfTkVUV09SS19SRVFVRVNUKHJlcXVlc3QpKTsK KworICAgIFdlYktpdFdlYkZyYW1lKiBmcmFtZSA9IHdlYlZpZXctPnByaXYtPm1haW5GcmFtZTsK KyAgICB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfcmVxdWVzdChmcmFtZSwgcmVxdWVzdCk7Cit9CisK IHZvaWQgd2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsK ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaCBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAppbmRleCAyYmI4YzYxLi43ZTdiMmNlIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vidmlldy5oCkBAIC0xNzEsMTAgKzE3MSwxNCBAQCBXRUJLSVRfQVBJIHZv aWQKIHdlYmtpdF93ZWJfdmlld19yZWxvYWRfYnlwYXNzX2NhY2hlICAgICAgICAgICAgIChXZWJL aXRXZWJWaWV3ICAgICAgICAqd2ViX3ZpZXcpOwogCiBXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93 ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAg ICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKnVyaSk7CisKK1dFQktJVF9BUEkgdm9pZAog d2Via2l0X3dlYl92aWV3X2xvYWRfc3RyaW5nICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YlZpZXcgICAgICAgICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqY29udGVudCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAg ICAgICAqY29udGVudF9taW1lX3R5cGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKmNvbnRlbnRfZW5jb2Rpbmcs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Z2NoYXIgICAgICAgICAgKm1pbWVfdHlwZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqZW5jb2RpbmcsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmJhc2VfdXJpKTsKIAogV0VCS0lUX0FQSSB2b2lkCkBAIC0xODIsNiArMTg2LDEw IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nICAgICAgICAgICAgICAgIChXZWJL aXRXZWJWaWV3ICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKmNvbnRlbnQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmJhc2VfdXJpKTsKIAorV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdf bG9hZF9yZXF1ZXN0ICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgKndl Yl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdlYktpdE5ldHdvcmtSZXF1ZXN0ICpyZXF1ZXN0KTsKKwogV0VCS0lUX0FQSSBnYm9vbGVhbgog d2Via2l0X3dlYl92aWV3X3NlYXJjaF90ZXh0ICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YlZpZXcgICAgICAgICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqdGV4dCwKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVy L21haW4uYwppbmRleCA4ZWQyNjkwLi41OWYyMjMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9H dGtMYXVuY2hlci9tYWluLmMKKysrIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBA IC0xODMsNiArMTgzLDggQEAgaW50CiBtYWluIChpbnQgYXJnYywgY2hhciogYXJndltdKQogewog ICAgIGd0a19pbml0ICgmYXJnYywgJmFyZ3YpOworICAgIGlmICghZ190aHJlYWRfc3VwcG9ydGVk ICgpKQorICAgICAgICBnX3RocmVhZF9pbml0IChOVUxMKTsKIAogICAgIEd0a1dpZGdldCogdmJv eCA9IGd0a192Ym94X25ldyAoRkFMU0UsIDApOwogICAgIGd0a19ib3hfcGFja19zdGFydCAoR1RL X0JPWCAodmJveCksIGNyZWF0ZV90b29sYmFyICgpLCBGQUxTRSwgRkFMU0UsIDApOwo= 27039 2009-01-26 10:52:58 -0800 2009-02-12 11:47:09 -0800 Readjust view and frame loading functions #2 viewloaduri.diff text/plain 9621 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAppbmRleCAzOGUyM2E0Li5hYjY3ZDRiIDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5j bHVkZSAiUmVuZGVyVHJlZUFzVGV4dC5oIgogI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2lu Y2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJTdWJzdGl0dXRlRGF0YS5oIgog CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQVBJQ2FzdC5oPgogCkBAIC0zNzMsNiArMzc0LDYw IEBAIFdlYktpdFdlYkZyYW1lKiB3ZWJraXRfd2ViX2ZyYW1lX2dldF9wYXJlbnQoV2ViS2l0V2Vi RnJhbWUqIGZyYW1lKQogfQogCiAvKioKKyAqIHdlYmtpdF93ZWJfZnJhbWVfbG9hZF91cmk6Cisg KiBAZnJhbWU6IGEgI1dlYktpdFdlYkZyYW1lCisgKiBAdXJpOiBhbiBVUkkgc3RyaW5nCisgKgor ICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVSSSBzdHJpbmcuCisgKgorICog U2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl9mcmFtZV9sb2FkX3VyaShXZWJLaXRX ZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdjaGFyKiB1cmkpCit7CisgICAgZ19yZXR1cm5faWZfZmFp bChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSk7CisgICAgZ19yZXR1cm5faWZfZmFpbCh1cmkp OworCisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOworICAgIGlmICghY29yZUZy YW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBjb3JlRnJhbWUtPmxvYWRlcigpLT5sb2FkKFJl c291cmNlUmVxdWVzdChLVVJMKFN0cmluZzo6ZnJvbVVURjgodXJpKSkpKTsKK30KKworLyoqCisg KiB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfc3RyaW5nOgorICogQGZyYW1lOiBhICNXZWJLaXRXZWJG cmFtZQorICogQGNvbnRlbnQ6IGFuIFVSSSBzdHJpbmcKKyAqIEBtaW1lX3R5cGU6IHRoZSBNSU1F IHR5cGUsIG9yICVOVUxMCisgKiBAZW5jb2Rpbmc6IHRoZSBlbmNvZGluZywgb3IgJU5VTEwKKyAq IEBiYXNlX3VyaTogdGhlIGJhc2UgVVJJIGZvciByZWxhdGl2ZSBsb2NhdGlvbnMKKyAqCisgKiBS ZXF1ZXN0cyBsb2FkaW5nIG9mIHRoZSBnaXZlbiBAY29udGVudCB3aXRoIHRoZSBzcGVjaWZpZWQg QG1pbWVfdHlwZSwKKyAqIEBlbmNvZGluZyBhbmQgQGJhc2VfdXJpLgorICoKKyAqIElmIEBtaW1l X3R5cGUgaXMgJU5VTEwsICJ0ZXh0L2h0bWwiIGlzIGFzc3VtZWQuCisgKgorICogSWYgQGVuY29k aW5nIGlzICVOVUxMLCAiVVRGLTgiIGlzIGFzc3VtZWQuCisgKgorICogU2luY2U6IDEuMS4xCisg Ki8KK3ZvaWQgd2Via2l0X3dlYl9mcmFtZV9sb2FkX3N0cmluZyhXZWJLaXRXZWJGcmFtZSogZnJh bWUsIGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hhciogY29udGVudE1pbWVUeXBlLCBj b25zdCBnY2hhciogY29udGVudEVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkKK3sKKyAg ICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfRlJBTUUoZnJhbWUpKTsKKyAgICBnX3Jl dHVybl9pZl9mYWlsKGNvbnRlbnQpOworCisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJh bWUpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBLVVJMIHVy bChiYXNlVXJpID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKKyAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50 LCBzdHJsZW4oY29udGVudCkpOworICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNo YXJlZEJ1ZmZlci5yZWxlYXNlKCksIGNvbnRlbnRNaW1lVHlwZSA/IFN0cmluZyhjb250ZW50TWlt ZVR5cGUpIDogInRleHQvaHRtbCIsIGNvbnRlbnRFbmNvZGluZyA/IFN0cmluZyhjb250ZW50RW5j b2RpbmcpIDogIlVURi04IiwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKKworICAgIGNvcmVG cmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KHVybCksIHN1YnN0aXR1dGVEYXRh KTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfcmVxdWVzdDoKICAqIEBmcmFt ZTogYSAjV2ViS2l0V2ViRnJhbWUKICAqIEByZXF1ZXN0OiBhICNXZWJLaXROZXR3b3JrUmVxdWVz dApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmgKaW5kZXggZmNkYWNlNi4uN2UyNDU2NSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5oCkBAIC04MSw2ICs4MSwxNyBAQCBXRUJLSVRfQVBJ IFdlYktpdFdlYkZyYW1lKgogd2Via2l0X3dlYl9mcmFtZV9nZXRfcGFyZW50ICAgICAgICAgKFdl YktpdFdlYkZyYW1lICAgICAgICpmcmFtZSk7CiAKIFdFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl9mcmFtZV9sb2FkX3VyaSAgICAgICAgICAgKFdlYktpdFdlYkZyYW1lICAgICAgICpmcmFtZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAqdXJpKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfc3RyaW5n ICAgICAgICAoV2ViS2l0V2ViRnJhbWUgICAgICAgKmZyYW1lLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICpjb250ZW50LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICptaW1l X3R5cGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmVuY29kaW5nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGdjaGFyICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dFQktJVF9BUEkgdm9pZAogd2Vi a2l0X3dlYl9mcmFtZV9sb2FkX3JlcXVlc3QgICAgICAgKFdlYktpdFdlYkZyYW1lICAgICAgICpm cmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXROZXR3b3Jr UmVxdWVzdCAqcmVxdWVzdCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXgg MGVhNmVkNS4uZDA2NWQ5YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi dmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTYy LDcgKzYyLDYgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJT Y3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIlNjcm9sbGJhci5oIgotI2luY2x1ZGUgIlN1YnN0aXR1 dGVEYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0dPd25QdHIuaD4KIAogI2luY2x1ZGUgPGdkay9nZGtr ZXlzeW1zLmg+CkBAIC0yMDQ4LDEzICsyMDQ3LDIwIEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmll d19jYW5fZ29fZm9yd2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIHJldHVybiBUUlVF OwogfQogCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19vcGVuOgorICogQHdlYl92aWV3OiBhICNX ZWJLaXRXZWJWaWV3CisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVS SSBzdHJpbmcuCisgKgorICogRGVwcmVjYXRlZDogMS4xLjE6IFVzZSB3ZWJraXRfd2ViX3ZpZXdf bG9hZF91cmkoKSBpbnN0ZWFkLgorICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld19vcGVuKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAgZ19yZXR1cm5faWZf ZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwo dXJpKTsKIAotICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgpOwot ICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNvdXJjZVJlcXVlc3QoS1VSTChTdHJpbmc6OmZy b21VVEY4KHVyaSkpKSk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcsIHVy aSk7CiB9CiAKIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlbG9hZChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQpAQCAtMjA3OSwyMCArMjA4NSw1OCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWxvYWRf YnlwYXNzX2NhY2hlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgY29yZSh3ZWJWaWV3KS0+ bWFpbkZyYW1lKCktPmxvYWRlcigpLT5yZWxvYWQodHJ1ZSk7CiB9CiAKLXZvaWQgd2Via2l0X3dl Yl92aWV3X2xvYWRfc3RyaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBj b250ZW50LCBjb25zdCBnY2hhciogY29udGVudE1pbWVUeXBlLCBjb25zdCBnY2hhciogY29udGVu dEVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfdXJpOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAdXJpOiBhbiBV Ukkgc3RyaW5nCisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgc3BlY2lmaWVkIFVSSSBz dHJpbmcuCisgKgorICogU2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xv YWRfdXJpKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAg Z19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwotICAgIGdfcmV0 dXJuX2lmX2ZhaWwoY29udGVudCk7CisgICAgZ19yZXR1cm5faWZfZmFpbCh1cmkpOwogCi0gICAg RnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CisgICAgV2ViS2l0V2Vi RnJhbWUqIGZyYW1lID0gd2ViVmlldy0+cHJpdi0+bWFpbkZyYW1lOworICAgIHdlYmtpdF93ZWJf ZnJhbWVfbG9hZF91cmkoZnJhbWUsIHVyaSk7Cit9CiAKLSAgICBLVVJMIHVybChiYXNlVXJpID8g U3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVy PiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50LCBzdHJsZW4oY29u dGVudCkpOwotICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNoYXJlZEJ1ZmZlci5y ZWxlYXNlKCksIGNvbnRlbnRNaW1lVHlwZSA/IFN0cmluZyhjb250ZW50TWltZVR5cGUpIDogInRl eHQvaHRtbCIsIGNvbnRlbnRFbmNvZGluZyA/IFN0cmluZyhjb250ZW50RW5jb2RpbmcpIDogIlVU Ri04IiwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfc3RyaW5nOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVu dDogYW4gVVJJIHN0cmluZworICogQG1pbWVfdHlwZTogdGhlIE1JTUUgdHlwZSwgb3IgJU5VTEwK KyAqIEBlbmNvZGluZzogdGhlIGVuY29kaW5nLCBvciAlTlVMTAorICogQGJhc2VfdXJpOiB0aGUg YmFzZSBVUkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucworICoKKyAqIFJlcXVlc3RzIGxvYWRpbmcg b2YgdGhlIGdpdmVuIEBjb250ZW50IHdpdGggdGhlIHNwZWNpZmllZCBAbWltZV90eXBlLAorICog QGVuY29kaW5nIGFuZCBAYmFzZV91cmkuCisgKgorICogSWYgQG1pbWVfdHlwZSBpcyAlTlVMTCwg InRleHQvaHRtbCIgaXMgYXNzdW1lZC4KKyAqCisgKiBJZiBAZW5jb2RpbmcgaXMgJU5VTEwsICJV VEYtOCIgaXMgYXNzdW1lZC4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9zdHJpbmco V2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNvbnN0IGdjaGFy KiBtaW1lVHlwZSwgY29uc3QgZ2NoYXIqIGVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVyaSkK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChjb250ZW50KTsKIAotICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9h ZChSZXNvdXJjZVJlcXVlc3QodXJsKSwgc3Vic3RpdHV0ZURhdGEpOworICAgIFdlYktpdFdlYkZy YW1lKiBmcmFtZSA9IHdlYlZpZXctPnByaXYtPm1haW5GcmFtZTsKKyAgICB3ZWJraXRfd2ViX2Zy YW1lX2xvYWRfc3RyaW5nKGZyYW1lLCBjb250ZW50LCBtaW1lVHlwZSwgZW5jb2RpbmcsIGJhc2VV cmkpOwogfQogCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nOgorICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogYW4gVVJJIHN0cmluZwor ICogQGJhc2VfdXJpOiB0aGUgYmFzZSBVUkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucworICoKKyAq IFJlcXVlc3RzIGxvYWRpbmcgb2YgdGhlIGdpdmVuIEBjb250ZW50IHdpdGggdGhlIHNwZWNpZmll ZCBAYmFzZV91cmkuCisgKgorICogRGVwcmVjYXRlZDogMS4xLjE6IFVzZSB3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9zdHJpbmcoKSBpbnN0ZWFkLgorICovCiB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk X2h0bWxfc3RyaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBjb250ZW50 LCBjb25zdCBnY2hhciogYmFzZVVyaSkKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19XRUJfVklFVyh3ZWJWaWV3KSk7CkBAIC0yMTAxLDYgKzIxNDUsMjggQEAgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBn Y2hhciogY29udGUKICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9zdHJpbmcod2ViVmlldywgY29u dGVudCwgTlVMTCwgTlVMTCwgYmFzZVVyaSk7CiB9CiAKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X2xvYWRfcmVxdWVzdDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHJlcXVl c3Q6IGEgI1dlYktpdE5ldHdvcmtSZXF1ZXN0CisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0 aGUgc3BlY2lmaWVkIGFzeW5jaHJvbm91cyBjbGllbnQgcmVxdWVzdC4KKyAqCisgKiBDcmVhdGVz IGEgcHJvdmlzaW9uYWwgZGF0YSBzb3VyY2UgdGhhdCB3aWxsIHRyYW5zaXRpb24gdG8gYSBjb21t aXR0ZWQgZGF0YQorICogc291cmNlIG9uY2UgYW55IGRhdGEgaGFzIGJlZW4gcmVjZWl2ZWQuIFVz ZSB3ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKCkgdG8KKyAqIHN0b3AgdGhlIGxvYWQuCisg KgorICogU2luY2U6IDEuMS4xCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfcmVxdWVz dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVxdWVzdCkK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfTkVUV09SS19SRVFVRVNUKHJlcXVlc3QpKTsK KworICAgIFdlYktpdFdlYkZyYW1lKiBmcmFtZSA9IHdlYlZpZXctPnByaXYtPm1haW5GcmFtZTsK KyAgICB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfcmVxdWVzdChmcmFtZSwgcmVxdWVzdCk7Cit9CisK IHZvaWQgd2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsK ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaCBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAppbmRleCAyYmI4YzYxLi43ZTdiMmNlIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vidmlldy5oCkBAIC0xNzEsMTAgKzE3MSwxNCBAQCBXRUJLSVRfQVBJIHZv aWQKIHdlYmtpdF93ZWJfdmlld19yZWxvYWRfYnlwYXNzX2NhY2hlICAgICAgICAgICAgIChXZWJL aXRXZWJWaWV3ICAgICAgICAqd2ViX3ZpZXcpOwogCiBXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93 ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAg ICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKnVyaSk7CisKK1dFQktJVF9BUEkgdm9pZAog d2Via2l0X3dlYl92aWV3X2xvYWRfc3RyaW5nICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YlZpZXcgICAgICAgICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqY29udGVudCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAg ICAgICAqY29udGVudF9taW1lX3R5cGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKmNvbnRlbnRfZW5jb2Rpbmcs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Z2NoYXIgICAgICAgICAgKm1pbWVfdHlwZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqZW5jb2RpbmcsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmJhc2VfdXJpKTsKIAogV0VCS0lUX0FQSSB2b2lkCkBAIC0xODIsNiArMTg2LDEw IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nICAgICAgICAgICAgICAgIChXZWJL aXRXZWJWaWV3ICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgKmNvbnRlbnQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgKmJhc2VfdXJpKTsKIAorV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdf bG9hZF9yZXF1ZXN0ICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgKndl Yl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdlYktpdE5ldHdvcmtSZXF1ZXN0ICpyZXF1ZXN0KTsKKwogV0VCS0lUX0FQSSBnYm9vbGVhbgog d2Via2l0X3dlYl92aWV3X3NlYXJjaF90ZXh0ICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YlZpZXcgICAgICAgICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAqdGV4dCwK 28030 2009-02-26 12:28:35 -0800 2009-02-28 11:42:27 -0800 Support file paths in _open for compatibility webviewopencompat.diff text/plain 1042 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggNmNkMThhYS4uZjI3OTUyMSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTIwNzAsNiArMjA3MCw3IEBAIGdib29s ZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fZ29fZm9yd2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQogLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfb3BlbjoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0 V2ViVmlldworICogQHVyaTogYW4gVVJJCiAgKgogICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUg c3BlY2lmaWVkIFVSSSBzdHJpbmcuCiAgKgpAQCAtMjA4MCw3ICsyMDgxLDE1IEBAIHZvaWQgd2Vi a2l0X3dlYl92aWV3X29wZW4oV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIHVy aSkKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CiAg ICAgZ19yZXR1cm5faWZfZmFpbCh1cmkpOwogCi0gICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJp KHdlYlZpZXcsIHVyaSk7CisgICAgLy8gV2UgdXNlZCB0byBzdXBwb3J0IGxvY2FsIHBhdGhzLCB1 bmxpa2UgdGhlIG5ld2VyCisgICAgLy8gZnVuY3Rpb24gd2Via2l0X3dlYl92aWV3X2xvYWRfdXJp CisgICAgaWYgKGdfcGF0aF9pc19hYnNvbHV0ZSh1cmkpKSB7CisgICAgICAgIGdjaGFyKiBmaWxl VXJpID0gZ19zdHJkdXBfcHJpbnRmKCJmaWxlOi8vJXMiLCB1cmkpOworICAgICAgICB3ZWJraXRf d2ViX3ZpZXdfbG9hZF91cmkod2ViVmlldywgZmlsZVVyaSk7CisgICAgICAgIGdfZnJlZShmaWxl VXJpKTsKKyAgICB9CisgICAgZWxzZQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmko d2ViVmlldywgdXJpKTsKIH0KIAogdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkKFdlYktpdFdl YlZpZXcqIHdlYlZpZXcpCg==