18281 2008-04-02 09:40:53 -0700 [GTK] add functions to set/get the zoom level 2008-05-30 06:09:04 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All Linux RESOLVED FIXED P4 Normal --- 14998 1 marco.barisione marco.barisione alp christian cosimoc mike.emmel oldest_to_newest 76154 0 marco.barisione 2008-04-02 09:40:53 -0700 WebKit gtk is currently missing an API to set/get the zoom level. I'm going to write a patch to add this feature, using as source of inspiration the win port APIs. 76251 1 20315 marco.barisione 2008-04-03 12:08:17 -0700 Created attachment 20315 Add functions to handle full page/text-only zoom to WebKit gtk The patch does not include documentation and the ChangeLog entry as I'm not sure if the added API is ok. The functions names are copied from the ones in the win port, that are in turn a C++-ificated version of the ones in the mac port. 76252 2 20316 marco.barisione 2008-04-03 12:09:35 -0700 Created attachment 20316 Add zoom buttons to the gtk launcher The first three buttons are for full page zoom, the other three are for text only zoom. 76305 3 20330 marco.barisione 2008-04-04 02:52:19 -0700 Created attachment 20330 Fix some problems with return types I'm not sure that adding some many functions is the right thing. Full-page and text-only zoom are not meant to be used together, so why not having a property to control wether to use the first or the latter? This way we could have zoom_in instead of zoom_page_in and make_text_larger. The same would apply for the other functions. 76321 4 20330 christian 2008-04-04 08:20:58 -0700 Comment on attachment 20330 Fix some problems with return types Nice to see some progress here. Now for my first impression: >+static const gfloat minimumZoomMultiplier = 0.5f; >+static const gfloat maximumZoomMultiplier = 3.0f; >+static const gfloat zoomMultiplierRatio = 1.2f; Where do these values come from? I would hesitate hardcoding anything like that without good reasing since this what determines good choices can vary much depending on the device and display in use. >+WEBKIT_API gfloat >+webkit_web_view_get_text_size_multiplier (WebKitWebView* webView); >+ >+WEBKIT_API void >+webkit_web_view_set_text_size_multiplier (WebKitWebView* webView, gfloat multiplier); I don't recognize from 'multiplier' anywhere else. 'scale' is familiar term to describe this. >+WEBKIT_API gboolean >+webkit_web_view_can_make_text_larger (WebKitWebView* webView); >+ >+WEBKIT_API void >+webkit_web_view_make_text_larger (WebKitWebView* webView); >+ >+WEBKIT_API gboolean >+webkit_web_view_can_make_text_smaller (WebKitWebView* webView); >+ >+WEBKIT_API void >+webkit_web_view_make_text_smaller (WebKitWebView* webView); >+ >+WEBKIT_API gboolean >+webkit_web_view_can_make_text_standard_size (WebKitWebView* webView); >+ >+WEBKIT_API void >+webkit_web_view_make_text_standard_size (WebKitWebView* webView); This terminology makes no sense other than in an OS X application. However reseting the text size multiplier seems useful functionality wise. 76474 5 marco.barisione 2008-04-07 03:41:09 -0700 Full page zoom can be used instead of text-only zoom, not together. So I propose to add a boolean "full-page-zoom" property (or "text-zoom", I don't have better idea atm). If full-page-zoom is set to TRUE then everything is zoomed, else only text size is modified. Then we need a "zoom-level" float property to set/get the zoom level (with the corresponding webkit_web_view_[gs]et_zoom_level() functions). webkit_web_view_zoom_in() and webkit_web_view_zoom_out() could be useful too, but what should the scaling factor be? Other ports use 1.2 but hardcoded values are bad. Adding a "zoom-factor" defaulting to 1.2 could solve the problem but I'm not sure we really need to add another property for this. 76487 6 christian 2008-04-07 05:22:53 -0700 (In reply to comment #5) > Full page zoom can be used instead of text-only zoom, not together. So I > propose to add a boolean "full-page-zoom" property (or "text-zoom", I don't > have better idea atm). If full-page-zoom is set to TRUE then everything is > zoomed, else only text size is modified. Why is that? I don't concider the two options mutually exclusive from a user's point of view. Of course if this just doesn't work out for technical reasons we can't do much about it. > Then we need a "zoom-level" float property to set/get the zoom level (with the > corresponding webkit_web_view_[gs]et_zoom_level() functions). > > webkit_web_view_zoom_in() and webkit_web_view_zoom_out() could be useful too, > but what should the scaling factor be? Other ports use 1.2 but hardcoded values > are bad. Adding a "zoom-factor" defaulting to 1.2 could solve the problem but > I'm not sure we really need to add another property for this. I agree it must be possible to adjust this value from an application. I think zoom-factor should actually be a property of WebKitWebSettings. I suspect an application global value is the proper way to handle this. 76495 7 marco.barisione 2008-04-07 06:45:03 -0700 (In reply to comment #6) > Why is that? I don't concider the two options mutually exclusive from a user's > point of view. Of course if this just doesn't work out for technical reasons we > can't do much about it. WebCore doesn't allow them to be used together, I don't know if it's a just limitation or if there are good reasons. My idea is that the user should not some UI to handle both and it would be very confusing: "hey why do I have to separate zoom in buttons?". IMHO if the user always wants bigger fonts it can set them, otherwise he sould just get full page zoom (at least when webkit is used for a web browser). 76505 8 christian 2008-04-07 08:48:10 -0700 (In reply to comment #7) > (In reply to comment #6) > > Why is that? I don't concider the two options mutually exclusive from a user's > > point of view. Of course if this just doesn't work out for technical reasons we > > can't do much about it. > > WebCore doesn't allow them to be used together, I don't know if it's a just > limitation or if there are good reasons. My idea is that the user should not > some UI to handle both and it would be very confusing: "hey why do I have to > separate zoom in buttons?". > IMHO if the user always wants bigger fonts it can set them, otherwise he sould > just get full page zoom (at least when webkit is used for a web browser). Agreed, the interface for the two means of zooming could be a problem. It might be desirable to get one or two opinions from the mac port crew on this. Or even any more opinions to have a clearer vision before deciding this. 76583 9 marco.barisione 2008-04-08 02:13:31 -0700 (In reply to comment #8) > > WebCore doesn't allow them to be used together, I don't know if it's a just > > limitation or if there are good reasons. My idea is that the user should not > > some UI to handle both and it would be very confusing: "hey why do I have to > > separate zoom in buttons?". > > IMHO if the user always wants bigger fonts it can set them, otherwise he sould > > just get full page zoom (at least when webkit is used for a web browser). > > Agreed, the interface for the two means of zooming could be a problem. It might > be desirable to get one or two opinions from the mac port crew on this. Or even > any more opinions to have a clearer vision before deciding this. I talked a bit with some guys working on the mac port and: 1 - WebCore doesn't allow to have full-page zoom and text-only zoom at the same time 2 - They kept two separate sets of APIs for the two modes for backward compatibility. So I will modify the patch to have a single set of function and a full-page-zoom property (suggestions for better names?) 77271 10 20475 marco.barisione 2008-04-11 04:29:01 -0700 Created attachment 20475 Add functions and properties to handle full-page/text-only zoom APIs to WebKit gtk The new API as discussed on IRC (zoomFactor is still hard-coded). I think this new API is much nicer than the old one. What do you think? I think that the zoom level becomes too big/small too quickly. What about increasing the zoom level with + 0.1 instead of multiplying it with 1.2? 77272 11 20476 marco.barisione 2008-04-11 04:29:43 -0700 Created attachment 20476 Add zoom buttons to GtkLauncher 78374 12 20717 mike.emmel 2008-04-21 00:22:54 -0700 Created attachment 20717 Alternative Zoom patch Here is my version of the zoom patch for comparison. 78506 13 20475 christian 2008-04-21 23:11:06 -0700 Comment on attachment 20475 Add functions and properties to handle full-page/text-only zoom APIs to WebKit gtk >+static const gfloat minimumZoomMultiplier = 0.5f; >+static const gfloat maximumZoomMultiplier = 3.0f; >+static const gfloat zoomMultiplierRatio = 1.2f; I still think these should be exposed in the API. For the sake of this bug I would be willing to add them to WebKitWebSettings myself, after this is landed. >@@ -95,7 +102,9 @@ enum { > PROP_PASTE_TARGET_LIST, > PROP_EDITABLE, > PROP_SETTINGS, >- PROP_TRANSPARENT >+ PROP_TRANSPARENT, >+ PROP_ZOOM_LEVEL, >+ PROP_TEXT_ONLY_ZOOM As for "text-only-zoom" I have two questions: 1. What about calling this "zoom-text-only", to have it align visually with "zoom-level"? 2. Would it make more sense to move this property to WebKitWebSettings? I do not know the answer myself. If anyone has an actual use case I would most appreciate that. >+ g_object_class_install_property(objectClass, PROP_ZOOM_LEVEL, >+ g_param_spec_float("zoom-level", >+ "Zoom level", >+ "The level of zoom of the content", >+ G_MINFLOAT, >+ G_MAXFLOAT, >+ 1, >+ WEBKIT_PARAM_READWRITE)); This is not your fault. But I'm wondering why WebView has a different style when it comes to property installation. I was certainly tempted to criticize you for that =) 80947 14 20717 alp 2008-05-19 21:25:43 -0700 Comment on attachment 20717 Alternative Zoom patch Thanks for the patch. We discussed this and we'll go with Barisione's patch, though he is taking an idea or two from yours. 81598 15 21360 marco.barisione 2008-05-27 07:18:31 -0700 Created attachment 21360 Add zoom functions to WebKit gtk Patch updated with the changes discussed here and on IRC. I'm not sure if zoom-text-only should be a global settings or not. I think that someone could want different zooming modes for different pages. Scaled images are ugly because of bug #19266, but Pierre-Luc has a patch for it. 81601 16 20717 pierre-luc.beaudoin 2008-05-27 07:22:20 -0700 Comment on attachment 20717 Alternative Zoom patch Obsolete upon request from Marco Barisione 81825 17 21407 marco.barisione 2008-05-29 05:57:57 -0700 Created attachment 21407 Add zoom functions to WebKit gtk Updated patch with documentation. 81905 18 alp 2008-05-29 20:48:48 -0700 Landed in r34249. Please examine the commit since it changes a few things: Scale stepping in/out is now linear to avoid rounding errors and incorrect behaviour. Function and property names have changed. Documentation is cleaned up quite a bit. WebSettings copying is fixed now to copy this setting too. I think the new API is awesome ;-) 81925 19 21407 alp 2008-05-30 06:09:04 -0700 Comment on attachment 21407 Add zoom functions to WebKit gtk r+ with changes as mentioned earlier. 20315 2008-04-03 12:08:17 -0700 2008-04-04 02:52:19 -0700 Add functions to handle full page/text-only zoom to WebKit gtk webkit-gtk-zoom.patch text/plain 8814 marco.barisione SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbmUgMzE0NDEpCisr KyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkoY29waWEgbG9jYWxlKQpAQCAt MSw5ICsxLDExIEBACiAvKgorICogIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCBBcHBs ZSwgSW5jLgogICogIENvcHlyaWdodCAoQykgMjAwNyBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhl cgogICogIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBDaHJpc3RpYW4gRHl3YW4gPGNocmlzdGlh bkBpbWVuZGlvLmNvbT4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDcgWGFuIExvcGV6IDx4YW5AZ25v bWUub3JnPgogICogIENvcHlyaWdodCAoQykgMjAwNyBBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29t PgogICogIENvcHlyaWdodCAoQykgMjAwOCBKYW4gQWxvbnpvIDxqbWFsb256b0B1bnBsdWdnYWJs ZS5jb20+CisgKiAgQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQuCiAgKgogICogIFRo aXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQv b3IKICAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVy YWwgUHVibGljCkBAIC01OCw2ICs2MCwxMSBAQAogCiBzdGF0aWMgY29uc3QgZG91YmxlIGRlZmF1 bHREUEkgPSA5Ni4wOwogCisvLyBGSVhNRTogVGhpcyBjb2RlIHNob3VsZCBtb3ZlIGludG8gV2Vi Q29yZSBzbyBpdCBjYW4gYmUgc2hhcmVkIGJ5IGFsbCB0aGUgV2ViS2l0cy4KK3N0YXRpYyBjb25z dCBnZmxvYXQgbWluaW11bVpvb21NdWx0aXBsaWVyID0gMC41ZjsKK3N0YXRpYyBjb25zdCBnZmxv YXQgbWF4aW11bVpvb21NdWx0aXBsaWVyID0gMy4wZjsKK3N0YXRpYyBjb25zdCBnZmxvYXQgem9v bU11bHRpcGxpZXJSYXRpbyA9IDEuMmY7CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTI1NSw2ICsxMjYyLDkgQEAKIAogICAgIHByaXYt PmJhY2tGb3J3YXJkTGlzdCA9IHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfbmV3X3dpdGhf d2ViX3ZpZXcod2ViVmlldyk7CiAKKyAgICBwcml2LT56b29tTXVsdGlwbGllciA9IDEuMGY7Cisg ICAgcHJpdi0+em9vbU11bHRpcGxpZXJJc1RleHRPbmx5ID0gVFJVRTsKKwogI2lmIEdUS19DSEVD S19WRVJTSU9OKDIsMTAsMCkKICAgICBHZGtBdG9tIHRleHRIdG1sID0gZ2RrX2F0b21faW50ZXJu X3N0YXRpY19zdHJpbmcoInRleHQvaHRtbCIpOwogI2Vsc2UKQEAgLTE5MzUsNCArMTk0NSwxNzIg QEAKICAgICBmcmFtZS0+dmlldygpLT5zZXRUcmFuc3BhcmVudChmbGFnKTsKIH0KIAorc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF96b29tX211bHRpcGxpZXIoV2ViS2l0V2ViVmlldyog d2ViVmlldywgZ2Zsb2F0IG11bHRpcGxpZXIsIGdib29sZWFuIGlzVGV4dE9ubHkpCit7CisgICAg V2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIHByaXYtPnpv b21NdWx0aXBsaWVyID0gbXVsdGlwbGllcjsKKyAgICBwcml2LT56b29tTXVsdGlwbGllcklzVGV4 dE9ubHkgPSBpc1RleHRPbmx5OworCisgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+ bWFpbkZyYW1lKCk7CisgICAgZ19yZXR1cm5faWZfZmFpbChmcmFtZSk7CisgICAgZnJhbWUtPnNl dFpvb21GYWN0b3IobXVsdGlwbGllciwgaXNUZXh0T25seSk7CiB9CisKK3ZvaWQgd2Via2l0X3dl Yl92aWV3X3NldF90ZXh0X3NpemVfbXVsdGlwbGllcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBn ZmxvYXQgbXVsdGlwbGllcikKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJf VklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbXVsdGlwbGll cih3ZWJWaWV3LCBtdWx0aXBsaWVyLCBUUlVFKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2V0X3BhZ2Vfc2l6ZV9tdWx0aXBsaWVyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCBt dWx0aXBsaWVyKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdl YlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9tdWx0aXBsaWVyKHdlYlZp ZXcsIG11bHRpcGxpZXIsIEZBTFNFKTsKK30KKworc3RhdGljIGdmbG9hdCB6b29tX211bHRpcGxp ZXIoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkKK3sKKyAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisKKyAgICBpZiAoaXNU ZXh0T25seSAhPSBwcml2LT56b29tTXVsdGlwbGllcklzVGV4dE9ubHkpCisgICAgICAgIHJldHVy biAxLjBmOworICAgIHJldHVybiBwcml2LT56b29tTXVsdGlwbGllcjsKK30KKworZ2Zsb2F0IHdl YmtpdF93ZWJfdmlld19nZXRfdGV4dF9zaXplX211bHRpcGxpZXIoV2ViS2l0V2ViVmlldyogd2Vi VmlldykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2Vi VmlldyksIDEuMGYpOworCisgICAgcmV0dXJuIHpvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBUUlVF KTsKK30KKworZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2dldF9wYWdlX3NpemVfbXVsdGlwbGll cihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdF QktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgMS4wZik7CisKKyAgICByZXR1cm4gem9vbV9tdWx0 aXBsaWVyKHdlYlZpZXcsIEZBTFNFKTsKK30KKworc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJf dmlld19jYW5fem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnYm9vbGVhbiBpc1RleHRP bmx5KQoreworICAgIHJldHVybiB6b29tX211bHRpcGxpZXIod2ViVmlldywgaXNUZXh0T25seSkg LyB6b29tTXVsdGlwbGllclJhdGlvIDwgbWF4aW11bVpvb21NdWx0aXBsaWVyOworfQorCitnYm9v bGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX3pvb21fcGFnZV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJW aWV3KSwgRkFMU0UpOworCisgICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9pbih3 ZWJWaWV3LCBGQUxTRSk7Cit9CisKK2dib29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fbWFrZV90 ZXh0X2xhcmdlcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgRkFMU0UpOworCisgICAgcmV0dXJu IHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9pbih3ZWJWaWV3LCBUUlVFKTsKK30KKworc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3pvb21faW4oV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jv b2xlYW4gaXNUZXh0T25seSkKK3sKKyAgICBpZiAoIXdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9p bih3ZWJWaWV3LCBpc1RleHRPbmx5KSkKKyAgICAgICAgcmV0dXJuOworICAgIHdlYmtpdF93ZWJf dmlld19zZXRfem9vbV9tdWx0aXBsaWVyKHdlYlZpZXcsIHpvb21fbXVsdGlwbGllcih3ZWJWaWV3 LCBpc1RleHRPbmx5KSAqIHpvb21NdWx0aXBsaWVyUmF0aW8sIGlzVGV4dE9ubHkpOworfQorCit2 b2lkIHdlYmtpdF93ZWJfdmlld196b29tX3BhZ2VfaW4oV2ViS2l0V2ViVmlldyogd2ViVmlldykK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisK KyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbih3ZWJWaWV3LCBGQUxTRSk7Cit9CisKK3ZvaWQg d2Via2l0X3dlYl92aWV3X21ha2VfdGV4dF9sYXJnZXIoV2ViS2l0V2ViVmlldyogd2ViVmlldykK K3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisK KyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbih3ZWJWaWV3LCBUUlVFKTsKK30KKworc3RhdGlj IGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9vdXQoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkKK3sKKyAgICByZXR1cm4gem9vbV9tdWx0aXBsaWVy KHdlYlZpZXcsIGlzVGV4dE9ubHkpIC8gem9vbU11bHRpcGxpZXJSYXRpbyA+IG1pbmltdW1ab29t TXVsdGlwbGllcjsKK30KKworZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2Nhbl96b29tX3BhZ2Vf b3V0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwo V0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBGQUxTRSk7CisKKyAgICByZXR1cm4gd2Via2l0 X3dlYl92aWV3X2Nhbl96b29tX291dCh3ZWJWaWV3LCBGQUxTRSk7Cit9CisKK2dib29sZWFuIHdl YmtpdF93ZWJfdmlld19jYW5fbWFrZV90ZXh0X3NtYWxsZXIoV2ViS2l0V2ViVmlldyogd2ViVmll dykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmll dyksIEZBTFNFKTsKKworICAgIHJldHVybiB3ZWJraXRfd2ViX3ZpZXdfY2FuX3pvb21fb3V0KHdl YlZpZXcsIFRSVUUpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQo V2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkKK3sKKyAgICBpZiAo IXdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9vdXQod2ViVmlldywgaXNUZXh0T25seSkpCisgICAg ICAgIHJldHVybjsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbXVsdGlwbGllcih3ZWJW aWV3LCB6b29tX211bHRpcGxpZXIod2ViVmlldywgaXNUZXh0T25seSkgLyB6b29tTXVsdGlwbGll clJhdGlvLCBpc1RleHRPbmx5KTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9wYWdl X291dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld196b29tX291 dCh3ZWJWaWV3LCBGQUxTRSk7Cit9CisKK3ZvaWQgd2Via2l0X3dlYl92aWV3X21ha2VfdGV4dF9z bWFsbGVyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChX RUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAgd2Via2l0X3dlYl92aWV3X3pvb21f b3V0KHdlYlZpZXcsIFRSVUUpOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3 X2Nhbl9yZXNldF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdib29sZWFuIGlzVGV4dE9u bHkpCit7CisgICAgcmV0dXJuIHpvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBpc1RleHRPbmx5KSAh PSAxLjBmOworfQorCitnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX3Jlc2V0X3BhZ2Vfem9v bShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdF QktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgRkFMU0UpOworCisgICAgd2Via2l0X3dlYl92aWV3 X2Nhbl9yZXNldF96b29tKHdlYlZpZXcsIEZBTFNFKTsKK30KKworZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X2Nhbl9tYWtlX3RleHRfc3RhbmRhcmRfc2l6ZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3 KSwgRkFMU0UpOworCisgICAgd2Via2l0X3dlYl92aWV3X2Nhbl9yZXNldF96b29tKHdlYlZpZXcs IFRSVUUpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVzZXRfem9vbShXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBnYm9vbGVhbiBpc1RleHRPbmx5KQoreworICAgIGlmICghd2Vi a2l0X3dlYl92aWV3X2Nhbl9yZXNldF96b29tKHdlYlZpZXcsIGlzVGV4dE9ubHkpKQorICAgICAg ICByZXR1cm47CisgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX211bHRpcGxpZXIod2ViVmll dywgMS4wZiwgaXNUZXh0T25seSk7Cit9CisKK3ZvaWQgd2Via2l0X3dlYl92aWV3X3Jlc2V0X3Bh Z2Vfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwo V0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19yZXNl dF96b29tKHdlYlZpZXcsIEZBTFNFKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbWFrZV90 ZXh0X3N0YW5kYXJkX3NpemUoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2Vi X3ZpZXdfcmVzZXRfem9vbSh3ZWJWaWV3LCBUUlVFKTsKK30KKworfQpJbmRleDogV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuaAkocmV2aXNpb25lIDMxNDQxKQorKysgV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2Vidmlldy5oCShjb3BpYSBsb2NhbGUpCkBAIC0yMTcsNiArMjE3LDU0IEBACiBXRUJL SVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19zZXRfdHJhbnNwYXJlbnQgKFdlYktpdFdlYlZp ZXcqIHdlYl92aWV3LCBnYm9vbGVhbiBmbGFnKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Vi a2l0X3dlYl92aWV3X2dldF9wYWdlX3NpemVfbXVsdGlwbGllciAoV2ViS2l0V2ViVmlldyogd2Vi Vmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X3NldF9wYWdlX3NpemVf bXVsdGlwbGllciAoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Zsb2F0IG11bHRpcGxpZXIpOwor CitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX3pvb21fcGFnZV9pbiAo V2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92 aWV3X3pvb21fcGFnZV9pbiAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkg Z2Jvb2xlYW4KK3dlYmtpdF93ZWJfdmlld19jYW5fem9vbV9wYWdlX291dCAoV2ViS2l0V2ViVmll dyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X3pvb21fcGFn ZV9vdXQgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCitXRUJLSVRfQVBJIGdib29sZWFuCit3 ZWJraXRfd2ViX3ZpZXdfY2FuX3Jlc2V0X3BhZ2Vfem9vbSAoV2ViS2l0V2ViVmlldyogd2ViVmll dyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X3Jlc2V0X3BhZ2Vfem9vbSAo V2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgZ2Zsb2F0Cit3ZWJraXRfd2Vi X3ZpZXdfZ2V0X3RleHRfc2l6ZV9tdWx0aXBsaWVyIChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsK KworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfc2V0X3RleHRfc2l6ZV9tdWx0aXBs aWVyIChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnZmxvYXQgbXVsdGlwbGllcik7CisKK1dFQktJ VF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF93ZWJfdmlld19jYW5fbWFrZV90ZXh0X2xhcmdlciAoV2Vi S2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3 X21ha2VfdGV4dF9sYXJnZXIgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCitXRUJLSVRfQVBJ IGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX21ha2VfdGV4dF9zbWFsbGVyIChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbWFr ZV90ZXh0X3NtYWxsZXIgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCitXRUJLSVRfQVBJIGdi b29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX21ha2VfdGV4dF9zdGFuZGFyZF9zaXplIChXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdf bWFrZV90ZXh0X3N0YW5kYXJkX3NpemUgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCiBHX0VO RF9ERUNMUwogCiAjZW5kaWYKSW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgJKHJldmlz aW9uZSAzMTQ0MSkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAkoY29waWEg bG9jYWxlKQpAQCAtODYsNiArODYsOSBAQAogICAgICAgICBHdGtUYXJnZXRMaXN0KiBwYXN0ZV90 YXJnZXRfbGlzdDsKIAogICAgICAgICBnYm9vbGVhbiB0cmFuc3BhcmVudDsKKworICAgICAgICBn ZmxvYXQgem9vbU11bHRpcGxpZXI7CisgICAgICAgIGdmbG9hdCB6b29tTXVsdGlwbGllcklzVGV4 dE9ubHk7CiAgICAgfTsKIAogICAgICNkZWZpbmUgV0VCS0lUX1dFQl9GUkFNRV9HRVRfUFJJVkFU RShvYmopICAgIChHX1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoKG9iaiksIFdFQktJVF9UWVBF X1dFQl9GUkFNRSwgV2ViS2l0V2ViRnJhbWVQcml2YXRlKSkK 20316 2008-04-03 12:09:35 -0700 2008-04-11 04:29:43 -0700 Add zoom buttons to the gtk launcher gtk-launcher-zoom.patch text/plain 2619 marco.barisione SW5kZXg6IFdlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMJKHJldmlzaW9uZSAzMTQ0MSkKKysrIFdlYktpdFRv b2xzL0d0a0xhdW5jaGVyL21haW4uYwkoY29waWEgbG9jYWxlKQpAQCAtMzUsNiArMzUsOCBAQAog c3RhdGljIGdpbnQgbG9hZF9wcm9ncmVzczsKIHN0YXRpYyBndWludCBzdGF0dXNfY29udGV4dF9p ZDsKIAordHlwZWRlZiBnYm9vbGVhbiAoKlpvb21GdW5jdGlvbikgKFdlYktpdFdlYlZpZXcqKTsK Kwogc3RhdGljIHZvaWQKIGFjdGl2YXRlX3VyaV9lbnRyeV9jYiAoR3RrV2lkZ2V0KiBlbnRyeSwg Z3BvaW50ZXIgZGF0YSkKIHsKQEAgLTQ0LDYgKzQ2LDEzIEBACiB9CiAKIHN0YXRpYyB2b2lkCit6 b29tX2NiIChHdGtXaWRnZXQqIHdpZGdldCwgZ3BvaW50ZXIgZGF0YSkKK3sKKyAgICBab29tRnVu Y3Rpb24gem9vbV9mdW5jdGlvbiA9IGRhdGE7CisgICAgem9vbV9mdW5jdGlvbiAod2ViX3ZpZXcp OworfQorCitzdGF0aWMgdm9pZAogdXBkYXRlX3RpdGxlIChHdGtXaW5kb3cqIHdpbmRvdykKIHsK ICAgICBHU3RyaW5nKiBzdHJpbmcgPSBnX3N0cmluZ19uZXcgKG1haW5fdGl0bGUpOwpAQCAtMTY1 LDYgKzE3NCwzOCBAQAogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZCAoR19PQkpFQ1QgKGl0 ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0sgKGFjdGl2YXRlX3VyaV9lbnRyeV9jYiksIChncG9p bnRlcil1cmlfZW50cnkpOwogICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRv b2xiYXIpLCBpdGVtLCAtMSk7CiAKKyAgICAvKiBGdWxsIHBhZ2Ugem9vbSAqLworICAgIGl0ZW0g PSBndGtfc2VwYXJhdG9yX3Rvb2xfaXRlbV9uZXcgKCk7CisgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0 IChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworCisgICAgaXRlbSA9IGd0a190b29s X2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX1pPT01fT1VUKTsKKyAgICBnX3NpZ25h bF9jb25uZWN0IChHX09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoem9vbV9j YiksIChncG9pbnRlcil3ZWJraXRfd2ViX3ZpZXdfem9vbV9wYWdlX291dCk7CisgICAgZ3RrX3Rv b2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKKworICAgIGl0 ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2sgKEdUS19TVE9DS19aT09NXzEwMCk7 CisgICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FM TEJBQ0sgKHpvb21fY2IpLCAoZ3BvaW50ZXIpd2Via2l0X3dlYl92aWV3X3Jlc2V0X3BhZ2Vfem9v bSk7CisgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0s IC0xKTsKKworICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2sgKEdUS19T VE9DS19aT09NX0lOKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAoaXRlbSksICJj bGlja2VkIiwgR19DQUxMQkFDSyAoem9vbV9jYiksIChncG9pbnRlcil3ZWJraXRfd2ViX3ZpZXdf em9vbV9wYWdlX2luKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29s YmFyKSwgaXRlbSwgLTEpOworCisgICAgLyogVGV4dCB6b29tICovCisgICAgaXRlbSA9IGd0a19z ZXBhcmF0b3JfdG9vbF9pdGVtX25ldyAoKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19U T09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisKKyAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9u X25ld19mcm9tX3N0b2NrIChHVEtfU1RPQ0tfWk9PTV9PVVQpOworICAgIGdfc2lnbmFsX2Nvbm5l Y3QgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLICh6b29tX2NiKSwgKGdw b2ludGVyKXdlYmtpdF93ZWJfdmlld19tYWtlX3RleHRfc21hbGxlcik7CisgICAgZ3RrX3Rvb2xi YXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKKworICAgIGl0ZW0g PSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21fc3RvY2sgKEdUS19TVE9DS19aT09NXzEwMCk7Cisg ICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJB Q0sgKHpvb21fY2IpLCAoZ3BvaW50ZXIpd2Via2l0X3dlYl92aWV3X21ha2VfdGV4dF9zdGFuZGFy ZF9zaXplKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwg aXRlbSwgLTEpOworCisgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAo R1RLX1NUT0NLX1pPT01fSU4pOworICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpdGVt KSwgImNsaWNrZWQiLCBHX0NBTExCQUNLICh6b29tX2NiKSwgKGdwb2ludGVyKXdlYmtpdF93ZWJf dmlld19tYWtlX3RleHRfbGFyZ2VyKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09M QkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOworCiAgICAgcmV0dXJuIHRvb2xiYXI7CiB9CiAK 20330 2008-04-04 02:52:19 -0700 2008-04-11 04:29:01 -0700 Fix some problems with return types webkit-gtk-zoom.patch text/plain 8952 marco.barisione SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbmUgMzE0NDEpCisr KyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkoY29waWEgbG9jYWxlKQpAQCAt MSw5ICsxLDExIEBACiAvKgorICogIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCBBcHBs ZSwgSW5jLgogICogIENvcHlyaWdodCAoQykgMjAwNyBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhl cgogICogIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBDaHJpc3RpYW4gRHl3YW4gPGNocmlzdGlh bkBpbWVuZGlvLmNvbT4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDcgWGFuIExvcGV6IDx4YW5AZ25v bWUub3JnPgogICogIENvcHlyaWdodCAoQykgMjAwNyBBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29t PgogICogIENvcHlyaWdodCAoQykgMjAwOCBKYW4gQWxvbnpvIDxqbWFsb256b0B1bnBsdWdnYWJs ZS5jb20+CisgKiAgQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQuCiAgKgogICogIFRo aXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQv b3IKICAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVy YWwgUHVibGljCkBAIC01OCw2ICs2MCwxMSBAQAogCiBzdGF0aWMgY29uc3QgZG91YmxlIGRlZmF1 bHREUEkgPSA5Ni4wOwogCisvLyBGSVhNRTogVGhpcyBjb2RlIHNob3VsZCBtb3ZlIGludG8gV2Vi Q29yZSBzbyBpdCBjYW4gYmUgc2hhcmVkIGJ5IGFsbCB0aGUgV2ViS2l0cy4KK3N0YXRpYyBjb25z dCBnZmxvYXQgbWluaW11bVpvb21NdWx0aXBsaWVyID0gMC41ZjsKK3N0YXRpYyBjb25zdCBnZmxv YXQgbWF4aW11bVpvb21NdWx0aXBsaWVyID0gMy4wZjsKK3N0YXRpYyBjb25zdCBnZmxvYXQgem9v bU11bHRpcGxpZXJSYXRpbyA9IDEuMmY7CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTI1NSw2ICsxMjYyLDkgQEAKIAogICAgIHByaXYt PmJhY2tGb3J3YXJkTGlzdCA9IHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfbmV3X3dpdGhf d2ViX3ZpZXcod2ViVmlldyk7CiAKKyAgICBwcml2LT56b29tTXVsdGlwbGllciA9IDEuMGY7Cisg ICAgcHJpdi0+em9vbU11bHRpcGxpZXJJc1RleHRPbmx5ID0gVFJVRTsKKwogI2lmIEdUS19DSEVD S19WRVJTSU9OKDIsMTAsMCkKICAgICBHZGtBdG9tIHRleHRIdG1sID0gZ2RrX2F0b21faW50ZXJu X3N0YXRpY19zdHJpbmcoInRleHQvaHRtbCIpOwogI2Vsc2UKQEAgLTE5MzUsNCArMTk0NSwxNzIg QEAKICAgICBmcmFtZS0+dmlldygpLT5zZXRUcmFuc3BhcmVudChmbGFnKTsKIH0KIAorc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF96b29tX211bHRpcGxpZXIoV2ViS2l0V2ViVmlldyog d2ViVmlldywgZ2Zsb2F0IG11bHRpcGxpZXIsIGdib29sZWFuIGlzVGV4dE9ubHkpCit7CisgICAg V2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIHByaXYtPnpv b21NdWx0aXBsaWVyID0gbXVsdGlwbGllcjsKKyAgICBwcml2LT56b29tTXVsdGlwbGllcklzVGV4 dE9ubHkgPSBpc1RleHRPbmx5OworCisgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+ bWFpbkZyYW1lKCk7CisgICAgZ19yZXR1cm5faWZfZmFpbChmcmFtZSk7CisgICAgZnJhbWUtPnNl dFpvb21GYWN0b3IobXVsdGlwbGllciwgaXNUZXh0T25seSk7CiB9CisKK3ZvaWQgd2Via2l0X3dl Yl92aWV3X3NldF90ZXh0X3NpemVfbXVsdGlwbGllcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBn ZmxvYXQgbXVsdGlwbGllcikKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJf VklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbXVsdGlwbGll cih3ZWJWaWV3LCBtdWx0aXBsaWVyLCBUUlVFKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2V0X3BhZ2Vfc2l6ZV9tdWx0aXBsaWVyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCBt dWx0aXBsaWVyKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdl YlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9tdWx0aXBsaWVyKHdlYlZp ZXcsIG11bHRpcGxpZXIsIEZBTFNFKTsKK30KKworc3RhdGljIGdmbG9hdCB3ZWJraXRfd2ViX3Zp ZXdfem9vbV9tdWx0aXBsaWVyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdib29sZWFuIGlzVGV4 dE9ubHkpCit7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2 OworCisgICAgaWYgKGlzVGV4dE9ubHkgIT0gcHJpdi0+em9vbU11bHRpcGxpZXJJc1RleHRPbmx5 KQorICAgICAgICByZXR1cm4gMS4wZjsKKyAgICByZXR1cm4gcHJpdi0+em9vbU11bHRpcGxpZXI7 Cit9CisKK2dmbG9hdCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RleHRfc2l6ZV9tdWx0aXBsaWVyKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lU X0lTX1dFQl9WSUVXKHdlYlZpZXcpLCAxLjBmKTsKKworICAgIHJldHVybiB3ZWJraXRfd2ViX3Zp ZXdfem9vbV9tdWx0aXBsaWVyKHdlYlZpZXcsIFRSVUUpOworfQorCitnZmxvYXQgd2Via2l0X3dl Yl92aWV3X2dldF9wYWdlX3NpemVfbXVsdGlwbGllcihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQor eworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwg MS4wZik7CisKKyAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X3pvb21fbXVsdGlwbGllcih3ZWJW aWV3LCBGQUxTRSk7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX3pv b21faW4oV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkKK3sKKyAg ICByZXR1cm4gd2Via2l0X3dlYl92aWV3X3pvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBpc1RleHRP bmx5KSAvIHpvb21NdWx0aXBsaWVyUmF0aW8gPCBtYXhpbXVtWm9vbU11bHRpcGxpZXI7Cit9CisK K2dib29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9wYWdlX2luKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVX KHdlYlZpZXcpLCBGQUxTRSk7CisKKyAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X2Nhbl96b29t X2luKHdlYlZpZXcsIEZBTFNFKTsKK30KKworZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2Nhbl9t YWtlX3RleHRfbGFyZ2VyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5f dmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBGQUxTRSk7CisKKyAgICBy ZXR1cm4gd2Via2l0X3dlYl92aWV3X2Nhbl96b29tX2luKHdlYlZpZXcsIFRSVUUpOworfQorCitz dGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBnYm9vbGVhbiBpc1RleHRPbmx5KQoreworICAgIGlmICghd2Via2l0X3dlYl92aWV3X2Nhbl96 b29tX2luKHdlYlZpZXcsIGlzVGV4dE9ubHkpKQorICAgICAgICByZXR1cm47CisgICAgd2Via2l0 X3dlYl92aWV3X3NldF96b29tX211bHRpcGxpZXIod2ViVmlldywgd2Via2l0X3dlYl92aWV3X3pv b21fbXVsdGlwbGllcih3ZWJWaWV3LCBpc1RleHRPbmx5KSAqIHpvb21NdWx0aXBsaWVyUmF0aW8s IGlzVGV4dE9ubHkpOworfQorCit2b2lkIHdlYmtpdF93ZWJfdmlld196b29tX3BhZ2VfaW4oV2Vi S2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19X RUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbih3ZWJWaWV3 LCBGQUxTRSk7Cit9CisKK3ZvaWQgd2Via2l0X3dlYl92aWV3X21ha2VfdGV4dF9sYXJnZXIoV2Vi S2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19X RUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbV9pbih3ZWJWaWV3 LCBUUlVFKTsKK30KKworc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9v dXQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkKK3sKKyAgICBy ZXR1cm4gd2Via2l0X3dlYl92aWV3X3pvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBpc1RleHRPbmx5 KSAvIHpvb21NdWx0aXBsaWVyUmF0aW8gPiBtaW5pbXVtWm9vbU11bHRpcGxpZXI7Cit9CisKK2di b29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9wYWdlX291dChXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3 ZWJWaWV3KSwgRkFMU0UpOworCisgICAgcmV0dXJuIHdlYmtpdF93ZWJfdmlld19jYW5fem9vbV9v dXQod2ViVmlldywgRkFMU0UpOworfQorCitnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX21h a2VfdGV4dF9zbWFsbGVyKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5f dmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBGQUxTRSk7CisKKyAgICBy ZXR1cm4gd2Via2l0X3dlYl92aWV3X2Nhbl96b29tX291dCh3ZWJWaWV3LCBUUlVFKTsKK30KKwor c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3pvb21fb3V0KFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIGdib29sZWFuIGlzVGV4dE9ubHkpCit7CisgICAgaWYgKCF3ZWJraXRfd2ViX3ZpZXdfY2Fu X3pvb21fb3V0KHdlYlZpZXcsIGlzVGV4dE9ubHkpKQorICAgICAgICByZXR1cm47CisgICAgd2Vi a2l0X3dlYl92aWV3X3NldF96b29tX211bHRpcGxpZXIod2ViVmlldywgd2Via2l0X3dlYl92aWV3 X3pvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBpc1RleHRPbmx5KSAvIHpvb21NdWx0aXBsaWVyUmF0 aW8sIGlzVGV4dE9ubHkpOworfQorCit2b2lkIHdlYmtpdF93ZWJfdmlld196b29tX3BhZ2Vfb3V0 KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRf SVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAgd2Via2l0X3dlYl92aWV3X3pvb21fb3V0KHdl YlZpZXcsIEZBTFNFKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbWFrZV90ZXh0X3NtYWxs ZXIoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJ VF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQo d2ViVmlldywgVFJVRSk7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2Fu X3Jlc2V0X3pvb20oV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gaXNUZXh0T25seSkK K3sKKyAgICByZXR1cm4gd2Via2l0X3dlYl92aWV3X3pvb21fbXVsdGlwbGllcih3ZWJWaWV3LCBp c1RleHRPbmx5KSAhPSAxLjBmOworfQorCitnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX3Jl c2V0X3BhZ2Vfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3Zh bF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgRkFMU0UpOworCisgICAgcmV0 dXJuIHdlYmtpdF93ZWJfdmlld19jYW5fcmVzZXRfem9vbSh3ZWJWaWV3LCBGQUxTRSk7Cit9CisK K2dib29sZWFuIHdlYmtpdF93ZWJfdmlld19jYW5fbWFrZV90ZXh0X3N0YW5kYXJkX3NpemUoV2Vi S2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRf SVNfV0VCX1ZJRVcod2ViVmlldyksIEZBTFNFKTsKKworICAgIHJldHVybiB3ZWJraXRfd2ViX3Zp ZXdfY2FuX3Jlc2V0X3pvb20od2ViVmlldywgVFJVRSk7Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19yZXNldF96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdib29sZWFuIGlz VGV4dE9ubHkpCit7CisgICAgaWYgKCF3ZWJraXRfd2ViX3ZpZXdfY2FuX3Jlc2V0X3pvb20od2Vi VmlldywgaXNUZXh0T25seSkpCisgICAgICAgIHJldHVybjsKKyAgICB3ZWJraXRfd2ViX3ZpZXdf c2V0X3pvb21fbXVsdGlwbGllcih3ZWJWaWV3LCAxLjBmLCBpc1RleHRPbmx5KTsKK30KKwordm9p ZCB3ZWJraXRfd2ViX3ZpZXdfcmVzZXRfcGFnZV96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcp Cit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwor CisgICAgd2Via2l0X3dlYl92aWV3X3Jlc2V0X3pvb20od2ViVmlldywgRkFMU0UpOworfQorCit2 b2lkIHdlYmtpdF93ZWJfdmlld19tYWtlX3RleHRfc3RhbmRhcmRfc2l6ZShXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdl YlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19yZXNldF96b29tKHdlYlZpZXcsIFRSVUUp OworfQorCit9CkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCShyZXZpc2lvbmUgMzE0 NDEpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgJKGNvcGlhIGxvY2FsZSkK QEAgLTIxNyw2ICsyMTcsNTQgQEAKIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl92aWV3X3Nl dF90cmFuc3BhcmVudCAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIGdib29sZWFuIGZsYWcpOwog CitXRUJLSVRfQVBJIGdmbG9hdAord2Via2l0X3dlYl92aWV3X2dldF9wYWdlX3NpemVfbXVsdGlw bGllciAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0 X3dlYl92aWV3X3NldF9wYWdlX3NpemVfbXVsdGlwbGllciAoV2ViS2l0V2ViVmlldyogd2ViVmll dywgZ2Zsb2F0IG11bHRpcGxpZXIpOworCitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2Vi X3ZpZXdfY2FuX3pvb21fcGFnZV9pbiAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJ VF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X3pvb21fcGFnZV9pbiAoV2ViS2l0V2ViVmlldyog d2ViVmlldyk7CisKK1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF93ZWJfdmlld19jYW5fem9v bV9wYWdlX291dCAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAor d2Via2l0X3dlYl92aWV3X3pvb21fcGFnZV9vdXQgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOwor CitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX3Jlc2V0X3BhZ2Vfem9v bSAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl92aWV3X3Jlc2V0X3BhZ2Vfem9vbSAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJ VF9BUEkgZ2Zsb2F0Cit3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RleHRfc2l6ZV9tdWx0aXBsaWVyIChX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3Zp ZXdfc2V0X3RleHRfc2l6ZV9tdWx0aXBsaWVyIChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnZmxv YXQgbXVsdGlwbGllcik7CisKK1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF93ZWJfdmlld19j YW5fbWFrZV90ZXh0X2xhcmdlciAoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9B UEkgdm9pZAord2Via2l0X3dlYl92aWV3X21ha2VfdGV4dF9sYXJnZXIgKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpOworCitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX21h a2VfdGV4dF9zbWFsbGVyIChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQSSB2 b2lkCit3ZWJraXRfd2ViX3ZpZXdfbWFrZV90ZXh0X3NtYWxsZXIgKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcpOworCitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfY2FuX21ha2Vf dGV4dF9zdGFuZGFyZF9zaXplIChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQ SSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbWFrZV90ZXh0X3N0YW5kYXJkX3NpemUgKFdlYktpdFdl YlZpZXcqIHdlYlZpZXcpOworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYKSW5kZXg6IFdlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmgJKHJldmlzaW9uZSAzMTQ0MSkKKysrIFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHByaXZhdGUuaAkoY29waWEgbG9jYWxlKQpAQCAtODYsNiArODYsOSBAQAogICAgICAg ICBHdGtUYXJnZXRMaXN0KiBwYXN0ZV90YXJnZXRfbGlzdDsKIAogICAgICAgICBnYm9vbGVhbiB0 cmFuc3BhcmVudDsKKworICAgICAgICBnZmxvYXQgem9vbU11bHRpcGxpZXI7CisgICAgICAgIGdm bG9hdCB6b29tTXVsdGlwbGllcklzVGV4dE9ubHk7CiAgICAgfTsKIAogICAgICNkZWZpbmUgV0VC S0lUX1dFQl9GUkFNRV9HRVRfUFJJVkFURShvYmopICAgIChHX1RZUEVfSU5TVEFOQ0VfR0VUX1BS SVZBVEUoKG9iaiksIFdFQktJVF9UWVBFX1dFQl9GUkFNRSwgV2ViS2l0V2ViRnJhbWVQcml2YXRl KSkK 20475 2008-04-11 04:29:01 -0700 2008-05-27 07:18:31 -0700 Add functions and properties to handle full-page/text-only zoom APIs to WebKit gtk webkit-gtk-zoom.patch text/plain 7735 marco.barisione ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaCBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCBlNjhmZjZjLi43NTkzNzc2IDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC04NSw2ICs4NSw5IEBAIGV4dGVybiAiQyIgewogICAg ICAgICBHdGtUYXJnZXRMaXN0KiBwYXN0ZV90YXJnZXRfbGlzdDsKIAogICAgICAgICBnYm9vbGVh biB0cmFuc3BhcmVudDsKKworICAgICAgICBnZmxvYXQgem9vbUxldmVsOworICAgICAgICBnYm9v bGVhbiB0ZXh0T25seVpvb207CiAgICAgfTsKIAogICAgICNkZWZpbmUgV0VCS0lUX1dFQl9GUkFN RV9HRVRfUFJJVkFURShvYmopICAgIChHX1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoKG9iaiks IFdFQktJVF9UWVBFX1dFQl9GUkFNRSwgV2ViS2l0V2ViRnJhbWVQcml2YXRlKSkKZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggY2Q5ZGRmYy4uMDc4NmIzZiAxMDA2NDQKLS0tIGEv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTEsOSArMSwxMSBAQAogLyoKKyAqICBDb3B5cmlnaHQg KEMpIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUsIEluYy4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDcg SG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIKICAqICBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgg Q2hyaXN0aWFuIER5d2FuIDxjaHJpc3RpYW5AaW1lbmRpby5jb20+CiAgKiAgQ29weXJpZ2h0IChD KSAyMDA3IFhhbiBMb3BleiA8eGFuQGdub21lLm9yZz4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDcg QWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDggSmFuIEFs b256byA8am1hbG9uem9AdW5wbHVnZ2FibGUuY29tPgorICogIENvcHlyaWdodCAoQykgMjAwOCBD b2xsYWJvcmEgTHRkLgogICoKICAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJt cyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwpAQCAtNTgsNiArNjAsMTEgQEAKIAog c3RhdGljIGNvbnN0IGRvdWJsZSBkZWZhdWx0RFBJID0gOTYuMDsKIAorLy8gRklYTUU6IFRoaXMg Y29kZSBzaG91bGQgbW92ZSBpbnRvIFdlYkNvcmUgc28gaXQgY2FuIGJlIHNoYXJlZCBieSBhbGwg dGhlIFdlYktpdHMuCitzdGF0aWMgY29uc3QgZ2Zsb2F0IG1pbmltdW1ab29tTXVsdGlwbGllciA9 IDAuNWY7CitzdGF0aWMgY29uc3QgZ2Zsb2F0IG1heGltdW1ab29tTXVsdGlwbGllciA9IDMuMGY7 CitzdGF0aWMgY29uc3QgZ2Zsb2F0IHpvb21NdWx0aXBsaWVyUmF0aW8gPSAxLjJmOworCiB1c2lu ZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTk1LDcg KzEwMiw5IEBAIGVudW0gewogICAgIFBST1BfUEFTVEVfVEFSR0VUX0xJU1QsCiAgICAgUFJPUF9F RElUQUJMRSwKICAgICBQUk9QX1NFVFRJTkdTLAotICAgIFBST1BfVFJBTlNQQVJFTlQKKyAgICBQ Uk9QX1RSQU5TUEFSRU5ULAorICAgIFBST1BfWk9PTV9MRVZFTCwKKyAgICBQUk9QX1RFWFRfT05M WV9aT09NCiB9OwogCiBzdGF0aWMgZ3VpbnQgd2Via2l0X3dlYl92aWV3X3NpZ25hbHNbTEFTVF9T SUdOQUxdID0geyAwLCB9OwpAQCAtMjE2LDYgKzIyNSwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgR1Zh bHVlKgogICAgIGNhc2UgUFJPUF9UUkFOU1BBUkVOVDoKICAgICAgICAgZ192YWx1ZV9zZXRfYm9v bGVhbih2YWx1ZSwgd2Via2l0X3dlYl92aWV3X2dldF90cmFuc3BhcmVudCh3ZWJWaWV3KSk7CiAg ICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9aT09NX0xFVkVMOgorICAgICAgICBnX3ZhbHVl X3NldF9mbG9hdCh2YWx1ZSwgd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdlYlZpZXcp KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1RFWFRfT05MWV9aT09NOgorICAgICAg ICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RleHRfb25s eV96b29tKHdlYlZpZXcpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAg R19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcF9pZCwgcHNwZWMp OwogICAgIH0KQEAgLTIzNSw2ICsyNTAsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X3NldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIGNvbnN0IEcKICAg ICBjYXNlIFBST1BfVFJBTlNQQVJFTlQ6CiAgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRfdHJh bnNwYXJlbnQod2ViVmlldywgZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSkpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9MRVZFTDoKKyAgICAgICAgd2Via2l0X3dlYl92aWV3 X3NldF96b29tX2xldmVsKHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2Zsb2F0KHZhbHVlKSk7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9URVhUX09OTFlfWk9PTToKKyAgICAgICAgd2Via2l0 X3dlYl92aWV3X3NldF90ZXh0X29ubHlfem9vbSh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9ib29sZWFu KHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNU X1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICB9 CkBAIC0xMTAyLDYgKzExMjMsMjIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNz X2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9Q QVJBTV9SRUFEV1JJVEUpKTsKIAorICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHko b2JqZWN0Q2xhc3MsIFBST1BfWk9PTV9MRVZFTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGdfcGFyYW1fc3BlY19mbG9hdCgiem9vbS1sZXZlbCIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlpvb20gbGV2ZWwiLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJU aGUgbGV2ZWwgb2Ygem9vbSBvZiB0aGUgY29udGVudCIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19NSU5GTE9BVCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX01BWEZMT0FULAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg V0VCS0lUX1BBUkFNX1JFQURXUklURSkpOworCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9w cm9wZXJ0eShvYmplY3RDbGFzcywgUFJPUF9URVhUX09OTFlfWk9PTSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJ0ZXh0LW9ubHktem9v bSIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiVGV4dC1vbmx5IHpvb20iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIldoZXRoZXIgb25seSB0aGUgdGV4dCBzaXplIGlzIGNo YW5nZWQgd2hlbiB6b29taW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOwor CiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFzcywgc2l6ZW9mKFdlYktp dFdlYlZpZXdQcml2YXRlKSk7CiB9CiAKQEAgLTEyNTUsNiArMTI5Miw5IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfdmlld19pbml0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAKICAgICBwcml2 LT5iYWNrRm9yd2FyZExpc3QgPSB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X25ld193aXRo X3dlYl92aWV3KHdlYlZpZXcpOwogCisgICAgcHJpdi0+em9vbUxldmVsID0gMS4wZjsKKyAgICBw cml2LT50ZXh0T25seVpvb20gPSBGQUxTRTsKKwogI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsMTAs MCkKICAgICBHZGtBdG9tIHRleHRIdG1sID0gZ2RrX2F0b21faW50ZXJuX3N0YXRpY19zdHJpbmco InRleHQvaHRtbCIpOwogI2Vsc2UKQEAgLTE5MzUsNCArMTk3NSw3MiBAQCB2b2lkIHdlYmtpdF93 ZWJfdmlld19zZXRfdHJhbnNwYXJlbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4g ZmxhZykKICAgICBmcmFtZS0+dmlldygpLT5zZXRUcmFuc3BhcmVudChmbGFnKTsKIH0KIAorZ2Zs b2F0IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3 KSwgMS4wZik7CisKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnBy aXY7CisgICAgcmV0dXJuIHByaXYtPnpvb21MZXZlbDsKK30KKworc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2FwcGx5X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAg ICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUoKTsKKyAgICBnX3JldHVy bl9pZl9mYWlsKGZyYW1lKTsKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZp ZXctPnByaXY7CisgICAgZnJhbWUtPnNldFpvb21GYWN0b3IocHJpdi0+em9vbUxldmVsLCBwcml2 LT50ZXh0T25seVpvb20pOworfQorCit2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZl bChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnZmxvYXQgem9vbUxldmVsKQoreworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIFdlYktpdFdl YlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKyAgICBpZiAocHJpdi0+em9vbUxl dmVsID09IHpvb21MZXZlbCkKKyAgICAgICAgcmV0dXJuOworCisgICAgcHJpdi0+em9vbUxldmVs ID0gem9vbUxldmVsOworICAgIHdlYmtpdF93ZWJfdmlld19hcHBseV96b29tX2xldmVsKHdlYlZp ZXcpOworCisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAiem9vbS1sZXZl bCIpOworfQorCit2b2lkIHdlYmtpdF93ZWJfdmlld196b29tX2luKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmll dykpOworCisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2Owor ICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJWaWV3LCBwcml2LT56b29tTGV2 ZWwgKiB6b29tTXVsdGlwbGllclJhdGlvKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9v bV9vdXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdF QktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSog cHJpdiA9IHdlYlZpZXctPnByaXY7CisgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVs KHdlYlZpZXcsIHByaXYtPnpvb21MZXZlbCAvIHpvb21NdWx0aXBsaWVyUmF0aW8pOworfQorCitn Ym9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RleHRfb25seV96b29tKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVX KHdlYlZpZXcpLCBGQUxTRSk7CisKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdl YlZpZXctPnByaXY7CisgICAgcmV0dXJuIHByaXYtPnRleHRPbmx5Wm9vbTsKK30KKwordm9pZCB3 ZWJraXRfd2ViX3ZpZXdfc2V0X3RleHRfb25seV96b29tKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IGdib29sZWFuIHRleHRPbmx5Wm9vbSkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19XRUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9 IHdlYlZpZXctPnByaXY7CisgICAgaWYgKHByaXYtPnRleHRPbmx5Wm9vbSA9PSB0ZXh0T25seVpv b20pCisgICAgICByZXR1cm47CisKKyAgICBwcml2LT50ZXh0T25seVpvb20gPSB0ZXh0T25seVpv b207CisgICAgd2Via2l0X3dlYl92aWV3X2FwcGx5X3pvb21fbGV2ZWwod2ViVmlldyk7CisKKyAg ICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qod2ViVmlldyksICJ0ZXh0LW9ubHktem9vbSIpOwor fQorCiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmggYi9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKaW5kZXggMGM1YTY3NS4uZDNkMjJhNyAx MDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCisrKyBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaApAQCAtMjE3LDYgKzIxNywyNCBAQCB3ZWJraXRf d2ViX3ZpZXdfZ2V0X3RyYW5zcGFyZW50IChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldyk7CiBXRUJL SVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19zZXRfdHJhbnNwYXJlbnQgKFdlYktpdFdlYlZp ZXcqIHdlYl92aWV3LCBnYm9vbGVhbiBmbGFnKTsKIAorV0VCS0lUX0FQSSBnZmxvYXQKK3dlYmtp dF93ZWJfdmlld19nZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VC S0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmll dyogd2ViVmlldywgZ2Zsb2F0IHpvb21MZXZlbCk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0 X3dlYl92aWV3X3pvb21faW4oV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkg dm9pZAord2Via2l0X3dlYl92aWV3X3pvb21fb3V0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOwor CitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RleHRfb25seV96b29t KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJf dmlld19zZXRfdGV4dF9vbmx5X3pvb20oV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4g dGV4dE9ubHlab29tKTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCg== 20476 2008-04-11 04:29:43 -0700 2008-04-11 04:29:43 -0700 Add zoom buttons to GtkLauncher gtk-launcher-zoom.patch text/plain 2187 marco.barisione ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xz L0d0a0xhdW5jaGVyL21haW4uYwppbmRleCA4ZWQyNjkwLi5hMzlkODg3IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKKysrIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNo ZXIvbWFpbi5jCkBAIC00NCw2ICs0NCwzMCBAQCBhY3RpdmF0ZV91cmlfZW50cnlfY2IgKEd0a1dp ZGdldCogZW50cnksIGdwb2ludGVyIGRhdGEpCiB9CiAKIHN0YXRpYyB2b2lkCit6b29tX291dF9j YiAoR3RrV2lkZ2V0KiB3aWRnZXQsIGdwb2ludGVyIGRhdGEpCit7CisgICAgd2Via2l0X3dlYl92 aWV3X3pvb21fb3V0ICh3ZWJfdmlldyk7Cit9CisKK3N0YXRpYyB2b2lkCit6b29tX2luX2NiIChH dGtXaWRnZXQqIHdpZGdldCwgZ3BvaW50ZXIgZGF0YSkKK3sKKyAgICB3ZWJraXRfd2ViX3ZpZXdf em9vbV9pbiAod2ViX3ZpZXcpOworfQorCitzdGF0aWMgdm9pZAorcmVzZXRfem9vbV9jYiAoR3Rr V2lkZ2V0KiB3aWRnZXQsIGdwb2ludGVyIGRhdGEpCit7CisgICAgd2Via2l0X3dlYl92aWV3X3Nl dF96b29tX2xldmVsICh3ZWJfdmlldywgMSk7Cit9CisKK3N0YXRpYyB2b2lkCit6b29tX3RvZ2ds ZWRfY2IgKEd0a1RvZ2dsZUJ1dHRvbiogdG9nZ2xlLCBncG9pbnRlciBkYXRhKQoreworICAgIHdl YmtpdF93ZWJfdmlld19zZXRfdGV4dF9vbmx5X3pvb20gKHdlYl92aWV3LCBndGtfdG9nZ2xlX2J1 dHRvbl9nZXRfYWN0aXZlICh0b2dnbGUpKTsKK30KKworc3RhdGljIHZvaWQKIHVwZGF0ZV90aXRs ZSAoR3RrV2luZG93KiB3aW5kb3cpCiB7CiAgICAgR1N0cmluZyogc3RyaW5nID0gZ19zdHJpbmdf bmV3IChtYWluX3RpdGxlKTsKQEAgLTE2NSw2ICsxODksMjggQEAgY3JlYXRlX3Rvb2xiYXIgKCkK ICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQi LCBHX0NBTExCQUNLIChhY3RpdmF0ZV91cmlfZW50cnlfY2IpLCAoZ3BvaW50ZXIpdXJpX2VudHJ5 KTsKICAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwg LTEpOwogCisgICAgLyogWm9vbSAqLworICAgIGl0ZW0gPSBndGtfc2VwYXJhdG9yX3Rvb2xfaXRl bV9uZXcgKCk7CisgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUih0b29sYmFyKSwg aXRlbSwgLTEpOworCisgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAo R1RLX1NUT0NLX1pPT01fT1VUKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAoaXRl bSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoem9vbV9vdXRfY2IpLCBOVUxMKTsKKyAgICBndGtf dG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOworCisgICAg aXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX1pPT01fMTAw KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19D QUxMQkFDSyAocmVzZXRfem9vbV9jYiksIE5VTEwpOworICAgIGd0a190b29sYmFyX2luc2VydCAo R1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisKKyAgICBpdGVtID0gZ3RrX3Rvb2xf YnV0dG9uX25ld19mcm9tX3N0b2NrIChHVEtfU1RPQ0tfWk9PTV9JTik7CisgICAgZ19zaWduYWxf Y29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0sgKHpvb21faW5f Y2IpLCBOVUxMKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFy KSwgaXRlbSwgLTEpOworCisgICAgR3RrV2lkZ2V0KiBjaGVja19ib3ggPSBndGtfY2hlY2tfYnV0 dG9uX25ld193aXRoX2xhYmVsICgiVGV4dCBvbmx5Iik7CisgICAgZ19zaWduYWxfY29ubmVjdCAo R19PQkpFQ1QgKGNoZWNrX2JveCksICJ0b2dnbGVkIiwgR19DQUxMQkFDSyAoem9vbV90b2dnbGVk X2NiKSwgTlVMTCk7CisgICAgaXRlbSA9IGd0a190b29sX2l0ZW1fbmV3ICgpOworICAgIGd0a19j b250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSIChpdGVtKSwgY2hlY2tfYm94KTsKKyAgICBndGtf dG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOworCiAgICAg cmV0dXJuIHRvb2xiYXI7CiB9CiAK 20717 2008-04-21 00:22:54 -0700 2008-05-27 07:22:20 -0700 Alternative Zoom patch zoom.patch.SAVE text/plain 3033 mike.emmel ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggZDI2ZjEzYS4uYTRmZDMxNCAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTE1NTUsNiArMTU1NSwyMCBAQCBnYm9v bGVhbiB3ZWJraXRfd2ViX3ZpZXdfY2FuX2dvX2ZvcndhcmQoV2ViS2l0V2ViVmlldyogd2ViVmll dykKICAgICByZXR1cm4gVFJVRTsKIH0KIAorZmxvYXQgd2Via2l0X3dlYl92aWV3X3pvb21fZmFj dG9yKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwo V0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCAwKTsKKyAgICBGcmFtZSogZnJhbWUgPSBjb3Jl KHdlYlZpZXcpLT5tYWluRnJhbWUoKTsKKyAgICByZXR1cm4gZnJhbWUtPnpvb21GYWN0b3IoKTsK K30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBm bG9hdCBwZXJjZW50LCBnYm9vbGVhbiB0ZXh0X29ubHkpCit7CisgICAgZ19yZXR1cm5faWZfZmFp bChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUo d2ViVmlldyktPm1haW5GcmFtZSgpOworICAgIGZyYW1lLT5zZXRab29tRmFjdG9yKHBlcmNlbnQs dGV4dF9vbmx5KTsKK30KKwogdm9pZCB3ZWJraXRfd2ViX3ZpZXdfb3BlbihXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogdXJpKQogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuaCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAppbmRl eCAwYzVhNjc1Li41ZTIzOTgwIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCkBAIC0xMjQs NiArMTI0LDEzIEBAIHdlYmtpdF93ZWJfdmlld19nb19iYWNrX29yX2ZvcndhcmQgKFdlYktpdFdl YlZpZXcqIHdlYl92aWV3LCBnaW50IHN0ZXBzKTsKIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3dl Yl92aWV3X2dvX2ZvcndhcmQgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKIAorV0VCS0lUX0FQ SSBmbG9hdAord2Via2l0X3dlYl92aWV3X3pvb21fZmFjdG9yKFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcpOworCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld196b29tKFdlYktpdFdlYlZp ZXcqIHdlYl92aWV3LCBmbG9hdCBwZXJjZW50LCBnYm9vbGVhbiB0ZXh0X29ubHkgKTsKKworCiBX RUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19zdG9wX2xvYWRpbmcgKFdlYktpdFdlYlZp ZXcqIHdlYl92aWV3KTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFp bi5jIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCmluZGV4IDhlZDI2OTAuLjlhODEy NGMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYworKysgYi9XZWJL aXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKQEAgLTEwNiw2ICsxMDYsMjQgQEAgZ29fZm9yd2Fy ZF9jYiAoR3RrV2lkZ2V0KiB3aWRnZXQsIGdwb2ludGVyIGRhdGEpCiAgICAgd2Via2l0X3dlYl92 aWV3X2dvX2ZvcndhcmQgKHdlYl92aWV3KTsKIH0KIAorCitzdGF0aWMgdm9pZAorem9vbV9vdXRf Y2IgKEd0a1dpZGdldCogd2lkZ2V0LCBncG9pbnRlciBkYXRhKQoreworICAgIGZsb2F0IGN1cnJl bnQgPSB3ZWJraXRfd2ViX3ZpZXdfem9vbV9mYWN0b3Iod2ViX3ZpZXcpOworICAgIGN1cnJlbnQg PSBjdXJyZW50KjAuODsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfem9vbSAod2ViX3ZpZXcsY3VycmVu dCxmYWxzZSk7Cit9CisKK3N0YXRpYyB2b2lkCit6b29tX2luX2NiIChHdGtXaWRnZXQqIHdpZGdl dCwgZ3BvaW50ZXIgZGF0YSkKK3sKKyAgICBmbG9hdCBjdXJyZW50ID0gd2Via2l0X3dlYl92aWV3 X3pvb21fZmFjdG9yKHdlYl92aWV3KTsKKyAgICBjdXJyZW50ID0gY3VycmVudCoxLjE7CisgICAg d2Via2l0X3dlYl92aWV3X3pvb20gKHdlYl92aWV3LGN1cnJlbnQsZmFsc2UpOworfQorCisKIHN0 YXRpYyBHdGtXaWRnZXQqCiBjcmVhdGVfYnJvd3NlciAoKQogewpAQCAtMTUyLDYgKzE3MywxNyBA QCBjcmVhdGVfdG9vbGJhciAoKQogICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpdGVt KSwgImNsaWNrZWQiLCBHX0NBTExCQUNLIChnb19mb3J3YXJkX2NiKSwgTlVMTCk7CiAgICAgZ3Rr X3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKIAorICAg IC8qIHRoZSB6b29tIGluIGJ1dHRvbiAqLworICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3 X2Zyb21fc3RvY2sgKEdUS19TVE9DS19aT09NX0lOKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0IChH X09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoem9vbV9pbl9jYiksIE5VTEwp OworICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAt MSk7CisKKyAgICAvKiBUaGUgem9vbSBvdXQgYnV0dG9uICovCisgICAgaXRlbSA9IGd0a190b29s X2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX1pPT01fT1VUKTsKKyAgICBnX3NpZ25h bF9jb25uZWN0IChHX09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoem9vbV9v dXRfY2IpLCBOVUxMKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29s YmFyKSwgaXRlbSwgLTEpOworCisKICAgICAvKiBUaGUgVVJMIGVudHJ5ICovCiAgICAgaXRlbSA9 IGd0a190b29sX2l0ZW1fbmV3ICgpOwogICAgIGd0a190b29sX2l0ZW1fc2V0X2V4cGFuZCAoaXRl bSwgVFJVRSk7CiAK 21360 2008-05-27 07:18:31 -0700 2008-05-29 05:57:57 -0700 Add zoom functions to WebKit gtk gtk-zoom.patch text/plain 10482 marco.barisione SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uZSAz NDE0OCkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAkoY29waWEg bG9jYWxlKQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggQ2hyaXN0 aWFuIER5d2FuIDxjaHJpc3RpYW5AaW1lbmRpby5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDgg Q29sbGFib3JhIEx0ZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDUsNiArNDYsNyBAQAogICAg IGdib29sZWFuIGVuYWJsZV9wbHVnaW5zOwogICAgIGdib29sZWFuIHJlc2l6YWJsZV90ZXh0X2Fy ZWFzOwogICAgIGdjaGFyKiB1c2VyX3N0eWxlc2hlZXRfdXJpOworICAgIGdmbG9hdCB6b29tX211 bHRpcGxpZXJfcmF0aW87CiB9OwogCiAjZGVmaW5lIFdFQktJVF9XRUJfU0VUVElOR1NfR0VUX1BS SVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQ RV9XRUJfU0VUVElOR1MsIFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSkpCkBAIC02OSw3ICs3MSw4 IEBACiAgICAgUFJPUF9FTkFCTEVfU0NSSVBUUywKICAgICBQUk9QX0VOQUJMRV9QTFVHSU5TLAog ICAgIFBST1BfUkVTSVpBQkxFX1RFWFRfQVJFQVMsCi0gICAgUFJPUF9VU0VSX1NUWUxFU0hFRVRf VVJJCisgICAgUFJPUF9VU0VSX1NUWUxFU0hFRVRfVVJJLAorICAgIFBST1BfWk9PTV9NVUxUSVBM SUVSX1JBVElPCiB9OwogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX2ZpbmFsaXpl KEdPYmplY3QqIG9iamVjdCk7CkBAIC0yNDgsNiArMjUxLDE1IEBACiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZmxhZ3MpKTsKIAorICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ29iamVj dF9jbGFzcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfWk9PTV9N VUxUSVBMSUVSX1JBVElPLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19w YXJhbV9zcGVjX2Zsb2F0KAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInpv b20tbXVsdGlwbGllci1yYXRpbyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiWm9vbSBNdWx0aXBsaWVyIFJhdGlvIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJIb3cgbXVjaCB0aGUgem9vbSBsZXZlbCBpcyBjaGFuZ2VkIHdoZW4gem9vbWluZyBp biBvciBvdXQuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsIEdfTUFY RkxPQVQsIDEuMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7 CisKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUoa2xhc3MsIHNpemVvZihXZWJLaXRXZWJT ZXR0aW5nc1ByaXZhdGUpKTsKIH0KIApAQCAtMzQxLDYgKzM1Myw5IEBACiAgICAgICAgIGdfZnJl ZShwcml2LT51c2VyX3N0eWxlc2hlZXRfdXJpKTsKICAgICAgICAgcHJpdi0+dXNlcl9zdHlsZXNo ZWV0X3VyaSA9IGdfc3RyZHVwKGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSkpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9NVUxUSVBMSUVSX1JBVElPOgorICAgICAgICBwcml2 LT56b29tX211bHRpcGxpZXJfcmF0aW8gPSBnX3ZhbHVlX2dldF9mbG9hdCh2YWx1ZSk7CisgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9Q Uk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00 MDcsNiArNDIyLDkgQEAKICAgICBjYXNlIFBST1BfVVNFUl9TVFlMRVNIRUVUX1VSSToKICAgICAg ICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVlLCBwcml2LT51c2VyX3N0eWxlc2hlZXRfdXJpKTsK ICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1pPT01fTVVMVElQTElFUl9SQVRJTzoKKyAg ICAgICAgZ192YWx1ZV9zZXRfZmxvYXQodmFsdWUsIHByaXYtPnpvb21fbXVsdGlwbGllcl9yYXRp byk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5f SU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJl YWs7CkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkocmV2aXNpb25lIDM0MTQ4 KQorKysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKGNvcGlhIGxvY2FsZSkK QEAgLTUsNiArNSw3IEBACiAgKiAgQ29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8YWxwQGF0 b2tlci5jb20+CiAgKiAgQ29weXJpZ2h0IChDKSAyMDA4IEphbiBBbG9uem8gPGptYWxvbnpvQHVu cGx1Z2dhYmxlLmNvbT4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDggTnVhbnRpIEx0ZC4KKyAqICBD b3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlm eSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAg LTk4LDcgKzk5LDkgQEAKICAgICBQUk9QX1BBU1RFX1RBUkdFVF9MSVNULAogICAgIFBST1BfRURJ VEFCTEUsCiAgICAgUFJPUF9TRVRUSU5HUywKLSAgICBQUk9QX1RSQU5TUEFSRU5UCisgICAgUFJP UF9UUkFOU1BBUkVOVCwKKyAgICBQUk9QX1pPT01fTEVWRUwsCisgICAgUFJPUF9aT09NX1RFWFRf T05MWQogfTsKIAogc3RhdGljIGd1aW50IHdlYmtpdF93ZWJfdmlld19zaWduYWxzW0xBU1RfU0lH TkFMXSA9IHsgMCwgfTsKQEAgLTIzNCw2ICsyMzcsMTIgQEAKICAgICBjYXNlIFBST1BfVFJBTlNQ QVJFTlQ6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF93ZWJfdmll d19nZXRfdHJhbnNwYXJlbnQod2ViVmlldykpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBS T1BfWk9PTV9MRVZFTDoKKyAgICAgICAgZ192YWx1ZV9zZXRfZmxvYXQodmFsdWUsIHdlYmtpdF93 ZWJfdmlld19nZXRfem9vbV9sZXZlbCh3ZWJWaWV3KSk7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgUFJPUF9aT09NX1RFWFRfT05MWToKKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1 ZSwgd2Via2l0X3dlYl92aWV3X2dldF90ZXh0X29ubHlfem9vbSh3ZWJWaWV3KSk7CisgICAgICAg IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9Q RVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICB9CkBAIC0yNTMsNiArMjYyLDEy IEBACiAgICAgY2FzZSBQUk9QX1RSQU5TUEFSRU5UOgogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdf c2V0X3RyYW5zcGFyZW50KHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKICAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1pPT01fTEVWRUw6CisgICAgICAgIHdlYmtpdF93 ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9mbG9hdCh2YWx1ZSkp OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9URVhUX09OTFk6CisgICAgICAg IHdlYmtpdF93ZWJfdmlld19zZXRfdGV4dF9vbmx5X3pvb20od2ViVmlldywgZ192YWx1ZV9nZXRf Ym9vbGVhbih2YWx1ZSkpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBH X09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7 CiAgICAgfQpAQCAtMTE5OCw2ICsxMjEzLDIyIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFE V1JJVEUpKTsKIAorICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xh c3MsIFBST1BfWk9PTV9MRVZFTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdfcGFyYW1fc3BlY19mbG9hdCgiem9vbS1sZXZlbCIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlpvb20gbGV2ZWwiLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJUaGUgbGV2ZWwg b2Ygem9vbSBvZiB0aGUgY29udGVudCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR19NSU5GTE9BVCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX01BWEZMT0FULAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BB UkFNX1JFQURXUklURSkpOworCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShv YmplY3RDbGFzcywgUFJPUF9aT09NX1RFWFRfT05MWSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJ6b29tLXRleHQtb25seSIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVGV4 dC1vbmx5IHpvb20iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIldoZXRoZXIgb25seSB0aGUgdGV4dCBzaXplIGlzIGNoYW5nZWQgd2hl biB6b29taW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOworCiAgICAgZ190 eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFzcywgc2l6ZW9mKFdlYktpdFdlYlZpZXdQ cml2YXRlKSk7CiB9CiAKQEAgLTEzNjQsNiArMTM5NSw4IEBACiAKICAgICBwcml2LT5iYWNrRm9y d2FyZExpc3QgPSB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X25ld193aXRoX3dlYl92aWV3 KHdlYlZpZXcpOwogCisgICAgcHJpdi0+dGV4dE9ubHlab29tID0gRkFMU0U7CisKICNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigyLDEwLDApCiAgICAgR2RrQXRvbSB0ZXh0SHRtbCA9IGdka19hdG9tX2lu dGVybl9zdGF0aWNfc3RyaW5nKCJ0ZXh0L2h0bWwiKTsKICNlbHNlCkBAIC0yMDQ0LDQgKzIwNzcs NzMgQEAKICAgICBmcmFtZS0+dmlldygpLT5zZXRUcmFuc3BhcmVudChmbGFnKTsKIH0KIAorZ2Zs b2F0IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3 KSwgMS4wZik7CisKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUo KTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChmcmFtZSwgMS4wZik7CisgICAgcmV0dXJuIGZy YW1lLT56b29tRmFjdG9yKCk7CiB9CisKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19hcHBs eV96b29tX2xldmVsKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdmbG9hdCB6b29tTGV2ZWwpCit7 CisgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CisgICAgZ19y ZXR1cm5faWZfZmFpbChmcmFtZSk7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3 ZWJWaWV3LT5wcml2OworICAgIGZyYW1lLT5zZXRab29tRmFjdG9yKHpvb21MZXZlbCwgcHJpdi0+ dGV4dE9ubHlab29tKTsKK30KKwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwo V2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Zsb2F0IHpvb21MZXZlbCkKK3sKKyAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisKKyAgICB3ZWJraXRfd2Vi X3ZpZXdfYXBwbHlfem9vbV9sZXZlbCh3ZWJWaWV3LCB6b29tTGV2ZWwpOworICAgIGdfb2JqZWN0 X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSwgInpvb20tbGV2ZWwiKTsKK30KKwordm9pZCB3ZWJr aXRfd2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIFdlYktpdFdl YlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKyAgICBnZmxvYXQgem9vbU11bHRp cGxpZXJSYXRpbzsKKyAgICBnX29iamVjdF9nZXQocHJpdi0+d2ViU2V0dGluZ3MsICJ6b29tLW11 bHRpcGxpZXItcmF0aW8iLCAmem9vbU11bHRpcGxpZXJSYXRpbywgTlVMTCk7CisKKyAgICB3ZWJr aXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwod2ViVmlldywgd2Via2l0X3dlYl92aWV3X2dldF96 b29tX2xldmVsKHdlYlZpZXcpICogem9vbU11bHRpcGxpZXJSYXRpbyk7Cit9CisKK3ZvaWQgd2Vi a2l0X3dlYl92aWV3X3pvb21fb3V0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19y ZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAgV2ViS2l0 V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIGdmbG9hdCB6b29tTXVs dGlwbGllclJhdGlvOworICAgIGdfb2JqZWN0X2dldChwcml2LT53ZWJTZXR0aW5ncywgInpvb20t bXVsdGlwbGllci1yYXRpbyIsICZ6b29tTXVsdGlwbGllclJhdGlvLCBOVUxMKTsKKworICAgIHdl YmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJWaWV3LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3pvb21fbGV2ZWwod2ViVmlldykgLyB6b29tTXVsdGlwbGllclJhdGlvKTsKK30KKworZ2Jvb2xl YW4gd2Via2l0X3dlYl92aWV3X2dldF90ZXh0X29ubHlfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJW aWV3KSwgRkFMU0UpOworCisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3 LT5wcml2OworICAgIHJldHVybiBwcml2LT50ZXh0T25seVpvb207Cit9CisKK3ZvaWQgd2Via2l0 X3dlYl92aWV3X3NldF90ZXh0X29ubHlfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnYm9v bGVhbiB0ZXh0T25seVpvb20pCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VC X1ZJRVcod2ViVmlldykpOworCisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJW aWV3LT5wcml2OworICAgIGlmIChwcml2LT50ZXh0T25seVpvb20gPT0gdGV4dE9ubHlab29tKQor ICAgICAgcmV0dXJuOworCisgICAgcHJpdi0+dGV4dE9ubHlab29tID0gdGV4dE9ubHlab29tOwor ICAgIHdlYmtpdF93ZWJfdmlld19hcHBseV96b29tX2xldmVsKHdlYlZpZXcsIHdlYmtpdF93ZWJf dmlld19nZXRfem9vbV9sZXZlbCh3ZWJWaWV3KSk7CisKKyAgICBnX29iamVjdF9ub3RpZnkoR19P QkpFQ1Qod2ViVmlldyksICJ6b29tLXRleHQtb25seSIpOworfQorCit9CkluZGV4OiBXZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5oCShyZXZpc2lvbmUgMzQxNDgpCisrKyBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmgJKGNvcGlhIGxvY2FsZSkKQEAgLTIxNyw2ICsyMTcsMjQgQEAKIFdF QktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl92aWV3X3NldF90cmFuc3BhcmVudCAoV2ViS2l0V2Vi Vmlldyogd2ViX3ZpZXcsIGdib29sZWFuIGZsYWcpOwogCitXRUJLSVRfQVBJIGdmbG9hdAord2Vi a2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpOworCitX RUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbChXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3LCBnZmxvYXQgem9vbUxldmVsKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJr aXRfd2ViX3ZpZXdfem9vbV9pbihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KTsKKworV0VCS0lUX0FQ SSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQoV2ViS2l0V2ViVmlldyogd2ViVmlldyk7 CisKK1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF93ZWJfdmlld19nZXRfdGV4dF9vbmx5X3pv b20oV2ViS2l0V2ViVmlldyogd2ViVmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl92aWV3X3NldF90ZXh0X29ubHlfem9vbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBnYm9vbGVh biB0ZXh0T25seVpvb20pOworCiBHX0VORF9ERUNMUwogCiAjZW5kaWYKSW5kZXg6IFdlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmgJKHJldmlzaW9uZSAzNDE0OCkKKysrIFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHByaXZhdGUuaAkoY29waWEgbG9jYWxlKQpAQCAtODgsNiArODgsOCBAQAogCiAgICAg ICAgIEd0a0FkanVzdG1lbnQqIGhvcml6b250YWxBZGp1c3RtZW50OwogICAgICAgICBHdGtBZGp1 c3RtZW50KiB2ZXJ0aWNhbEFkanVzdG1lbnQ7CisKKyAgICAgICAgZ2Jvb2xlYW4gdGV4dE9ubHla b29tOwogICAgIH07CiAKICAgICAjZGVmaW5lIFdFQktJVF9XRUJfRlJBTUVfR0VUX1BSSVZBVEUo b2JqKSAgICAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQRV9X RUJfRlJBTUUsIFdlYktpdFdlYkZyYW1lUHJpdmF0ZSkpCkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0NoYW5nZUxvZwkocmV2aXNpb25lIDM0MTQ4 KQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKGNvcGlhIGxvY2FsZSkKQEAgLTEsMyArMSwyMSBA QAorMjAwOC0wNS0yNyAgTWFyY28gQmFyaXNpb25lICA8bWFyY29AY29sbGFib3JhLmNvLnVrPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjgxCisgICAgICAgIFtHVEtdIGFkZCBm dW5jdGlvbnMgdG8gc2V0L2dldCB0aGUgem9vbSBsZXZlbAorCisgICAgICAgICogd2Via2l0L3dl YmtpdHdlYnNldHRpbmdzLmNwcDogQWRkIGEgInpvb20tbXVsdGlwbGllci1yYXRpbyIKKyAgICAg ICAgcHJvcGVydHkuCisgICAgICAgIChfV2ViS2l0V2ViU2V0dGluZ3NQcml2YXRlOjopOgorICAg ICAgICAoX1dlYktpdFdlYlNldHRpbmdzUHJpdmF0ZTo6d2Via2l0X3dlYl9zZXR0aW5nc19jbGFz c19pbml0KToKKyAgICAgICAgKF9XZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGU6OndlYmtpdF93ZWJf c2V0dGluZ3Nfc2V0X3Byb3BlcnR5KToKKyAgICAgICAgKF9XZWJLaXRXZWJTZXR0aW5nc1ByaXZh dGU6OndlYmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KToKKyAgICAgICAgKiB3ZWJraXQv d2Via2l0d2Vidmlldy5jcHA6IEFkZCBmdW5jdGlvbnMgdG8gZ2V0IGFuZCBzZXQgdGhlIHpvb20K KyAgICAgICAgbGV2ZWwuCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuaDogRGl0dG8u CisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoKKwogMjAwOC0wNS0yNSAgQWxwIFRv a2VyICA8YWxwQG51YW50aS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrby4K 21407 2008-05-29 05:57:57 -0700 2008-05-30 06:09:04 -0700 Add zoom functions to WebKit gtk gtk-zoom.patch text/plain 12369 marco.barisione SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uZSAz NDE0OCkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAkoY29waWEg bG9jYWxlKQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggQ2hyaXN0 aWFuIER5d2FuIDxjaHJpc3RpYW5AaW1lbmRpby5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDgg Q29sbGFib3JhIEx0ZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91 IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDUsNiArNDYsNyBAQAogICAg IGdib29sZWFuIGVuYWJsZV9wbHVnaW5zOwogICAgIGdib29sZWFuIHJlc2l6YWJsZV90ZXh0X2Fy ZWFzOwogICAgIGdjaGFyKiB1c2VyX3N0eWxlc2hlZXRfdXJpOworICAgIGdmbG9hdCB6b29tX211 bHRpcGxpZXJfcmF0aW87CiB9OwogCiAjZGVmaW5lIFdFQktJVF9XRUJfU0VUVElOR1NfR0VUX1BS SVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQ RV9XRUJfU0VUVElOR1MsIFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSkpCkBAIC02OSw3ICs3MSw4 IEBACiAgICAgUFJPUF9FTkFCTEVfU0NSSVBUUywKICAgICBQUk9QX0VOQUJMRV9QTFVHSU5TLAog ICAgIFBST1BfUkVTSVpBQkxFX1RFWFRfQVJFQVMsCi0gICAgUFJPUF9VU0VSX1NUWUxFU0hFRVRf VVJJCisgICAgUFJPUF9VU0VSX1NUWUxFU0hFRVRfVVJJLAorICAgIFBST1BfWk9PTV9NVUxUSVBM SUVSX1JBVElPCiB9OwogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX2ZpbmFsaXpl KEdPYmplY3QqIG9iamVjdCk7CkBAIC0yNDgsNiArMjUxLDE1IEBACiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZmxhZ3MpKTsKIAorICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ29iamVj dF9jbGFzcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfWk9PTV9N VUxUSVBMSUVSX1JBVElPLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19w YXJhbV9zcGVjX2Zsb2F0KAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInpv b20tbXVsdGlwbGllci1yYXRpbyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiWm9vbSBNdWx0aXBsaWVyIFJhdGlvIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJIb3cgbXVjaCB0aGUgem9vbSBsZXZlbCBpcyBjaGFuZ2VkIHdoZW4gem9vbWluZyBp biBvciBvdXQuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsIEdfTUFY RkxPQVQsIDEuMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7 CisKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUoa2xhc3MsIHNpemVvZihXZWJLaXRXZWJT ZXR0aW5nc1ByaXZhdGUpKTsKIH0KIApAQCAtMzQxLDYgKzM1Myw5IEBACiAgICAgICAgIGdfZnJl ZShwcml2LT51c2VyX3N0eWxlc2hlZXRfdXJpKTsKICAgICAgICAgcHJpdi0+dXNlcl9zdHlsZXNo ZWV0X3VyaSA9IGdfc3RyZHVwKGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSkpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9NVUxUSVBMSUVSX1JBVElPOgorICAgICAgICBwcml2 LT56b29tX211bHRpcGxpZXJfcmF0aW8gPSBnX3ZhbHVlX2dldF9mbG9hdCh2YWx1ZSk7CisgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9Q Uk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00 MDcsNiArNDIyLDkgQEAKICAgICBjYXNlIFBST1BfVVNFUl9TVFlMRVNIRUVUX1VSSToKICAgICAg ICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVlLCBwcml2LT51c2VyX3N0eWxlc2hlZXRfdXJpKTsK ICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1pPT01fTVVMVElQTElFUl9SQVRJTzoKKyAg ICAgICAgZ192YWx1ZV9zZXRfZmxvYXQodmFsdWUsIHByaXYtPnpvb21fbXVsdGlwbGllcl9yYXRp byk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5f SU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJl YWs7CkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkocmV2aXNpb25lIDM0MTQ4 KQorKysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKGNvcGlhIGxvY2FsZSkK QEAgLTUsNiArNSw3IEBACiAgKiAgQ29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8YWxwQGF0 b2tlci5jb20+CiAgKiAgQ29weXJpZ2h0IChDKSAyMDA4IEphbiBBbG9uem8gPGptYWxvbnpvQHVu cGx1Z2dhYmxlLmNvbT4KICAqICBDb3B5cmlnaHQgKEMpIDIwMDggTnVhbnRpIEx0ZC4KKyAqICBD b3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlm eSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAg LTk4LDcgKzk5LDkgQEAKICAgICBQUk9QX1BBU1RFX1RBUkdFVF9MSVNULAogICAgIFBST1BfRURJ VEFCTEUsCiAgICAgUFJPUF9TRVRUSU5HUywKLSAgICBQUk9QX1RSQU5TUEFSRU5UCisgICAgUFJP UF9UUkFOU1BBUkVOVCwKKyAgICBQUk9QX1pPT01fTEVWRUwsCisgICAgUFJPUF9aT09NX1RFWFRf T05MWQogfTsKIAogc3RhdGljIGd1aW50IHdlYmtpdF93ZWJfdmlld19zaWduYWxzW0xBU1RfU0lH TkFMXSA9IHsgMCwgfTsKQEAgLTIzNCw2ICsyMzcsMTIgQEAKICAgICBjYXNlIFBST1BfVFJBTlNQ QVJFTlQ6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF93ZWJfdmll d19nZXRfdHJhbnNwYXJlbnQod2ViVmlldykpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBS T1BfWk9PTV9MRVZFTDoKKyAgICAgICAgZ192YWx1ZV9zZXRfZmxvYXQodmFsdWUsIHdlYmtpdF93 ZWJfdmlld19nZXRfem9vbV9sZXZlbCh3ZWJWaWV3KSk7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgUFJPUF9aT09NX1RFWFRfT05MWToKKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1 ZSwgd2Via2l0X3dlYl92aWV3X2dldF96b29tX3RleHRfb25seSh3ZWJWaWV3KSk7CisgICAgICAg IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9Q RVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICB9CkBAIC0yNTMsNiArMjYyLDEy IEBACiAgICAgY2FzZSBQUk9QX1RSQU5TUEFSRU5UOgogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdf c2V0X3RyYW5zcGFyZW50KHdlYlZpZXcsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKICAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1pPT01fTEVWRUw6CisgICAgICAgIHdlYmtpdF93 ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9mbG9hdCh2YWx1ZSkp OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9URVhUX09OTFk6CisgICAgICAg IHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV90ZXh0X29ubHkod2ViVmlldywgZ192YWx1ZV9nZXRf Ym9vbGVhbih2YWx1ZSkpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBH X09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7 CiAgICAgfQpAQCAtMTE5OCw2ICsxMjEzLDIyIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFE V1JJVEUpKTsKIAorICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xh c3MsIFBST1BfWk9PTV9MRVZFTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdfcGFyYW1fc3BlY19mbG9hdCgiem9vbS1sZXZlbCIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlpvb20gbGV2ZWwiLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJUaGUgbGV2ZWwg b2Ygem9vbSBvZiB0aGUgY29udGVudCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR19NSU5GTE9BVCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX01BWEZMT0FULAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BB UkFNX1JFQURXUklURSkpOworCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShv YmplY3RDbGFzcywgUFJPUF9aT09NX1RFWFRfT05MWSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJ6b29tLXRleHQtb25seSIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVGV4 dC1vbmx5IHpvb20iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIldoZXRoZXIgb25seSB0aGUgdGV4dCBzaXplIGlzIGNoYW5nZWQgd2hl biB6b29taW5nIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklURSkpOworCiAgICAgZ190 eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFzcywgc2l6ZW9mKFdlYktpdFdlYlZpZXdQ cml2YXRlKSk7CiB9CiAKQEAgLTEzNjQsNiArMTM5NSw4IEBACiAKICAgICBwcml2LT5iYWNrRm9y d2FyZExpc3QgPSB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X25ld193aXRoX3dlYl92aWV3 KHdlYlZpZXcpOwogCisgICAgcHJpdi0+em9vbVRleHRPbmx5ID0gRkFMU0U7CisKICNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigyLDEwLDApCiAgICAgR2RrQXRvbSB0ZXh0SHRtbCA9IGdka19hdG9tX2lu dGVybl9zdGF0aWNfc3RyaW5nKCJ0ZXh0L2h0bWwiKTsKICNlbHNlCkBAIC0yMDQ0LDQgKzIwNzcs MTMwIEBACiAgICAgZnJhbWUtPnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQoZmxhZyk7CiB9CiAKKy8q KgorICogd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsOgorICogQHdlYl92aWV3OiBhICNX ZWJLaXRXZWJWaWV3CisgKgorICogUmV0dXJucyB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcs IGkuZS4gaG93IG11Y2ggZWxlbWVudHMgaW4KKyAqIHRoZSBwYWdlIGFyZSBzY2FsZWQgd2l0aCBy ZXNwZWN0IHRvIHRoZWlyIG9yaWdpbmFsIHNpemUuCisgKiBJZiB0aGUgInpvb20tdGV4dC1vbmx5 IiBwcm9wZXJ0eSBpcyBzZXQgdG8gJVRSVUUgKHRoZSBkZWZhdWx0KQorICogdGhlbiB0aGUgem9v bSBsZXZlbCBjaGFuZ2VzIHRoZSBzaXplIG9mIGV2ZXJ5IGVsZW1lbnQsIGVsc2UgaXQKKyAqIGNo YW5nZXMganVzdCB0aGUgc2l6ZSBvZiB0ZXh0LgorICoKKyAqIFJldHVybiB2YWx1ZTogdGhlIHpv b20gbGV2ZWwgb2YgQHdlYl92aWV3CisgKi8KK2dmbG9hdCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pv b21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl92YWxfaWZf ZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIDEuMGYpOworCisgICAgRnJhbWUqIGZy YW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2Zh aWwoZnJhbWUsIDEuMGYpOworICAgIHJldHVybiBmcmFtZS0+em9vbUZhY3RvcigpOwogfQorCitz dGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfYXBwbHlfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBnZmxvYXQgem9vbUxldmVsKQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUo d2ViVmlldyktPm1haW5GcmFtZSgpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoZnJhbWUpOworICAg IFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKyAgICBmcmFtZS0+ c2V0Wm9vbUZhY3Rvcih6b29tTGV2ZWwsIHByaXYtPnpvb21UZXh0T25seSk7Cit9CisKKy8qKgor ICogd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsOgorICogQHdlYl92aWV3OiBhICNXZWJL aXRXZWJWaWV3CisgKiBAem9vbV9sZXZlbDogdGhlIG5ldyB6b29tIGxldmVsCisgKgorICogU2V0 cyB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcsIGkuZS4gaG93IG11Y2ggZWxlbWVudHMgaW4K KyAqIHRoZSBwYWdlIGFyZSBzY2FsZWQgd2l0aCByZXNwZWN0IHRvIHRoZWlyIG9yaWdpbmFsIHNp emUuCisgKiBJZiB0aGUgInpvb20tdGV4dC1vbmx5IiBwcm9wZXJ0eSBpcyBzZXQgdG8gJVRSVUUg KHRoZSBkZWZhdWx0KQorICogdGhlbiB0aGUgem9vbSBsZXZlbCBjaGFuZ2VzIHRoZSBzaXplIG9m IGV2ZXJ5IGVsZW1lbnQsIGVsc2UgaXQKKyAqIGNoYW5nZXMganVzdCB0aGUgc2l6ZSBvZiB0ZXh0 LgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBnZmxvYXQgem9vbUxldmVsKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19hcHBseV96 b29tX2xldmVsKHdlYlZpZXcsIHpvb21MZXZlbCk7CisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JK RUNUKHdlYlZpZXcpLCAiem9vbS1sZXZlbCIpOworfQorCisvKioKKyAqIHdlYmtpdF93ZWJfdmll d196b29tX2luOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKgorICogSW5jcmVh c2VzIHRoZSB6b29tIGxldmVsIG9mIEB3ZWJfdmlldy4gVGhlIGN1cnJlbnQgem9vbQorICogbGV2 ZWwgaXMgbXVsdGlwbGllZCBieSB0aGUgdmFsdWUgb2YgdGhlICJ6b29tLW11bHRpcGxpZXItcmF0 aW8iCisgKiBwcm9wZXJ0eSBvZiB0aGUgI1dlYktpdFdlYlNldHRpbmdzIGFzc29jaWF0ZWQgdG8g QHdlYl92aWV3LgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld196b29tX2luKFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVco d2ViVmlldykpOworCisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5w cml2OworICAgIGdmbG9hdCB6b29tTXVsdGlwbGllclJhdGlvOworICAgIGdfb2JqZWN0X2dldChw cml2LT53ZWJTZXR0aW5ncywgInpvb20tbXVsdGlwbGllci1yYXRpbyIsICZ6b29tTXVsdGlwbGll clJhdGlvLCBOVUxMKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJW aWV3LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwod2ViVmlldykgKiB6b29tTXVsdGlw bGllclJhdGlvKTsKK30KKworLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfem9vbV9vdXQ6CisgKiBA d2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqCisgKiBEZWNyZWFzZXMgdGhlIHpvb20gbGV2 ZWwgb2YgQHdlYl92aWV3LiBUaGUgY3VycmVudCB6b29tCisgKiBsZXZlbCBpcyBkaXZpZGVkIGJ5 IHRoZSB2YWx1ZSBvZiB0aGUgInpvb20tbXVsdGlwbGllci1yYXRpbyIKKyAqIHByb3BlcnR5IG9m IHRoZSAjV2ViS2l0V2ViU2V0dGluZ3MgYXNzb2NpYXRlZCB0byBAd2ViX3ZpZXcuCisgKi8KK3Zv aWQgd2Via2l0X3dlYl92aWV3X3pvb21fb3V0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7Cisg ICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAg V2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIGdmbG9hdCB6 b29tTXVsdGlwbGllclJhdGlvOworICAgIGdfb2JqZWN0X2dldChwcml2LT53ZWJTZXR0aW5ncywg Inpvb20tbXVsdGlwbGllci1yYXRpbyIsICZ6b29tTXVsdGlwbGllclJhdGlvLCBOVUxMKTsKKwor ICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3ZWJWaWV3LCB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3pvb21fbGV2ZWwod2ViVmlldykgLyB6b29tTXVsdGlwbGllclJhdGlvKTsKK30KKwor LyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fdGV4dF9vbmx5OgorICogQHdlYl92aWV3 OiBhICNXZWJLaXRXZWJWaWV3CisgKgorICogUmV0dXJucyB3aGV0aGVyIHRoZSB6b29tIGxldmVs IGFmZmVjdHMgb25seSB0ZXh0IG9yIGV2ZXJ5CisgKiBlbGVtZW50LgorICoKKyAqIFJldHVybiB2 YWx1ZTogJUZBTFNFIHdoZW4gZXZlcnkgZWxlbWVudCBpcyB6b29tZWQgKHRoZSBkZWZhdWx0KSwK KyAqICVUUlVFIGlmIGp1c3QgdGV4dCBpcyB6b29tZWQKKyAqLworZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X2dldF96b29tX3RleHRfb25seShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAg IGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgRkFMU0Up OworCisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAg IHJldHVybiBwcml2LT56b29tVGV4dE9ubHk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3 X3NldF96b29tX3RleHRfb25seToKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICog QHpvb21fdGV4dF9vbmx5OiAlRkFMU0UgaWYgZXZlcnkgZWxlbWVudCBzaG91bGQgYmUgem9vbWVk ICh0aGUgZGVmYXVsdCksCisgKiAlVFJVRSBpZiBqdXN0IHRleHQgc2hvdWxkIGJlIHpvb21lZAor ICoKKyAqIFNldHMgd2hldGhlciB0aGUgem9vbSBsZXZlbCBhZmZlY3RzIG9ubHkgdGV4dCBvciBl dmVyeSBlbGVtZW50LgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV90ZXh0X29u bHkoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2Jvb2xlYW4gem9vbVRleHRPbmx5KQoreworICAg IGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKworICAgIFdl YktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKyAgICBpZiAocHJpdi0+ em9vbVRleHRPbmx5ID09IHpvb21UZXh0T25seSkKKyAgICAgIHJldHVybjsKKworICAgIHByaXYt Pnpvb21UZXh0T25seSA9IHpvb21UZXh0T25seTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfYXBwbHlf em9vbV9sZXZlbCh3ZWJWaWV3LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwod2ViVmll dykpOworCisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAiem9vbS10ZXh0 LW9ubHkiKTsKK30KKworfQpJbmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAkocmV2aXNp b25lIDM0MTQ4KQorKysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCShjb3BpYSBs b2NhbGUpCkBAIC0yMTcsNiArMjE3LDI0IEBACiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJf dmlld19zZXRfdHJhbnNwYXJlbnQgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3LCBnYm9vbGVhbiBm bGFnKTsKIAorV0VCS0lUX0FQSSBnZmxvYXQKK3dlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZl bChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl92aWV3X3NldF96b29tX2xldmVsKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3LCBnZmxvYXQgem9v bV9sZXZlbCk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X3pvb21faW4oV2Vi S2l0V2ViVmlldyogd2ViX3ZpZXcpOworCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmll d196b29tX291dChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldyk7CisKK1dFQktJVF9BUEkgZ2Jvb2xl YW4KK3dlYmtpdF93ZWJfdmlld19nZXRfem9vbV90ZXh0X29ubHkoV2ViS2l0V2ViVmlldyogd2Vi X3ZpZXcpOworCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19zZXRfem9vbV90ZXh0 X29ubHkoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIGdib29sZWFuIHpvb21fdGV4dF9vbmx5KTsK KwogR19FTkRfREVDTFMKIAogI2VuZGlmCkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRw cml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5o CShyZXZpc2lvbmUgMzQxNDgpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgJ KGNvcGlhIGxvY2FsZSkKQEAgLTg4LDYgKzg4LDggQEAKIAogICAgICAgICBHdGtBZGp1c3RtZW50 KiBob3Jpem9udGFsQWRqdXN0bWVudDsKICAgICAgICAgR3RrQWRqdXN0bWVudCogdmVydGljYWxB ZGp1c3RtZW50OworCisgICAgICAgIGdib29sZWFuIHpvb21UZXh0T25seTsKICAgICB9OwogCiAg ICAgI2RlZmluZSBXRUJLSVRfV0VCX0ZSQU1FX0dFVF9QUklWQVRFKG9iaikgICAgKEdfVFlQRV9J TlNUQU5DRV9HRVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX0ZSQU1FLCBXZWJLaXRX ZWJGcmFtZVByaXZhdGUpKQpJbmRleDogV2ViS2l0L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9uZSAzNDE5OSkKKysrIFdlYktpdC9ndGsv Q2hhbmdlTG9nCShjb3BpYSBsb2NhbGUpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDgtMDUtMjkgIE1h cmNvIEJhcmlzaW9uZSAgPG1hcmNvQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODI4MQorICAgICAgICBbR1RLXSBhZGQgZnVuY3Rpb25zIHRvIHNldC9n ZXQgdGhlIHpvb20gbGV2ZWwKKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5j cHA6CisgICAgICAgIChfV2ViS2l0V2ViU2V0dGluZ3NQcml2YXRlOjopOgorICAgICAgICAoX1dl YktpdFdlYlNldHRpbmdzUHJpdmF0ZTo6d2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KToK KyAgICAgICAgKF9XZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGU6OndlYmtpdF93ZWJfc2V0dGluZ3Nf c2V0X3Byb3BlcnR5KToKKyAgICAgICAgKF9XZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGU6OndlYmtp dF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vi dmlldy5jcHA6IEFkZCBmdW5jdGlvbnMgdG8gZ2V0IGFuZCBzZXQgdGhlIHpvb20KKyAgICAgICAg bGV2ZWwuCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuaDogRGl0dG8uCisgICAgICAg ICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoKKwogMjAwOC0wNS0yOCAgQWxwIFRva2VyICA8YWxw QG51YW50aS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4K