19125 2008-05-19 11:15:13 -0700 [Qt] add functions to get/set the zoom level 2008-08-13 06:43:53 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 1 siraj hausmann alp hausmann pierre-luc.beaudoin oldest_to_newest 80904 0 siraj 2008-05-19 11:15:13 -0700 Qt WebKit currently seems to have text only zoom. I'm going to write a patch to expose an API function to zoom all the contents, including text and images. 81092 1 21267 siraj 2008-05-21 07:02:14 -0700 Created attachment 21267 A Patch that adds functions to get/set the zoom level to QtWebKit A Patch that adds functions to get/set the zoom level to QtWebKit API 81104 2 21271 siraj 2008-05-21 10:49:26 -0700 Created attachment 21271 Add functions to get/set the zoom level 81107 3 21271 pierre-luc.beaudoin 2008-05-21 11:28:46 -0700 Comment on attachment 21271 Add functions to get/set the zoom level Actually you have to use "review?" first :) 82399 4 21271 hausmann 2008-06-06 01:37:37 -0700 Comment on attachment 21271 Add functions to get/set the zoom level In principle I agree with the patch, but I see two problems: 1) Documentation is missing for this property. 2) The return value of Frame::zoomFactor() can be the text size multiplier or the zoom factor. I think we should use the newly added pageZoomFactor() and textZoomFactor() getters. But I'm not sure what to do about the two conflicting and symmetry. Either way we have to document the interaction of the two properties or how they exclude each other. Another option is to add support for both... So r- because this needs more work, but don't let that discourage you! It's great that you've started on this missing feature :) 83113 5 siraj 2008-06-12 09:27:42 -0700 (In reply to comment #4) Sorry for the delay, I was stuck with some work. I'll re-prepare a patch along the lines you suggested. I really appreciate the review, it's all part of the learning curve. 84275 6 21911 siraj 2008-06-24 09:42:13 -0700 Created attachment 21911 Add functions to get/set the zoom level V2. Hi, Sorry for the delay. Here is the patch which adds page zoom and text zoom API properties. I have added the required documentation and also this patch is using the new pageZoomFactor()/textZoomFactor() functions from the webCore, as suggested by Simon. 86891 7 21911 eric 2008-07-24 11:57:39 -0700 Comment on attachment 21911 Add functions to get/set the zoom level V2. Looks fine to me. 86996 8 22494 hausmann 2008-07-26 05:56:17 -0700 Created attachment 22494 Zoom factor patch v3 This patch is based on Siraj's patch but proposes a slightly different API. I think zoomFactor is more consistent with the rest of Qt and the boolean zoomTextOnly property gives clarity over the meaning of the zoomFactor. 87038 9 21911 mrowe 2008-07-26 22:34:19 -0700 Comment on attachment 21911 Add functions to get/set the zoom level V2. Clearing review flag since Comment #8 suggests that the API is still under discussion. 87697 10 22494 zecke 2008-08-02 14:27:09 -0700 Comment on attachment 22494 Zoom factor patch v3 Look's good. What made you pick zoomTextOnly over zoomOnlyText? 87870 11 22655 hausmann 2008-08-05 08:28:17 -0700 Created attachment 22655 Zoom factor patch v4 This is a new revision of the previous patch that maps the implementation and moves zoomTextOnly into QWebSettings. After a discussion with the doc team we concluded that having 'Only' at the end is more consistent with the rest of Qt, which has for example setReadOnly or setForwardOnly. 88259 12 22655 zecke 2008-08-11 18:13:38 -0700 Comment on attachment 22655 Zoom factor patch v4 - API is okay - WebCore::Settings change is fine 88393 13 hausmann 2008-08-13 06:43:53 -0700 Landed in r35716 21267 2008-05-21 07:02:14 -0700 2008-05-21 08:54:03 -0700 A Patch that adds functions to get/set the zoom level to QtWebKit 0001-Zoom-Both-Images-and-Text.patch text/plain 4178 siraj RnJvbSAwMzYzZTlmNGNjMzgwZTIwNjBhMGI5OGVkZTI4MTEyYjhmNTRhNzNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTaXJhaiBSYXppY2sgPHNpcmFqLnJhemlja0Bjb2xsYWJvcmEu Y28udWs+CkRhdGU6IFdlZCwgMjEgTWF5IDIwMDggMDM6MTI6NTAgKzA1MDAKU3ViamVjdDogW1BB VENIXSBab29tIEJvdGggSW1hZ2VzIGFuZCBUZXh0CgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmNwcCB8ICAgMTAgKysrKysrKysrKwogV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCAgIHwg ICAgNCArKysrCiBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcCAgfCAgIDEwICsrKysrKysrKysK IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuaCAgICB8ICAgIDQgKysrKwogV2ViS2l0L3F0L0NoYW5n ZUxvZyAgICAgICAgIHwgICAxNyArKysrKysrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA0 NSBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCAyNTc5 YTlkLi45YWU0M2FjIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysr IGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC02NTcsNiArNjU3LDE2IEBAIHFyZWFs IFFXZWJGcmFtZTo6dGV4dFNpemVNdWx0aXBsaWVyKCkgY29uc3QKICAgICByZXR1cm4gZC0+ZnJh bWUtPnpvb21GYWN0b3IoKTsKIH0KIAordm9pZCBRV2ViRnJhbWU6OnNldFNpemVNdWx0aXBsaWVy KHFyZWFsIGZhY3RvcikKK3sKKyAgIGQtPmZyYW1lLT5zZXRab29tRmFjdG9yKGZhY3RvcixmYWxz ZSk7Cit9CisKK3FyZWFsIFFXZWJGcmFtZTo6c2l6ZU11bHRpcGxpZXIoKSBjb25zdAoreworICAg IHJldHVybiBkLT5mcmFtZS0+em9vbUZhY3RvcigpOworfQorCiAvKiEKICAgICBSZXR1cm5zIHRo ZSBwb3NpdGlvbiBvZiB0aGUgZnJhbWUgcmVsYXRpdmUgdG8gaXQncyBwYXJlbnQgZnJhbWUuCiAq LwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmgKaW5kZXggNGU5YmU4OC4uNmI2NWZmNiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC05Nyw2 ICs5Nyw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJGcmFtZSA6IHB1YmxpYyBRT2JqZWN0 CiB7CiAgICAgUV9PQkpFQ1QKICAgICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVsdGlwbGll ciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxpZXIpCisg ICAgUV9QUk9QRVJUWShxcmVhbCBzaXplTXVsdGlwbGllciBSRUFEIHNpemVNdWx0aXBsaWVyIFdS SVRFIHNldFNpemVNdWx0aXBsaWVyKQogICAgIFFfUFJPUEVSVFkoUVN0cmluZyB0aXRsZSBSRUFE IHRpdGxlKQogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgV1JJVEUgc2V0VXJsKQog ICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGljb24pCkBAIC0xNDksNiArMTUwLDkgQEAg cHVibGljOgogICAgIHZvaWQgc2V0VGV4dFNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3Rvcik7CiAg ICAgcXJlYWwgdGV4dFNpemVNdWx0aXBsaWVyKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldFNpemVN dWx0aXBsaWVyKHFyZWFsIGZhY3Rvcik7CisgICAgcXJlYWwgc2l6ZU11bHRpcGxpZXIoKSBjb25z dDsKKwogICAgIFFQb2ludCBwb3MoKSBjb25zdDsKICAgICBRUmVjdCBnZW9tZXRyeSgpIGNvbnN0 OwogICAgIFFTaXplIGNvbnRlbnRzU2l6ZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L0FwaS9xd2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAppbmRleCBiMTFi MGVjLi5hMDMzMmZkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcApAQCAtNDg2LDYgKzQ4NiwxNiBAQCBxcmVhbCBR V2ViVmlldzo6dGV4dFNpemVNdWx0aXBsaWVyKCkgY29uc3QKICAgICByZXR1cm4gcGFnZSgpLT5t YWluRnJhbWUoKS0+dGV4dFNpemVNdWx0aXBsaWVyKCk7CiB9CiAKK3ZvaWQgUVdlYlZpZXc6OnNl dFNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3RvcikKK3sKKyAgICBwYWdlKCktPm1haW5GcmFtZSgp LT5zZXRTaXplTXVsdGlwbGllcihmYWN0b3IpOworfQorCitxcmVhbCBRV2ViVmlldzo6c2l6ZU11 bHRpcGxpZXIoKSBjb25zdAoreworICAgcmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1lKCktPnNpemVN dWx0aXBsaWVyKCk7Cit9CisKIC8qIQogICAgIEZpbmRzIHRoZSBuZXh0IG9jY3VycmVuY2Ugb2Yg dGhlIHN0cmluZywgXGEgc3ViU3RyaW5nLCBpbiB0aGUgcGFnZSwgdXNpbmcKICAgICB0aGUgZ2l2 ZW4gXGEgb3B0aW9ucy4gUmV0dXJucyB0cnVlIG9mIFxhIHN1YlN0cmluZyB3YXMgZm91bmQgYW5k IHNlbGVjdHMKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaCBiL1dlYktpdC9x dC9BcGkvcXdlYnZpZXcuaAppbmRleCA5Y2VmOGE0Li43YjU2ZjM3IDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5oCkBAIC00 OSw2ICs0OSw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJWaWV3IDogcHVibGljIFFXaWRn ZXQKICAgICBRX1BST1BFUlRZKGJvb2wgbW9kaWZpZWQgUkVBRCBpc01vZGlmaWVkKQogICAgIC8v UV9QUk9QRVJUWShRdDo6VGV4dEludGVyYWN0aW9uRmxhZ3MgdGV4dEludGVyYWN0aW9uRmxhZ3Mg UkVBRCB0ZXh0SW50ZXJhY3Rpb25GbGFncyBXUklURSBzZXRUZXh0SW50ZXJhY3Rpb25GbGFncykK ICAgICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVs dGlwbGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxpZXIpCisgICAgUV9QUk9QRVJUWShxcmVh bCBzaXplTXVsdGlwbGllciBSRUFEIHNpemVNdWx0aXBsaWVyIFdSSVRFIHNldFNpemVNdWx0aXBs aWVyKQogcHVibGljOgogICAgIGV4cGxpY2l0IFFXZWJWaWV3KFFXaWRnZXQgKnBhcmVudCA9IDAp OwogICAgIHZpcnR1YWwgflFXZWJWaWV3KCk7CkBAIC05NSw2ICs5Niw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBmYWN0b3IpOwogICAgIHFyZWFsIHRl eHRTaXplTXVsdGlwbGllcigpIGNvbnN0OwogCisgICAgdm9pZCBzZXRTaXplTXVsdGlwbGllcihx cmVhbCBmYWN0b3IpOworICAgIHFyZWFsIHNpemVNdWx0aXBsaWVyKCkgY29uc3Q7CisKICAgICBi b29sIGZpbmRUZXh0KGNvbnN0IFFTdHJpbmcgJnN1YlN0cmluZywgUVdlYlBhZ2U6OkZpbmRGbGFn cyBvcHRpb25zID0gMCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgZXZlbnQoUUV2ZW50ICopOwpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg ODBhMmM3MS4uNmEyMzFiMiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDgtMDUtMjAgIFNpcmFqIFJh emljayAgPHNpcmFqLnJhemlja0Bjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MTI1CisKKyAgICAgICAgWm9vbSBib3RoIHRleHQgYW5kIGltYWdlcwor CisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OnNldFNp emVNdWx0aXBsaWVyKToKKyAgICAgICAgKFFXZWJGcmFtZTo6c2l6ZU11bHRpcGxpZXIpOgorICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgorICAg ICAgICAoUVdlYlZpZXc6OnNldFNpemVNdWx0aXBsaWVyKToKKyAgICAgICAgKFFXZWJWaWV3Ojpz aXplTXVsdGlwbGllcik6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3Lmg6CisKIDIwMDgtMDUtMTMg IEFuZHkgU2hhdyAgPGFuZHlAdHJvbGx0ZWNoLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT aW1vbi4KLS0gCjEuNS41Cgo= 21271 2008-05-21 10:49:26 -0700 2008-06-24 09:42:13 -0700 Add functions to get/set the zoom level zoomapiqt.patch text/plain 3765 siraj SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gMzM5NjcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDgtMDUtMjEgIFNpcmFqIFJhemljayAgPHNpcmFqLnJh emlja0Bjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MTI1CisKKyAgICAgICAgW1F0XSBhZGQgZnVuY3Rpb25zIHRvIGdldC9zZXQgdGhlIHpvb20gbGV2 ZWwKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lOjpz ZXRab29tRmFjdG9yKToKKyAgICAgICAgKFFXZWJGcmFtZTo6em9vbUZhY3Rvcik6CisgICAgICAg ICogQXBpL3F3ZWJmcmFtZS5oOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5jcHA6CisgICAgICAg IChRV2ViVmlldzo6c2V0Wm9vbUZhY3Rvcik6CisgICAgICAgIChRV2ViVmlldzo6em9vbUZhY3Rv cik6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3Lmg6CisKIDIwMDgtMDUtMTMgIEFuZHkgU2hhdyAg PGFuZHlAdHJvbGx0ZWNoLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbi4KSW5kZXg6 IFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5jcHAJKHJldmlzaW9uIDMzOTY0KQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTcsNiArNjU3LDE2IEBAIHFyZWFsIFFXZWJGcmFt ZTo6dGV4dFNpemVNdWx0aXBsaWVyKCkgY28KICAgICByZXR1cm4gZC0+ZnJhbWUtPnpvb21GYWN0 b3IoKTsKIH0KIAordm9pZCBRV2ViRnJhbWU6OnNldFpvb21GYWN0b3IocXJlYWwgZmFjdG9yKQor eworICAgIGQtPmZyYW1lLT5zZXRab29tRmFjdG9yKGZhY3RvciwgZmFsc2UpOworfQorCitxcmVh bCBRV2ViRnJhbWU6Onpvb21GYWN0b3IoKSBjb25zdAoreworICAgIHJldHVybiBkLT5mcmFtZS0+ em9vbUZhY3RvcigpOworfQorCiAvKiEKICAgICBSZXR1cm5zIHRoZSBwb3NpdGlvbiBvZiB0aGUg ZnJhbWUgcmVsYXRpdmUgdG8gaXQncyBwYXJlbnQgZnJhbWUuCiAqLwpJbmRleDogV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5o CShyZXZpc2lvbiAzMzk2NCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgJKHdvcmtpbmcg Y29weSkKQEAgLTk3LDYgKzk3LDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYkZyYW1lIDog cHVibGljIAogewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShxcmVhbCB0ZXh0U2l6ZU11 bHRpcGxpZXIgUkVBRCB0ZXh0U2l6ZU11bHRpcGxpZXIgV1JJVEUgc2V0VGV4dFNpemVNdWx0aXBs aWVyKQorICAgIFFfUFJPUEVSVFkocXJlYWwgem9vbUZhY3RvciBSRUFEIHpvb21GYWN0b3IgV1JJ VEUgc2V0Wm9vbUZhY3RvcikKICAgICBRX1BST1BFUlRZKFFTdHJpbmcgdGl0bGUgUkVBRCB0aXRs ZSkKICAgICBRX1BST1BFUlRZKFFVcmwgdXJsIFJFQUQgdXJsIFdSSVRFIHNldFVybCkKICAgICBR X1BST1BFUlRZKFFJY29uIGljb24gUkVBRCBpY29uKQpAQCAtMTQ5LDYgKzE1MCw5IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBmYWN0b3IpOwogICAgIHFy ZWFsIHRleHRTaXplTXVsdGlwbGllcigpIGNvbnN0OwogCisgICAgdm9pZCBzZXRab29tRmFjdG9y KHFyZWFsIGZhY3Rvcik7CisgICAgcXJlYWwgem9vbUZhY3RvcigpIGNvbnN0OworCiAgICAgUVBv aW50IHBvcygpIGNvbnN0OwogICAgIFFSZWN0IGdlb21ldHJ5KCkgY29uc3Q7CiAgICAgUVNpemUg Y29udGVudHNTaXplKCkgY29uc3Q7CkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAkocmV2aXNpb24gMzM5NjQp CisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg2LDYg KzQ4NiwxNiBAQCBxcmVhbCBRV2ViVmlldzo6dGV4dFNpemVNdWx0aXBsaWVyKCkgY29uCiAgICAg cmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1lKCktPnRleHRTaXplTXVsdGlwbGllcigpOwogfQogCit2 b2lkIFFXZWJWaWV3OjpzZXRab29tRmFjdG9yKHFyZWFsIGZhY3RvcikKK3sKKyAgICBwYWdlKCkt Pm1haW5GcmFtZSgpLT5zZXRab29tRmFjdG9yKGZhY3Rvcik7Cit9CisKK3FyZWFsIFFXZWJWaWV3 Ojp6b29tRmFjdG9yKCkgY29uc3QKK3sKKyAgIHJldHVybiBwYWdlKCktPm1haW5GcmFtZSgpLT56 b29tRmFjdG9yKCk7Cit9CisKIC8qIQogICAgIEZpbmRzIHRoZSBuZXh0IG9jY3VycmVuY2Ugb2Yg dGhlIHN0cmluZywgXGEgc3ViU3RyaW5nLCBpbiB0aGUgcGFnZSwgdXNpbmcKICAgICB0aGUgZ2l2 ZW4gXGEgb3B0aW9ucy4gUmV0dXJucyB0cnVlIG9mIFxhIHN1YlN0cmluZyB3YXMgZm91bmQgYW5k IHNlbGVjdHMKSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmgJKHJldmlzaW9uIDMzOTY0KQorKysgV2ViS2l0L3F0L0Fw aS9xd2Vidmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw3IEBAIGNsYXNzIFFXRUJL SVRfRVhQT1JUIFFXZWJWaWV3IDogcHVibGljIFEKICAgICBRX1BST1BFUlRZKGJvb2wgbW9kaWZp ZWQgUkVBRCBpc01vZGlmaWVkKQogICAgIC8vUV9QUk9QRVJUWShRdDo6VGV4dEludGVyYWN0aW9u RmxhZ3MgdGV4dEludGVyYWN0aW9uRmxhZ3MgUkVBRCB0ZXh0SW50ZXJhY3Rpb25GbGFncyBXUklU RSBzZXRUZXh0SW50ZXJhY3Rpb25GbGFncykKICAgICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXpl TXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRp cGxpZXIpCisgICAgUV9QUk9QRVJUWShxcmVhbCB6b29tRmFjdG9yIFJFQUQgem9vbUZhY3RvciBX UklURSBzZXRab29tRmFjdG9yKQogcHVibGljOgogICAgIGV4cGxpY2l0IFFXZWJWaWV3KFFXaWRn ZXQgKnBhcmVudCA9IDApOwogICAgIHZpcnR1YWwgflFXZWJWaWV3KCk7CkBAIC05NSw2ICs5Niw5 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBmYWN0b3Ip OwogICAgIHFyZWFsIHRleHRTaXplTXVsdGlwbGllcigpIGNvbnN0OwogCisgICAgdm9pZCBzZXRa b29tRmFjdG9yKHFyZWFsIGZhY3Rvcik7CisgICAgcXJlYWwgem9vbUZhY3RvcigpIGNvbnN0Owor CiAgICAgYm9vbCBmaW5kVGV4dChjb25zdCBRU3RyaW5nICZzdWJTdHJpbmcsIFFXZWJQYWdlOjpG aW5kRmxhZ3Mgb3B0aW9ucyA9IDApOwogCiAgICAgdmlydHVhbCBib29sIGV2ZW50KFFFdmVudCAq KTsK 21911 2008-06-24 09:42:13 -0700 2008-07-26 22:34:19 -0700 Add functions to get/set the zoom level V2. 19125fix.diff text/plain 4210 siraj SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gMzQ3MzcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMDYtMjMgIFNpcmFqIFJhemljayAgPHNpcmFqLnJh emlja0Bjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkxMjUKKworICAgICAgICBbUXRdIGFkZCBmdW5jdGlvbnMgdG8gZ2V0L3NldCB0aGUg em9vbSBsZXZlbAorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2Vi RnJhbWU6OnRleHRTaXplTXVsdGlwbGllcik6CisgICAgICAgIChRV2ViRnJhbWU6OnNldFBhZ2VT aXplTXVsdGlwbGllcik6CisgICAgICAgIChRV2ViRnJhbWU6OnBhZ2VTaXplTXVsdGlwbGllcik6 CisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5jcHA6 CisgICAgICAgIChRV2ViVmlldzo6c2V0UGFnZVNpemVNdWx0aXBsaWVyKToKKyAgICAgICAgKFFX ZWJWaWV3OjpwYWdlU2l6ZU11bHRpcGxpZXIpOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5oOgor CiAyMDA4LTA2LTIwICBNYXJjIE9yZGluYXMgaSBMbG9waXMgIDxtYXJjLm9yZGluYXNpbGxvcGlz QGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbi4KSW5kZXg6IFdl YktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3 ZWJmcmFtZS5jcHAJKHJldmlzaW9uIDM0NzM3KQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTksNyArNjU5LDIyIEBAIHZvaWQgUVdlYkZyYW1lOjpz ZXRUZXh0U2l6ZU11bHRpcGxpZXIocXIKIAogcXJlYWwgUVdlYkZyYW1lOjp0ZXh0U2l6ZU11bHRp cGxpZXIoKSBjb25zdAogewotICAgIHJldHVybiBkLT5mcmFtZS0+em9vbUZhY3RvcigpOworICAg IHJldHVybiBkLT5mcmFtZS0+dGV4dFpvb21GYWN0b3IoKTsKK30KKworLyohCisgIFxwcm9wZXJ0 eSBRV2ViRnJhbWU6OnBhZ2VTaXplTXVsdGlwbGllcgorICBcYnJpZWYgdGhlIHNjYWxpbmcgZmFj dG9yIGZvciB0aGUgZnJhbWUgY29udGVudHMKKyovCisKK3ZvaWQgUVdlYkZyYW1lOjpzZXRQYWdl U2l6ZU11bHRpcGxpZXIocXJlYWwgZmFjdG9yKQoreworICAgIGQtPmZyYW1lLT5zZXRab29tRmFj dG9yKGZhY3RvciwgZmFsc2UpOworfQorCitxcmVhbCBRV2ViRnJhbWU6OnBhZ2VTaXplTXVsdGlw bGllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPmZyYW1lLT5wYWdlWm9vbUZhY3RvcigpOwog fQogCiAvKiEKSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAkocmV2aXNpb24gMzQ3MzcpCisrKyBXZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBAIHByaXZhdGU6 CiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdAogewogICAg IFFfT0JKRUNUCisgICAgUV9QUk9QRVJUWShxcmVhbCBwYWdlU2l6ZU11bHRpcGxpZXIgUkVBRCBw YWdlU2l6ZU11bHRpcGxpZXIgV1JJVEUgc2V0UGFnZVNpemVNdWx0aXBsaWVyKQogICAgIFFfUFJP UEVSVFkocXJlYWwgdGV4dFNpemVNdWx0aXBsaWVyIFJFQUQgdGV4dFNpemVNdWx0aXBsaWVyIFdS SVRFIHNldFRleHRTaXplTXVsdGlwbGllcikKICAgICBRX1BST1BFUlRZKFFTdHJpbmcgdGl0bGUg UkVBRCB0aXRsZSkKICAgICBRX1BST1BFUlRZKFFVcmwgdXJsIFJFQUQgdXJsIFdSSVRFIHNldFVy bCkKQEAgLTE0OSw2ICsxNTAsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRUZXh0U2l6ZU11bHRp cGxpZXIocXJlYWwgZmFjdG9yKTsKICAgICBxcmVhbCB0ZXh0U2l6ZU11bHRpcGxpZXIoKSBjb25z dDsKIAorICAgIHZvaWQgc2V0UGFnZVNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3Rvcik7CisgICAg cXJlYWwgcGFnZVNpemVNdWx0aXBsaWVyKCkgY29uc3Q7CisKICAgICBRUG9pbnQgcG9zKCkgY29u c3Q7CiAgICAgUVJlY3QgZ2VvbWV0cnkoKSBjb25zdDsKICAgICBRU2l6ZSBjb250ZW50c1NpemUo KSBjb25zdDsKSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCShyZXZpc2lvbiAzNDczNykKKysrIFdlYktpdC9x dC9BcGkvcXdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODgsNiArNDg4LDIxIEBAIHFy ZWFsIFFXZWJWaWV3Ojp0ZXh0U2l6ZU11bHRpcGxpZXIoKSBjb24KIH0KIAogLyohCisgIFxwcm9w ZXJ0eSBRV2ViVmlldzo6cGFnZVNpemVNdWx0aXBsaWVyCisgIFxicmllZiB0aGUgc2NhbGluZyBm YWN0b3IgZm9yIHRoZSBmcmFtZSBjb250ZW50cworKi8KKwordm9pZCBRV2ViVmlldzo6c2V0UGFn ZVNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3RvcikKK3sKKyAgICBwYWdlKCktPm1haW5GcmFtZSgp LT5zZXRQYWdlU2l6ZU11bHRpcGxpZXIoZmFjdG9yKTsKK30KKworcXJlYWwgUVdlYlZpZXc6OnBh Z2VTaXplTXVsdGlwbGllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1l KCktPnBhZ2VTaXplTXVsdGlwbGllcigpOworfQorCisvKiEKICAgICBGaW5kcyB0aGUgbmV4dCBv Y2N1cnJlbmNlIG9mIHRoZSBzdHJpbmcsIFxhIHN1YlN0cmluZywgaW4gdGhlIHBhZ2UsIHVzaW5n CiAgICAgdGhlIGdpdmVuIFxhIG9wdGlvbnMuIFJldHVybnMgdHJ1ZSBvZiBcYSBzdWJTdHJpbmcg d2FzIGZvdW5kIGFuZCBzZWxlY3RzCiAgICAgdGhlIG1hdGNoIHZpc3VhbGx5OyBvdGhlcndpc2Ug cmV0dXJucyBmYWxzZS4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmgJKHJldmlzaW9uIDM0NzM3KQorKysgV2ViS2l0 L3F0L0FwaS9xd2Vidmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw3IEBAIGNsYXNz IFFXRUJLSVRfRVhQT1JUIFFXZWJWaWV3IDogcHVibGljIFEKICAgICBRX1BST1BFUlRZKGJvb2wg bW9kaWZpZWQgUkVBRCBpc01vZGlmaWVkKQogICAgIC8vUV9QUk9QRVJUWShRdDo6VGV4dEludGVy YWN0aW9uRmxhZ3MgdGV4dEludGVyYWN0aW9uRmxhZ3MgUkVBRCB0ZXh0SW50ZXJhY3Rpb25GbGFn cyBXUklURSBzZXRUZXh0SW50ZXJhY3Rpb25GbGFncykKICAgICBRX1BST1BFUlRZKHFyZWFsIHRl eHRTaXplTXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBzZXRUZXh0U2l6 ZU11bHRpcGxpZXIpCisgICAgUV9QUk9QRVJUWShxcmVhbCBwYWdlU2l6ZU11bHRpcGxpZXIgUkVB RCBwYWdlU2l6ZU11bHRpcGxpZXIgV1JJVEUgc2V0UGFnZVNpemVNdWx0aXBsaWVyKQogcHVibGlj OgogICAgIGV4cGxpY2l0IFFXZWJWaWV3KFFXaWRnZXQgKnBhcmVudCA9IDApOwogICAgIHZpcnR1 YWwgflFXZWJWaWV3KCk7CkBAIC05NSw2ICs5Niw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRl eHRTaXplTXVsdGlwbGllcihxcmVhbCBmYWN0b3IpOwogICAgIHFyZWFsIHRleHRTaXplTXVsdGlw bGllcigpIGNvbnN0OwogCisgICAgdm9pZCBzZXRQYWdlU2l6ZU11bHRpcGxpZXIocXJlYWwgZmFj dG9yKTsKKyAgICBxcmVhbCBwYWdlU2l6ZU11bHRpcGxpZXIoKSBjb25zdDsKKwogICAgIGJvb2wg ZmluZFRleHQoY29uc3QgUVN0cmluZyAmc3ViU3RyaW5nLCBRV2ViUGFnZTo6RmluZEZsYWdzIG9w dGlvbnMgPSAwKTsKIAogICAgIHZpcnR1YWwgYm9vbCBldmVudChRRXZlbnQgKik7Cg== 22494 2008-07-26 05:56:17 -0700 2008-08-05 08:28:17 -0700 Zoom factor patch v3 patch.txt text/plain 6624 hausmann ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGY2MDU1ZjMuLjg3ZmJmZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDA4LTA3LTI2ICBTaW1v biBIYXVzbWFubiAgPGhhdXNtYW5uQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmFzZWQgb24gcGF0Y2ggYnkgU2lyYWogcmF6aWNr IDxzaXJhai5yYXppY2tAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEyNQorCisgICAgICAgIEFkZGVkIGZ1bmN0aW9u cyB0byBnZXQvc2V0IHRoZSB6b29tIGZhY3Rvci4KKworICAgICAgICBBZGRlZCBhIFFXZWJGcmFt ZS9RV2ViVmlldzo6em9vbUZhY3RvciBhcyB3ZWxsIGFzIGEgYm9vbGVhbgorICAgICAgICB6b29t VGV4dE9ubHkgcHJvcGVydHkuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAg ICAgKFFXZWJGcmFtZVByaXZhdGU6OmluaXQpOgorICAgICAgICAoUVdlYkZyYW1lOjpzZXRab29t RmFjdG9yKToKKyAgICAgICAgKFFXZWJGcmFtZTo6em9vbUZhY3Rvcik6CisgICAgICAgIChRV2Vi RnJhbWU6Onpvb21UZXh0T25seSk6CisgICAgICAgIChRV2ViRnJhbWU6OnNldFpvb21UZXh0T25s eSk6CisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5j cHA6CisgICAgICAgIChRV2ViVmlldzo6c2V0Wm9vbUZhY3Rvcik6CisgICAgICAgIChRV2ViVmll dzo6em9vbUZhY3Rvcik6CisgICAgICAgIChRV2ViVmlldzo6em9vbVRleHRPbmx5KToKKyAgICAg ICAgKFFXZWJWaWV3OjpzZXRab29tVGV4dE9ubHkpOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5o OgorCiAyMDA4LTA3LTI1ICBKb2VyZyBCb3JuZW1hbm4gIDxqb2VyZy5ib3JuZW1hbm5AdHJvbGx0 ZWNoLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbi4KZGlmZiAtLWdpdCBhL1dlYktp dC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRl eCA4MTRhYTYwLi5kZmUxYWVhIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC0xMDAsNiArMTAwLDcgQEAg dm9pZCBRV2ViRnJhbWVQcml2YXRlOjppbml0KFFXZWJGcmFtZSAqcWZyYW1lLCBXZWJDb3JlOjpQ YWdlICp3ZWJjb3JlUGFnZSwgUVdlYkYKICAgICAgICAgZnJhbWUtPnJlZigpOyAvLyBiYWxhbmNl ZCBieSBhZG9wdFJlZiBpbiBGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVGcmFtZQogICAgIGZy YW1lTG9hZGVyQ2xpZW50LT5zZXRGcmFtZShxZnJhbWUsIGZyYW1lKTsKICAgICBmcmFtZS0+aW5p dCgpOworICAgIHEtPnNldFpvb21UZXh0T25seShmYWxzZSk7CiB9CiAKIFdlYkNvcmU6OlBsYXRm b3JtU2Nyb2xsYmFyICpRV2ViRnJhbWVQcml2YXRlOjpob3Jpem9udGFsU2Nyb2xsQmFyKCkgY29u c3QKQEAgLTE1MCw4ICsxNTEsOCBAQCB2b2lkIFFXZWJGcmFtZVByaXZhdGU6OnVwZGF0ZUJhY2tn cm91bmQoKQogICAgIEFkZGl0aW9uYWxseSwgYSBmcmFtZSBtYXkgYWxzbyBzcGVjaWZ5IGFuIGlj b24sIHdoaWNoIGNhbiBiZSBhY2Nlc3NlZAogICAgIHVzaW5nIHRoZSBpY29uKCkgcHJvcGVydHku IElmIHRoZSB0aXRsZSBvciB0aGUgaWNvbiBjaGFuZ2VzLCB0aGUKICAgICBjb3JyZXNwb25kaW5n IHRpdGxlQ2hhbmdlZCgpIGFuZCBpY29uQ2hhbmdlZCgpIHNpZ25hbHMgd2lsbCBiZSBlbWl0dGVk LgotICAgIFRoZSB0ZXh0U2l6ZU11bHRpcGxpZXIoKSBwcm9wZXJ0eSBjYW4gYmUgdXNlZCB0byBj aGFuZ2UgdGhlIG92ZXJhbGwgc2l6ZQotICAgIG9mIHRoZSB0ZXh0IGRpc3BsYXllZCBpbiB0aGUg ZnJhbWUuCisgICAgVGhlIHpvb21GYWN0b3IoKSBwcm9wZXJ0eSBjYW4gYmUgdXNlZCB0byBjaGFu Z2UgdGhlIG92ZXJhbGwgc2l6ZQorICAgIG9mIHRoZSBjb250ZW50IGRpc3BsYXllZCBpbiB0aGUg ZnJhbWUuCiAKICAgICBRV2ViRnJhbWUgb2JqZWN0cyBhcmUgY3JlYXRlZCBhbmQgY29udHJvbGxl ZCBieSB0aGUgd2ViIHBhZ2UuIFlvdQogICAgIGNhbiBjb25uZWN0IHRvIHRoZSB3ZWIgcGFnZSdz IFxse1FXZWJQYWdlOjp9e2ZyYW1lQ3JlYXRlZCgpfSBzaWduYWwKQEAgLTY1Miw2ICs2NTMsOSBA QCB2b2lkIFFXZWJGcmFtZTo6cmVuZGVyKFFQYWludGVyICpwYWludGVyKQogLyohCiAgIFxwcm9w ZXJ0eSBRV2ViRnJhbWU6OnRleHRTaXplTXVsdGlwbGllcgogICBcYnJpZWYgdGhlIHNjYWxpbmcg ZmFjdG9yIGZvciBhbGwgdGV4dCBpbiB0aGUgZnJhbWUKKworICBOb3RlIHRoYXQgc2V0dGluZyB0 aGlzIHByb3BlcnR5IGFsc28gZW5hYmxlcyB0aGUKKyAgem9vbVRleHRPbmx5IHByb3BlcnR5Lgog Ki8KIAogdm9pZCBRV2ViRnJhbWU6OnNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBmYWN0b3Ip CkBAIC02NjUsNiArNjY5LDQyIEBAIHFyZWFsIFFXZWJGcmFtZTo6dGV4dFNpemVNdWx0aXBsaWVy KCkgY29uc3QKIH0KIAogLyohCisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6em9vbUZhY3Rvcgor ICAgIFxzaW5jZSA0LjUKKyAgICBcYnJpZWYgdGhlIHpvb20gZmFjdG9yIGZvciB0aGUgZnJhbWUK KyovCisKK3ZvaWQgUVdlYkZyYW1lOjpzZXRab29tRmFjdG9yKHFyZWFsIGZhY3RvcikKK3sKKyAg ICBkLT5mcmFtZS0+c2V0Wm9vbUZhY3RvcihmYWN0b3IsIGQtPmZyYW1lLT5pc1pvb21GYWN0b3JU ZXh0T25seSgpKTsKK30KKworcXJlYWwgUVdlYkZyYW1lOjp6b29tRmFjdG9yKCkgY29uc3QKK3sK KyAgICByZXR1cm4gZC0+ZnJhbWUtPnpvb21GYWN0b3IoKTsKK30KKworLyohCisgICAgXHByb3Bl cnR5IFFXZWJGcmFtZTo6em9vbVRleHRPbmx5CisgICAgXHNpbmNlIDQuNQorICAgIFxicmllZiB3 aGV0aGVyIHRoZSB6b29tIGZhY3RvciBhcHBsaWVzIHRvIG9ubHkgdGhlIHRleHQgb3IgYWxsIGNv bnRlbnQgaW4gdGhlIGZyYW1lCisKKyAgICBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBmYWxzZS4KKwor ICAgIFxzYSB6b29tRmFjdG9yCisqLworCitib29sIFFXZWJGcmFtZTo6em9vbVRleHRPbmx5KCkg Y29uc3QKK3sKKyAgICByZXR1cm4gZC0+ZnJhbWUtPmlzWm9vbUZhY3RvclRleHRPbmx5KCk7Cit9 CisKK3ZvaWQgUVdlYkZyYW1lOjpzZXRab29tVGV4dE9ubHkoYm9vbCB0ZXh0T25seSkKK3sKKyAg ICBkLT5mcmFtZS0+c2V0Wm9vbUZhY3RvcihkLT5mcmFtZS0+em9vbUZhY3RvcigpLCB0ZXh0T25s eSk7Cit9CisKKy8qIQogICAgIFJldHVybnMgdGhlIHBvc2l0aW9uIG9mIHRoZSBmcmFtZSByZWxh dGl2ZSB0byBpdCdzIHBhcmVudCBmcmFtZS4KICovCiBRUG9pbnQgUVdlYkZyYW1lOjpwb3MoKSBj b25zdApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmgKaW5kZXggNGU5YmU4OC4uNDFkNjM1NyAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC05 Nyw2ICs5Nyw4IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJGcmFtZSA6IHB1YmxpYyBRT2Jq ZWN0CiB7CiAgICAgUV9PQkpFQ1QKICAgICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVsdGlw bGllciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxpZXIp CisgICAgUV9QUk9QRVJUWShxcmVhbCB6b29tRmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklURSBz ZXRab29tRmFjdG9yKQorICAgIFFfUFJPUEVSVFkoYm9vbCB6b29tVGV4dE9ubHkgUkVBRCB6b29t VGV4dE9ubHkgV1JJVEUgc2V0Wm9vbVRleHRPbmx5KQogICAgIFFfUFJPUEVSVFkoUVN0cmluZyB0 aXRsZSBSRUFEIHRpdGxlKQogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgV1JJVEUg c2V0VXJsKQogICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGljb24pCkBAIC0xNDksNiAr MTUxLDEyIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBm YWN0b3IpOwogICAgIHFyZWFsIHRleHRTaXplTXVsdGlwbGllcigpIGNvbnN0OwogCisgICAgcXJl YWwgem9vbUZhY3RvcigpIGNvbnN0OworICAgIHZvaWQgc2V0Wm9vbUZhY3RvcihxcmVhbCBmYWN0 b3IpOworCisgICAgYm9vbCB6b29tVGV4dE9ubHkoKSBjb25zdDsKKyAgICB2b2lkIHNldFpvb21U ZXh0T25seShib29sIHRleHRPbmx5KTsKKwogICAgIFFQb2ludCBwb3MoKSBjb25zdDsKICAgICBR UmVjdCBnZW9tZXRyeSgpIGNvbnN0OwogICAgIFFTaXplIGNvbnRlbnRzU2l6ZSgpIGNvbnN0Owpk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3 ZWJ2aWV3LmNwcAppbmRleCBkYTA0ODk3Li41YmEwNWEyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv QXBpL3F3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcApAQCAtNDcz LDggKzQ3Myw0OCBAQCBRU2l6ZSBRV2ViVmlldzo6c2l6ZUhpbnQoKSBjb25zdAogfQogCiAvKiEK KyAgICBccHJvcGVydHkgUVdlYlZpZXc6Onpvb21GYWN0b3IKKyAgICBcc2luY2UgNC41CisgICAg XGJyaWVmIHRoZSB6b29tIGZhY3RvciBmb3IgdGhlIHZpZXcKKyovCisKK3ZvaWQgUVdlYlZpZXc6 OnNldFpvb21GYWN0b3IocXJlYWwgZmFjdG9yKQoreworICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCkt PnNldFpvb21GYWN0b3IoZmFjdG9yKTsKK30KKworcXJlYWwgUVdlYlZpZXc6Onpvb21GYWN0b3Io KSBjb25zdAoreworICAgIHJldHVybiBwYWdlKCktPm1haW5GcmFtZSgpLT56b29tRmFjdG9yKCk7 Cit9CisKKy8qIQorICAgIFxwcm9wZXJ0eSBRV2ViVmlldzo6em9vbVRleHRPbmx5CisgICAgXHNp bmNlIDQuNQorICAgIFxicmllZiB3aGV0aGVyIHRoZSB6b29tIGZhY3RvciBhcHBsaWVzIHRvIG9u bHkgdGhlIHRleHQgb3IgYWxsIGNvbnRlbnQgb2YgdGhlIHZpZXcKKworICAgIFRoZSBkZWZhdWx0 IHZhbHVlIGlzIGZhbHNlLgorCisgICAgXHNhIHpvb21GYWN0b3IKKyovCisKK2Jvb2wgUVdlYlZp ZXc6Onpvb21UZXh0T25seSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1l KCktPnpvb21UZXh0T25seSgpOworfQorCit2b2lkIFFXZWJWaWV3OjpzZXRab29tVGV4dE9ubHko Ym9vbCB0ZXh0T25seSkKK3sKKyAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5zZXRab29tVGV4dE9u bHkodGV4dE9ubHkpOworfQorCisKKy8qIQogICBccHJvcGVydHkgUVdlYlZpZXc6OnRleHRTaXpl TXVsdGlwbGllcgogICBcYnJpZWYgdGhlIHNjYWxpbmcgZmFjdG9yIGZvciBhbGwgdGV4dCBpbiB0 aGUgZnJhbWUKKworICBOb3RlIHRoYXQgc2V0dGluZyB0aGlzIHByb3BlcnR5IGFsc28gZW5hYmxl cyB0aGUKKyAgem9vbVRleHRPbmx5IHByb3BlcnR5LgogKi8KIAogdm9pZCBRV2ViVmlldzo6c2V0 VGV4dFNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3RvcikKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9B cGkvcXdlYnZpZXcuaCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaAppbmRleCA5Y2VmOGE0Li41 YWUzMjMxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0 L3F0L0FwaS9xd2Vidmlldy5oCkBAIC00OSw2ICs0OSw4IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JU IFFXZWJWaWV3IDogcHVibGljIFFXaWRnZXQKICAgICBRX1BST1BFUlRZKGJvb2wgbW9kaWZpZWQg UkVBRCBpc01vZGlmaWVkKQogICAgIC8vUV9QUk9QRVJUWShRdDo6VGV4dEludGVyYWN0aW9uRmxh Z3MgdGV4dEludGVyYWN0aW9uRmxhZ3MgUkVBRCB0ZXh0SW50ZXJhY3Rpb25GbGFncyBXUklURSBz ZXRUZXh0SW50ZXJhY3Rpb25GbGFncykKICAgICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVs dGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxp ZXIpCisgICAgUV9QUk9QRVJUWShxcmVhbCB6b29tRmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklU RSBzZXRab29tRmFjdG9yKQorICAgIFFfUFJPUEVSVFkoYm9vbCB6b29tVGV4dE9ubHkgUkVBRCB6 b29tVGV4dE9ubHkgV1JJVEUgc2V0Wm9vbVRleHRPbmx5KQogcHVibGljOgogICAgIGV4cGxpY2l0 IFFXZWJWaWV3KFFXaWRnZXQgKnBhcmVudCA9IDApOwogICAgIHZpcnR1YWwgflFXZWJWaWV3KCk7 CkBAIC05Miw2ICs5NCwxMiBAQCBwdWJsaWM6CiAKICAgICBRU2l6ZSBzaXplSGludCgpIGNvbnN0 OwogCisgICAgcXJlYWwgem9vbUZhY3RvcigpIGNvbnN0OworICAgIHZvaWQgc2V0Wm9vbUZhY3Rv cihxcmVhbCBmYWN0b3IpOworCisgICAgYm9vbCB6b29tVGV4dE9ubHkoKSBjb25zdDsKKyAgICB2 b2lkIHNldFpvb21UZXh0T25seShib29sIHRleHRPbmx5KTsKKwogICAgIHZvaWQgc2V0VGV4dFNp emVNdWx0aXBsaWVyKHFyZWFsIGZhY3Rvcik7CiAgICAgcXJlYWwgdGV4dFNpemVNdWx0aXBsaWVy KCkgY29uc3Q7CiAK 22655 2008-08-05 08:28:17 -0700 2008-08-11 18:13:38 -0700 Zoom factor patch v4 patch.txt text/plain 8674 hausmann ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2Y5NGNhNC4uZjVjMzNjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOC0wOC0wNSAgU2ltb24gSGF1c21h bm4gIDxoYXVzbWFubkB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluaXRpYWxpemUgbV96b29tc1RleHRPbmx5IGluIHRoZSBjb25z dHJ1Y3Rvci4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OlNldHRpbmdzKToKKwogMjAwOC0wOC0wNSAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcCBiL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAKaW5kZXggNjFhMWNlZi4uYzQwNWVjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCkBAIC03OCw2ICs3OCw3 IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAgICwgbV9vZmZsaW5lV2ViQXBw bGljYXRpb25DYWNoZUVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3JhbmdlTXV0YXRpb25EaXNhYmxl ZEZvck9sZEFwcGxlTWFpbChmYWxzZSkKICAgICAsIG1fc2hvdWxkUGFpbnRDdXN0b21TY3JvbGxi YXJzKGZhbHNlKQorICAgICwgbV96b29tc1RleHRPbmx5KGZhbHNlKQogICAgICwgbV9lbmZvcmNl Q1NTTUlNRVR5cGVJblN0cmljdE1vZGUodHJ1ZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3Qg aGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcg CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5jcHAKaW5kZXggZGQxMzYyZi4uMjBlNGUyOSAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApA QCAtMTQ5LDggKzE0OSw4IEBAIHZvaWQgUVdlYkZyYW1lUHJpdmF0ZTo6dXBkYXRlQmFja2dyb3Vu ZCgpCiAgICAgQWRkaXRpb25hbGx5LCBhIGZyYW1lIG1heSBhbHNvIHNwZWNpZnkgYW4gaWNvbiwg d2hpY2ggY2FuIGJlIGFjY2Vzc2VkCiAgICAgdXNpbmcgdGhlIGljb24oKSBwcm9wZXJ0eS4gSWYg dGhlIHRpdGxlIG9yIHRoZSBpY29uIGNoYW5nZXMsIHRoZQogICAgIGNvcnJlc3BvbmRpbmcgdGl0 bGVDaGFuZ2VkKCkgYW5kIGljb25DaGFuZ2VkKCkgc2lnbmFscyB3aWxsIGJlIGVtaXR0ZWQuCi0g ICAgVGhlIHRleHRTaXplTXVsdGlwbGllcigpIHByb3BlcnR5IGNhbiBiZSB1c2VkIHRvIGNoYW5n ZSB0aGUgb3ZlcmFsbCBzaXplCi0gICAgb2YgdGhlIHRleHQgZGlzcGxheWVkIGluIHRoZSBmcmFt ZS4KKyAgICBUaGUgem9vbUZhY3RvcigpIHByb3BlcnR5IGNhbiBiZSB1c2VkIHRvIGNoYW5nZSB0 aGUgb3ZlcmFsbCBzaXplCisgICAgb2YgdGhlIGNvbnRlbnQgZGlzcGxheWVkIGluIHRoZSBmcmFt ZS4KIAogICAgIFFXZWJGcmFtZSBvYmplY3RzIGFyZSBjcmVhdGVkIGFuZCBjb250cm9sbGVkIGJ5 IHRoZSB3ZWIgcGFnZS4gWW91CiAgICAgY2FuIGNvbm5lY3QgdG8gdGhlIHdlYiBwYWdlJ3MgXGx7 UVdlYlBhZ2U6On17ZnJhbWVDcmVhdGVkKCl9IHNpZ25hbApAQCAtNjg2LDYgKzY4NiwxMyBAQCB2 b2lkIFFXZWJGcmFtZTo6cmVuZGVyKFFQYWludGVyICpwYWludGVyKQogLyohCiAgIFxwcm9wZXJ0 eSBRV2ViRnJhbWU6OnRleHRTaXplTXVsdGlwbGllcgogICBcYnJpZWYgdGhlIHNjYWxpbmcgZmFj dG9yIGZvciBhbGwgdGV4dCBpbiB0aGUgZnJhbWUKKyAgXG9ic29sZXRlCisKKyAgVXNlIHNldFpv b21GYWN0b3IgaW5zdGVhZCwgaW4gY29tYmluYXRpb24gd2l0aCB0aGUKKyAgWm9vbVRleHRPbmx5 IGF0dHJpYnV0ZSBpbiBRV2ViU2V0dGluZ3MuCisKKyAgXG5vdGUgU2V0dGluZyB0aGlzIHByb3Bl cnR5IGFsc28gZW5hYmxlcyB0aGUKKyAgWm9vbVRleHRPbmx5IGF0dHJpYnV0ZSBpbiBRV2ViU2V0 dGluZ3MuCiAqLwogCiB2b2lkIFFXZWJGcmFtZTo6c2V0VGV4dFNpemVNdWx0aXBsaWVyKHFyZWFs IGZhY3RvcikKQEAgLTY5OSw2ICs3MDYsMjIgQEAgcXJlYWwgUVdlYkZyYW1lOjp0ZXh0U2l6ZU11 bHRpcGxpZXIoKSBjb25zdAogfQogCiAvKiEKKyAgICBccHJvcGVydHkgUVdlYkZyYW1lOjp6b29t RmFjdG9yCisgICAgXHNpbmNlIDQuNQorICAgIFxicmllZiB0aGUgem9vbSBmYWN0b3IgZm9yIHRo ZSBmcmFtZQorKi8KKwordm9pZCBRV2ViRnJhbWU6OnNldFpvb21GYWN0b3IocXJlYWwgZmFjdG9y KQoreworICAgIGQtPmZyYW1lLT5zZXRab29tRmFjdG9yKGZhY3RvciwgZC0+ZnJhbWUtPmlzWm9v bUZhY3RvclRleHRPbmx5KCkpOworfQorCitxcmVhbCBRV2ViRnJhbWU6Onpvb21GYWN0b3IoKSBj b25zdAoreworICAgIHJldHVybiBkLT5mcmFtZS0+em9vbUZhY3RvcigpOworfQorCisvKiEKICAg ICBSZXR1cm5zIHRoZSBwb3NpdGlvbiBvZiB0aGUgZnJhbWUgcmVsYXRpdmUgdG8gaXQncyBwYXJl bnQgZnJhbWUuCiAqLwogUVBvaW50IFFXZWJGcmFtZTo6cG9zKCkgY29uc3QKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCmlu ZGV4IDdjOThmMzYuLmE1NmU2ODMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l LmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaApAQCAtOTYsNyArOTYsOSBAQCBwcml2 YXRlOgogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYkZyYW1lIDogcHVibGljIFFPYmplY3QKIHsK ICAgICBRX09CSkVDVAotICAgIFFfUFJPUEVSVFkocXJlYWwgdGV4dFNpemVNdWx0aXBsaWVyIFJF QUQgdGV4dFNpemVNdWx0aXBsaWVyIFdSSVRFIHNldFRleHRTaXplTXVsdGlwbGllcikKKyAgICBR X1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlwbGll ciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxpZXIgREVTSUdOQUJMRSBmYWxzZSkKKyAgICBRX1BS T1BFUlRZKHFyZWFsIHpvb21GYWN0b3IgUkVBRCB6b29tRmFjdG9yIFdSSVRFIHNldFpvb21GYWN0 b3IpCisgICAgUV9QUk9QRVJUWShib29sIHpvb21UZXh0T25seSBSRUFEIHpvb21UZXh0T25seSBX UklURSBzZXRab29tVGV4dE9ubHkpCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRpdGxlIFJFQUQg dGl0bGUpCiAgICAgUV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwpCiAg ICAgUV9QUk9QRVJUWShRSWNvbiBpY29uIFJFQUQgaWNvbikKQEAgLTE1NCw2ICsxNTYsMTIgQEAg cHVibGljOgogICAgIHZvaWQgc2V0VGV4dFNpemVNdWx0aXBsaWVyKHFyZWFsIGZhY3Rvcik7CiAg ICAgcXJlYWwgdGV4dFNpemVNdWx0aXBsaWVyKCkgY29uc3Q7CiAKKyAgICBxcmVhbCB6b29tRmFj dG9yKCkgY29uc3Q7CisgICAgdm9pZCBzZXRab29tRmFjdG9yKHFyZWFsIGZhY3Rvcik7CisKKyAg ICBib29sIHpvb21UZXh0T25seSgpIGNvbnN0OworICAgIHZvaWQgc2V0Wm9vbVRleHRPbmx5KGJv b2wgdGV4dE9ubHkpOworCiAgICAgUVBvaW50IHBvcygpIGNvbnN0OwogICAgIFFSZWN0IGdlb21l dHJ5KCkgY29uc3Q7CiAgICAgUVNpemUgY29udGVudHNTaXplKCkgY29uc3Q7CmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0 aW5ncy5jcHAKaW5kZXggODhhMGI2MC4uNTg5NzZjZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0Fw aS9xd2Vic2V0dGluZ3MuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApA QCAtMTU1LDYgKzE1NSwxMCBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKIAog ICAgICAgICBRVXJsIGxvY2F0aW9uID0gIXVzZXJTdHlsZVNoZWV0TG9jYXRpb24uaXNFbXB0eSgp ID8gdXNlclN0eWxlU2hlZXRMb2NhdGlvbiA6IGdsb2JhbC0+dXNlclN0eWxlU2hlZXRMb2NhdGlv bjsKICAgICAgICAgc2V0dGluZ3MtPnNldFVzZXJTdHlsZVNoZWV0TG9jYXRpb24oV2ViQ29yZTo6 S1VSTChsb2NhdGlvbikpOworCisgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2Vi U2V0dGluZ3M6Olpvb21UZXh0T25seSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdsb2JhbC0+YXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6Olpvb21UZXh0T25seSkpOwor ICAgICAgICBzZXR0aW5ncy0+c2V0Wm9vbXNUZXh0T25seSh2YWx1ZSk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgUUxpc3Q8UVdlYlNldHRpbmdzUHJpdmF0ZSAqPiBzZXR0aW5ncyA9ICo6OmFsbFNl dHRpbmdzKCk7CiAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2V0dGluZ3MuY291bnQoKTsg KytpKQpAQCAtMjYwLDYgKzI2NCw4IEBAIFFXZWJTZXR0aW5ncyAqUVdlYlNldHRpbmdzOjpnbG9i YWxTZXR0aW5ncygpCiAgICAgd2hpY2ggc2hvd3MgdGhlIFdlYktpdCBXZWJJbnNwZWN0b3IgZm9y IHdlYiBzaXRlIGRlYnVnZ2luZy4KICAgICBcdmFsdWUgTGlua3NJbmNsdWRlZEluRm9jdXNDaGFp biBTcGVjaWZpZXMgd2hldGhlciBoeXBlcmxpbmtzIHNob3VsZCBiZQogICAgICAgICBpbmNsdWRl ZCBpbiB0aGUga2V5Ym9hcmQgZm9jdXMgY2hhaW4uCisgICAgXHZhbHVlIFpvb21UZXh0T25seSBT cGVjaWZpZXMgd2hldGhlciB0aGUgem9vbSBmYWN0b3Igb24gYSBmcmFtZSBhcHBsaWVzIHRvCisg ICAgICAgIG9ubHkgdGhlIHRleHQgb3IgYWxsIGNvbnRlbnQuCiAqLwogCiAvKiEKQEAgLTI4NCw2 ICsyOTAsNyBAQCBRV2ViU2V0dGluZ3M6OlFXZWJTZXR0aW5ncygpCiAgICAgZC0+YXR0cmlidXRl cy5pbnNlcnQoUVdlYlNldHRpbmdzOjpBdXRvTG9hZEltYWdlcywgdHJ1ZSk7CiAgICAgZC0+YXR0 cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpKYXZhc2NyaXB0RW5hYmxlZCwgdHJ1ZSk7CiAg ICAgZC0+YXR0cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpMaW5rc0luY2x1ZGVkSW5Gb2N1 c0NoYWluLCB0cnVlKTsKKyAgICBkLT5hdHRyaWJ1dGVzLmluc2VydChRV2ViU2V0dGluZ3M6Olpv b21UZXh0T25seSwgZmFsc2UpOwogfQogCiAvKiEKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkv cXdlYnNldHRpbmdzLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCmluZGV4IDk3YjI0 NmUuLjRjZjU2ZTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKKysr IGIvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaApAQCAtNTgsNyArNTgsOCBAQCBwdWJsaWM6 CiAgICAgICAgIEphdmFzY3JpcHRDYW5PcGVuV2luZG93cywKICAgICAgICAgSmF2YXNjcmlwdENh bkFjY2Vzc0NsaXBib2FyZCwKICAgICAgICAgRGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCwKLSAgICAg ICAgTGlua3NJbmNsdWRlZEluRm9jdXNDaGFpbgorICAgICAgICBMaW5rc0luY2x1ZGVkSW5Gb2N1 c0NoYWluLAorICAgICAgICBab29tVGV4dE9ubHkKICAgICB9OwogICAgIGVudW0gV2ViR3JhcGhp YyB7CiAgICAgICAgIE1pc3NpbmdJbWFnZUdyYXBoaWMsCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv QXBpL3F3ZWJ2aWV3LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4IGRhMDQ4 OTcuLjkxMjM2MGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCkBAIC00NzMsOCArNDczLDMxIEBAIFFTaXplIFFX ZWJWaWV3OjpzaXplSGludCgpIGNvbnN0CiB9CiAKIC8qIQorICAgIFxwcm9wZXJ0eSBRV2ViVmll dzo6em9vbUZhY3RvcgorICAgIFxzaW5jZSA0LjUKKyAgICBcYnJpZWYgdGhlIHpvb20gZmFjdG9y IGZvciB0aGUgdmlldworKi8KKwordm9pZCBRV2ViVmlldzo6c2V0Wm9vbUZhY3RvcihxcmVhbCBm YWN0b3IpCit7CisgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+c2V0Wm9vbUZhY3RvcihmYWN0b3Ip OworfQorCitxcmVhbCBRV2ViVmlldzo6em9vbUZhY3RvcigpIGNvbnN0Cit7CisgICAgcmV0dXJu IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnpvb21GYWN0b3IoKTsKK30KKworLyohCiAgIFxwcm9wZXJ0 eSBRV2ViVmlldzo6dGV4dFNpemVNdWx0aXBsaWVyCiAgIFxicmllZiB0aGUgc2NhbGluZyBmYWN0 b3IgZm9yIGFsbCB0ZXh0IGluIHRoZSBmcmFtZQorICBcb2Jzb2xldGUKKworICBVc2Ugc2V0Wm9v bUZhY3RvciBpbnN0ZWFkLCBpbiBjb21iaW5hdGlvbiB3aXRoIHRoZQorICBab29tVGV4dE9ubHkg YXR0cmlidXRlIGluIFFXZWJTZXR0aW5ncy4KKworICBcbm90ZSBTZXR0aW5nIHRoaXMgcHJvcGVy dHkgYWxzbyBlbmFibGVzIHRoZQorICBab29tVGV4dE9ubHkgYXR0cmlidXRlIGluIFFXZWJTZXR0 aW5ncy4KICovCiAKIHZvaWQgUVdlYlZpZXc6OnNldFRleHRTaXplTXVsdGlwbGllcihxcmVhbCBm YWN0b3IpCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmggYi9XZWJLaXQvcXQv QXBpL3F3ZWJ2aWV3LmgKaW5kZXggOWNlZjhhNC4uZWZhZWVlNiAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2Vidmlldy5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaApAQCAtNDgs NyArNDgsOCBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViVmlldyA6IHB1YmxpYyBRV2lkZ2V0 CiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHNlbGVjdGVkVGV4dCBSRUFEIHNlbGVjdGVkVGV4dCkK ICAgICBRX1BST1BFUlRZKGJvb2wgbW9kaWZpZWQgUkVBRCBpc01vZGlmaWVkKQogICAgIC8vUV9Q Uk9QRVJUWShRdDo6VGV4dEludGVyYWN0aW9uRmxhZ3MgdGV4dEludGVyYWN0aW9uRmxhZ3MgUkVB RCB0ZXh0SW50ZXJhY3Rpb25GbGFncyBXUklURSBzZXRUZXh0SW50ZXJhY3Rpb25GbGFncykKLSAg ICBRX1BST1BFUlRZKHFyZWFsIHRleHRTaXplTXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlw bGllciBXUklURSBzZXRUZXh0U2l6ZU11bHRpcGxpZXIpCisgICAgUV9QUk9QRVJUWShxcmVhbCB0 ZXh0U2l6ZU11bHRpcGxpZXIgUkVBRCB0ZXh0U2l6ZU11bHRpcGxpZXIgV1JJVEUgc2V0VGV4dFNp emVNdWx0aXBsaWVyIERFU0lHTkFCTEUgZmFsc2UpCisgICAgUV9QUk9QRVJUWShxcmVhbCB6b29t RmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklURSBzZXRab29tRmFjdG9yKQogcHVibGljOgogICAg IGV4cGxpY2l0IFFXZWJWaWV3KFFXaWRnZXQgKnBhcmVudCA9IDApOwogICAgIHZpcnR1YWwgflFX ZWJWaWV3KCk7CkBAIC05Miw2ICs5Myw5IEBAIHB1YmxpYzoKIAogICAgIFFTaXplIHNpemVIaW50 KCkgY29uc3Q7CiAKKyAgICBxcmVhbCB6b29tRmFjdG9yKCkgY29uc3Q7CisgICAgdm9pZCBzZXRa b29tRmFjdG9yKHFyZWFsIGZhY3Rvcik7CisKICAgICB2b2lkIHNldFRleHRTaXplTXVsdGlwbGll cihxcmVhbCBmYWN0b3IpOwogICAgIHFyZWFsIHRleHRTaXplTXVsdGlwbGllcigpIGNvbnN0Owog CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpp bmRleCAzOTg5Zjg5Li5lZjJjZDc3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAwOC0wOC0wNSAgU2lt b24gSGF1c21hbm4gIDxoYXVzbWFubkB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJhc2VkIG9uIHBhdGNoIGJ5IFNpcmFqIHJhemlj ayA8c2lyYWoucmF6aWNrQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMjUKKworICAgICAgICBBZGRlZCBmdW5jdGlv bnMgdG8gZ2V0L3NldCB0aGUgem9vbSBmYWN0b3IuCisKKyAgICAgICAgQWRkZWQgYSBRV2ViRnJh bWUvUVdlYlZpZXc6Onpvb21GYWN0b3IgYXMgd2VsbCBhcyBhIGJvb2xlYW4KKyAgICAgICAgWm9v bVRleHRPbmx5IGF0dHJpYnV0ZSBpbiBRV2ViU2V0dGluZ3MuCisKKyAgICAgICAgKiBBcGkvcXdl YmZyYW1lLmNwcDoKKyAgICAgICAgKFFXZWJGcmFtZTo6c2V0Wm9vbUZhY3Rvcik6CisgICAgICAg IChRV2ViRnJhbWU6Onpvb21GYWN0b3IpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKyAg ICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0aW5nc1ByaXZh dGU6OmFwcGx5KToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6UVdlYlNldHRpbmdzKToKKyAgICAg ICAgKiBBcGkvcXdlYnNldHRpbmdzLmg6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKFFXZWJWaWV3OjpzZXRab29tRmFjdG9yKToKKyAgICAgICAgKFFXZWJWaWV3Ojp6b29t RmFjdG9yKToKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuaDoKKwogMjAwOC0wOC0wNSAgVG9yIEFy bmUgVmVzdGLDuCAgPHRhdmVzdGJvQHRyb2xsdGVjaC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2ltb24uCg==