38119 2010-04-26 05:55:25 -0700 [Qt] QWebPage viewMode property 2010-05-07 16:01:09 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All CLOSED FIXED Qt P3 Normal --- 35784 1 luiz hausmann commit-queue hausmann kenneth laszlo.gombos oldest_to_newest 217044 0 luiz 2010-04-26 05:55:25 -0700 Replacing method qt_wrt_setViewMode by wrt_viewMode property. 217056 1 54287 luiz 2010-04-26 06:24:21 -0700 Created attachment 54287 patch 1 217087 2 laszlo.gombos 2010-04-26 07:24:53 -0700 Would be useful to explain why the change of hart about the interface name ? I do support getting rid of qt_ prefix, but I'm not sure if wrt make sense in the name as this might not be just for wrt really. 217101 3 luiz 2010-04-26 07:42:51 -0700 (In reply to comment #2) > Would be useful to explain why the change of hart about the interface name ? I > do support getting rid of qt_ prefix, but I'm not sure if wrt make sense in the > name as this might not be just for wrt really. I agree. 217107 4 54300 luiz 2010-04-26 08:00:37 -0700 Created attachment 54300 patch 2 217114 5 54300 kenneth 2010-04-26 08:13:03 -0700 Comment on attachment 54300 patch 2 So this means that this is now public API. Do we really want that yet? Simon? Spec is Last Call Working Draft btw. 217127 6 hausmann 2010-04-26 09:00:38 -0700 (In reply to comment #5) > (From update of attachment 54300 [details]) > So this means that this is now public API. Do we really want that yet? > > Simon? Spec is Last Call Working Draft btw. I would prefer not to add public API anymore at this point unless it's really necessary. I'm certainly in favour of using dynamic properties for this instead, as changing these private functions always creates a big mess for updating the def files on Symbian. 217364 7 54350 luiz 2010-04-26 16:59:22 -0700 Created attachment 54350 patch 3 217366 8 luiz 2010-04-26 17:01:40 -0700 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 54300 [details] [details]) > > So this means that this is now public API. Do we really want that yet? > > > > Simon? Spec is Last Call Working Draft btw. > > I would prefer not to add public API anymore at this point unless it's really > necessary. > > I'm certainly in favour of using dynamic properties for this instead, as > changing these private functions always creates a big mess for updating the def > files on Symbian. Simon, s this what you mean? 217433 9 54350 kenneth 2010-04-26 18:53:18 -0700 Comment on attachment 54350 patch 3 I guess it would be nice with an autotest for this feature as well. 218214 10 54525 luiz 2010-04-27 22:56:26 -0700 Created attachment 54525 patch 4 218345 11 54525 kenneth 2010-04-28 05:48:03 -0700 Comment on attachment 54525 patch 4 Great Luiz! When this is cherry picked into QtWebKit 2.0, please inform Edisson et al. 218352 12 54525 commit-queue 2010-04-28 05:58:27 -0700 Comment on attachment 54525 patch 4 Clearing flags on attachment: 54525 Committed r58405: <http://trac.webkit.org/changeset/58405> 218353 13 commit-queue 2010-04-28 05:58:39 -0700 All reviewed patches have been landed. Closing bug. 218788 14 laszlo.gombos 2010-04-28 21:06:57 -0700 I think the name of the property should not include wrt prefix as this is not specific to wrt (see also comment #3 and patch #2). Patch will follow for the rename. 218789 15 54668 laszlo.gombos 2010-04-28 21:07:53 -0700 Created attachment 54668 drop wrt prefix from the property name 218972 16 54668 hausmann 2010-04-29 05:23:45 -0700 Comment on attachment 54668 drop wrt prefix from the property name Hmm, I admit I prefer a prefixed or somewhat obfuscated name for these dynamic and private properties, to avoid clashes with a real "viewMode" property (Q_PROPERTY) if we introduce it in the future. Q_PROPERTY and dynamic properties share the same namespace. In Qt we use _qt_ as prefix for private dynamic properties. 218974 17 laszlo.gombos 2010-04-29 05:26:47 -0700 Having an extra prefix (like qt_) is fine with me. My only point was that the viewMode property is not specific to wrt. 218977 18 kenneth 2010-04-29 05:30:32 -0700 So should it be _qt_viewMode or qt_viewMode? 219053 19 laszlo.gombos 2010-04-29 08:48:38 -0700 Hm.. I also so _q_ (without the "t") naming patter in Qt (see qwidget.cpp). Simon, maybe best if you make a call on this. 220471 20 54995 laszlo.gombos 2010-05-03 22:04:27 -0700 Created attachment 54995 Use _q_ prefix for the property name According to http://doc.trolltech.com/4.6/qobject.html#setProperty _q_ seems to be the correct prefix. 220630 21 54995 commit-queue 2010-05-04 09:31:35 -0700 Comment on attachment 54995 Use _q_ prefix for the property name Clearing flags on attachment: 54995 Committed r58764: <http://trac.webkit.org/changeset/58764> 220631 22 commit-queue 2010-05-04 09:31:42 -0700 All reviewed patches have been landed. Closing bug. 222230 23 hausmann 2010-05-07 00:49:32 -0700 Laszlo, applying these changesets to the release branch is going to remove the qt_wrt_setViewMode symbol. Is that okay with you? 222470 24 laszlo.gombos 2010-05-07 10:39:08 -0700 (In reply to comment #23) > Laszlo, applying these changesets to the release branch is going to remove the > qt_wrt_setViewMode symbol. Is that okay with you? Yes that is OK with me. I think the conclusion was that it is too early for a public API and I do not see a big difference between the private exported symbol and the dynamic property. 222678 25 hausmann 2010-05-07 16:01:00 -0700 Revision r58405 cherry-picked into qtwebkit-2.0 with commit 81f2bccdfe405c730b1a19baf17861d205e801d8 Revision r58764 cherry-picked into qtwebkit-2.0 with commit 5aaee8fcd1db133d76b56c989477ab1a92759f9f 54287 2010-04-26 06:24:21 -0700 2010-04-26 08:00:37 -0700 patch 1 0001-Qt-QWebPage-wrt_viewMode-property.patch text/plain 5231 luiz RnJvbSAxMWQ4MGE1ZDFiMjY5MTg5MDQ3ZjgyZTdmYWEyNjg3MGZmZDQ1MTc3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IE1vbiwgMjYgQXByIDIwMTAgMTA6MjI6MTQgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFXZWJQYWdlIHdydF92aWV3TW9kZSBwcm9wZXJ0eQogaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MTE5CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KClJlcGxhY2luZyBtZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIGJ5IHdydF92aWV3TW9kZSBw cm9wZXJ0eS4KCldlYktpdC9xdDoKCiogQXBpL3F3ZWJwYWdlLmNwcDoKKFFXZWJQYWdlOjp2aWV3 TW9kZSk6CihRV2ViUGFnZTo6c2V0Vmlld01vZGUpOgoqIEFwaS9xd2VicGFnZS5oOgoKV2ViS2l0 VG9vbHM6CgoqIER1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgoo TGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKToKLS0tCiBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjMgKysr KysrKysrKysrLS0tLS0tLQogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgICA0ICsrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKysrKwogV2ViS2l0VG9vbHMvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysKIC4uLi9E dW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCAgIHwgICAgMyArLQog NSBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnBh Z2UuY3BwCmluZGV4IDE2OGVjNTguLjUxOWI0MjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0xMjAsMTUg KzEyMCw2IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi12b2lkIFFXRUJLSVRfRVhQ T1JUIHF0X3dydF9zZXRWaWV3TW9kZShRV2ViUGFnZSogcGFnZSwgY29uc3QgUVN0cmluZyYgbW9k ZSkKLXsKLSAgICBRV2ViUGFnZVByaXZhdGU6OnByaXYocGFnZSktPnZpZXdNb2RlID0gbW9kZTsK LSAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHBhZ2Ut Pm1haW5GcmFtZSgpKTsKLSAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmll dygpOwotICAgIGZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVTdHlsZVNlbGVjdG9yKCk7Ci0gICAg dmlldy0+Zm9yY2VMYXlvdXQoKTsKLX0KLQogYm9vbCBRV2ViUGFnZVByaXZhdGU6OmRydFJ1biA9 IGZhbHNlOwogCiAvLyBMb29rdXAgdGFibGUgbWFwcGluZyBRV2ViUGFnZTo6V2ViQWN0aW9ucyB0 byB0aGUgYXNzb2NpYXRlZCBFZGl0b3IgY29tbWFuZHMKQEAgLTMyOTMsNiArMzI4NCwyMCBAQCBx dWludDY0IFFXZWJQYWdlOjp0b3RhbEJ5dGVzKCkgY29uc3QKICAgICByZXR1cm4gZC0+bV90b3Rh bEJ5dGVzOwogfQogCitRU3RyaW5nIFFXZWJQYWdlOjp2aWV3TW9kZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIGQtPnZpZXdNb2RlOworfQorCit2b2lkIFFXZWJQYWdlOjpzZXRWaWV3TW9kZShjb25z dCBRU3RyaW5nJiB2aWV3TW9kZSkKK3sKKyAgICBkLT52aWV3TW9kZSA9IHZpZXdNb2RlOworICAg IFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobWFpbkZyYW1l KCkpOworICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7CisgICAg ZnJhbWUtPmRvY3VtZW50KCktPnVwZGF0ZVN0eWxlU2VsZWN0b3IoKTsKKyAgICB2aWV3LT5mb3Jj ZUxheW91dCgpOworfQorCiAKIC8qIQogICAgIFJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyB0 aGF0IHdlcmUgcmVjZWl2ZWQgZnJvbSB0aGUgbmV0d29yayB0byByZW5kZXIgdGhlIGN1cnJlbnQg cGFnZS4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaCBiL1dlYktpdC9xdC9B cGkvcXdlYnBhZ2UuaAppbmRleCBjMDg1ZmQ3Li43NjIxMmQ4IDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQXBpL3F3ZWJwYWdlLmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCkBAIC03NSw2 ICs3NSw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJQYWdlIDogcHVibGljIFFPYmplY3Qg ewogICAgIFFfUFJPUEVSVFkoUVBhbGV0dGUgcGFsZXR0ZSBSRUFEIHBhbGV0dGUgV1JJVEUgc2V0 UGFsZXR0ZSkKICAgICBRX1BST1BFUlRZKGJvb2wgY29udGVudEVkaXRhYmxlIFJFQUQgaXNDb250 ZW50RWRpdGFibGUgV1JJVEUgc2V0Q29udGVudEVkaXRhYmxlKQogICAgIFFfRU5VTVMoTGlua0Rl bGVnYXRpb25Qb2xpY3kgTmF2aWdhdGlvblR5cGUgV2ViQWN0aW9uKQorICAgIFFfUFJPUEVSVFko UVN0cmluZyB3cnRfdmlld01vZGUgUkVBRCB2aWV3TW9kZSBXUklURSBzZXRWaWV3TW9kZSkKIHB1 YmxpYzoKICAgICBlbnVtIE5hdmlnYXRpb25UeXBlIHsKICAgICAgICAgTmF2aWdhdGlvblR5cGVM aW5rQ2xpY2tlZCwKQEAgLTM3NCw2ICszNzUsOSBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFz cyBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTsKICAgICBmcmllbmQgY2xhc3MgV2ViQ29yZTo6UU5l dHdvcmtSZXBseUhhbmRsZXI7CiAgICAgZnJpZW5kIGNsYXNzIER1bXBSZW5kZXJUcmVlU3VwcG9y dFF0OworCisgICAgUVN0cmluZyB2aWV3TW9kZSgpIGNvbnN0OworICAgIHZvaWQgc2V0Vmlld01v ZGUoY29uc3QgUVN0cmluZyYgdmlld01vZGUpOwogfTsKIAogUV9ERUNMQVJFX09QRVJBVE9SU19G T1JfRkxBR1MoUVdlYlBhZ2U6OkZpbmRGbGFncykKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFu Z2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg4YjZkY2IuLmZjNGUyMmEgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDEwLTA0LTI2ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBv cGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gUVdlYlBhZ2Ugd3J0X3ZpZXdNb2RlIHByb3BlcnR5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODExOQorCisgICAgICAgIFJlcGxh Y2luZyBtZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIGJ5IHdydF92aWV3TW9kZSBwcm9wZXJ0eS4K KworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZTo6dmlld01v ZGUpOgorICAgICAgICAoUVdlYlBhZ2U6OnNldFZpZXdNb2RlKToKKyAgICAgICAgKiBBcGkvcXdl YnBhZ2UuaDoKKwogMjAxMC0wNC0yMCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggODY3OWYzMi4u MjcxNzNkMyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA0LTI2ICBMdWl6IEFnb3N0aW5p ICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUVdlYlBhZ2Ugd3J0X3ZpZXdNb2RlIHByb3Bl cnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODEx OQorCisgICAgICAgIFJlcGxhY2luZyBtZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIGJ5IHdydF92 aWV3TW9kZSBwcm9wZXJ0eS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRl c3RDb250cm9sbGVyUXQuY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFZp ZXdNb2RlTWVkaWFGZWF0dXJlKToKKwogMjAxMC0wNC0yMCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxl clF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9s bGVyUXQuY3BwCmluZGV4IGI5NWZlMjMuLjBlNDI0YmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCisrKyBiL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCkBAIC0z Nyw3ICszNyw2IEBACiAjaW5jbHVkZSA8UUxvY2FsZT4KICNpbmNsdWRlIDxxd2Vic2V0dGluZ3Mu aD4KIAotZXh0ZXJuIHZvaWQgcXRfd3J0X3NldFZpZXdNb2RlKFFXZWJQYWdlKiBwYWdlLCBjb25z dCBRU3RyaW5nJiBtb2RlKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZWRpdGluZ19jYWxsYmFja3Mo Ym9vbCBiKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZnJhbWVfbG9hZGVyKGJvb2wgYik7CiBleHRl cm4gdm9pZCBxdF9kdW1wX3Jlc291cmNlX2xvYWRfY2FsbGJhY2tzKGJvb2wgYik7CkBAIC0xNDEs NyArMTQwLDcgQEAgUVN0cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y291bnRlclZhbHVlRm9y RWxlbWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQpCiAKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xs ZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKGNvbnN0IFFTdHJpbmcmIG1vZGUpCiB7Ci0gICAg cXRfd3J0X3NldFZpZXdNb2RlKG1fZHJ0LT53ZWJQYWdlKCksIG1vZGUpOworICAgIG1fZHJ0LT5z ZXRQcm9wZXJ0eSgid3J0X3ZpZXdNb2RlIiwgbW9kZSk7CiB9CiAKIGludCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6d2ViSGlzdG9yeUl0ZW1Db3VudCgpCi0tIAoxLjYuMy4zCgo= 54300 2010-04-26 08:00:37 -0700 2010-04-26 16:59:22 -0700 patch 2 0001-Qt-QWebPage-viewMode-property.patch text/plain 5199 luiz RnJvbSA4MDM0MmUwOGI4YTAxNjMyMDJkNTcxZDZkZmViZjNlMGFhOGQwZTc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IE1vbiwgMjYgQXByIDIwMTAgMTE6NDk6NTQgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMTkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK UmVwbGFjaW5nIG1ldGhvZCBxdF93cnRfc2V0Vmlld01vZGUgYnkgdmlld01vZGUgcHJvcGVydHku CgpXZWJLaXQvcXQ6CgoqIEFwaS9xd2VicGFnZS5jcHA6CihRV2ViUGFnZTo6dmlld01vZGUpOgoo UVdlYlBhZ2U6OnNldFZpZXdNb2RlKToKKiBBcGkvcXdlYnBhZ2UuaDoKCldlYktpdFRvb2xzOgoK KiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDoKKExheW91dFRl c3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlhRmVhdHVyZSk6Ci0tLQogV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIzICsrKysrKysrKysr Ky0tLS0tLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaCAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAgNCArKysKIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxNCArKysrKysrKysrKysKIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMiArKysrKysrKysrCiAuLi4vRHVtcFJlbmRl clRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAgICB8ICAgIDMgKy0KIDUgZmlsZXMg Y2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApp bmRleCAxNjhlYzU4Li41MTliNDI0IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMTIwLDE1ICsxMjAsNiBA QAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotdm9pZCBRV0VCS0lUX0VYUE9SVCBxdF93 cnRfc2V0Vmlld01vZGUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJpbmcmIG1vZGUpCi17Ci0g ICAgUVdlYlBhZ2VQcml2YXRlOjpwcml2KHBhZ2UpLT52aWV3TW9kZSA9IG1vZGU7Ci0gICAgV2Vi Q29yZTo6RnJhbWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShwYWdlLT5tYWluRnJh bWUoKSk7Ci0gICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKLSAg ICBmcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVTZWxlY3RvcigpOwotICAgIHZpZXctPmZv cmNlTGF5b3V0KCk7Ci19Ci0KIGJvb2wgUVdlYlBhZ2VQcml2YXRlOjpkcnRSdW4gPSBmYWxzZTsK IAogLy8gTG9va3VwIHRhYmxlIG1hcHBpbmcgUVdlYlBhZ2U6OldlYkFjdGlvbnMgdG8gdGhlIGFz c29jaWF0ZWQgRWRpdG9yIGNvbW1hbmRzCkBAIC0zMjkzLDYgKzMyODQsMjAgQEAgcXVpbnQ2NCBR V2ViUGFnZTo6dG90YWxCeXRlcygpIGNvbnN0CiAgICAgcmV0dXJuIGQtPm1fdG90YWxCeXRlczsK IH0KIAorUVN0cmluZyBRV2ViUGFnZTo6dmlld01vZGUoKSBjb25zdAoreworICAgIHJldHVybiBk LT52aWV3TW9kZTsKK30KKwordm9pZCBRV2ViUGFnZTo6c2V0Vmlld01vZGUoY29uc3QgUVN0cmlu ZyYgdmlld01vZGUpCit7CisgICAgZC0+dmlld01vZGUgPSB2aWV3TW9kZTsKKyAgICBXZWJDb3Jl OjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKG1haW5GcmFtZSgpKTsKKyAg ICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOworICAgIGZyYW1lLT5k b2N1bWVudCgpLT51cGRhdGVTdHlsZVNlbGVjdG9yKCk7CisgICAgdmlldy0+Zm9yY2VMYXlvdXQo KTsKK30KKwogCiAvKiEKICAgICBSZXR1cm5zIHRoZSBudW1iZXIgb2YgYnl0ZXMgdGhhdCB3ZXJl IHJlY2VpdmVkIGZyb20gdGhlIG5ldHdvcmsgdG8gcmVuZGVyIHRoZSBjdXJyZW50IHBhZ2UuCmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmgKaW5kZXggYzA4NWZkNy4uNWIwM2JmNyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaApAQCAtNzUsNiArNzUsNyBA QCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViUGFnZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBR X1BST1BFUlRZKFFQYWxldHRlIHBhbGV0dGUgUkVBRCBwYWxldHRlIFdSSVRFIHNldFBhbGV0dGUp CiAgICAgUV9QUk9QRVJUWShib29sIGNvbnRlbnRFZGl0YWJsZSBSRUFEIGlzQ29udGVudEVkaXRh YmxlIFdSSVRFIHNldENvbnRlbnRFZGl0YWJsZSkKICAgICBRX0VOVU1TKExpbmtEZWxlZ2F0aW9u UG9saWN5IE5hdmlnYXRpb25UeXBlIFdlYkFjdGlvbikKKyAgICBRX1BST1BFUlRZKFFTdHJpbmcg dmlld01vZGUgUkVBRCB2aWV3TW9kZSBXUklURSBzZXRWaWV3TW9kZSkKIHB1YmxpYzoKICAgICBl bnVtIE5hdmlnYXRpb25UeXBlIHsKICAgICAgICAgTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZCwK QEAgLTM3NCw2ICszNzUsOSBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTsKICAgICBmcmllbmQgY2xhc3MgV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhh bmRsZXI7CiAgICAgZnJpZW5kIGNsYXNzIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OworCisgICAg UVN0cmluZyB2aWV3TW9kZSgpIGNvbnN0OworICAgIHZvaWQgc2V0Vmlld01vZGUoY29uc3QgUVN0 cmluZyYgdmlld01vZGUpOwogfTsKIAogUV9ERUNMQVJFX09QRVJBVE9SU19GT1JfRkxBR1MoUVdl YlBhZ2U6OkZpbmRGbGFncykKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJL aXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg4YjZkY2IuLmYxZGE5ZWYgMTAwNjQ0Ci0tLSBhL1dlYktp dC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDEwLTA0LTI2ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g UVdlYlBhZ2Ugdmlld01vZGUgcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM4MTE5CisKKyAgICAgICAgUmVwbGFjaW5nIG1ldGhvZCBxdF93 cnRfc2V0Vmlld01vZGUgYnkgdmlld01vZGUgcHJvcGVydHkuCisKKyAgICAgICAgKiBBcGkvcXdl YnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnZpZXdNb2RlKToKKyAgICAgICAgKFFXZWJQ YWdlOjpzZXRWaWV3TW9kZSk6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmg6CisKIDIwMTAtMDQt MjAgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg2NzlmMzIuLjZkM2QzZDggMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMC0wNC0yNiAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3Bl bmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODExOQorCisgICAgICAgIFJlcGxhY2luZyBt ZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIGJ5IHZpZXdNb2RlIHByb3BlcnR5LgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHA6CisgICAgICAg IChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUpOgorCiAyMDEw LTA0LTIwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKaW5kZXggYjk1ZmUyMy4uNGE3 MDA0NiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVz dENvbnRyb2xsZXJRdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5 b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKQEAgLTM3LDcgKzM3LDYgQEAKICNpbmNsdWRlIDxRTG9j YWxlPgogI2luY2x1ZGUgPHF3ZWJzZXR0aW5ncy5oPgogCi1leHRlcm4gdm9pZCBxdF93cnRfc2V0 Vmlld01vZGUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJpbmcmIG1vZGUpOwogZXh0ZXJuIHZv aWQgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZvaWQgcXRfZHVt cF9mcmFtZV9sb2FkZXIoYm9vbCBiKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfcmVzb3VyY2VfbG9h ZF9jYWxsYmFja3MoYm9vbCBiKTsKQEAgLTE0MSw3ICsxNDAsNyBAQCBRU3RyaW5nIExheW91dFRl c3RDb250cm9sbGVyOjpjb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChjb25zdCBRU3RyaW5nJiBp ZCkKIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUo Y29uc3QgUVN0cmluZyYgbW9kZSkKIHsKLSAgICBxdF93cnRfc2V0Vmlld01vZGUobV9kcnQtPndl YlBhZ2UoKSwgbW9kZSk7CisgICAgbV9kcnQtPnNldFByb3BlcnR5KCJ2aWV3TW9kZSIsIG1vZGUp OwogfQogCiBpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQoKQot LSAKMS42LjMuMwoK 54350 2010-04-26 16:59:22 -0700 2010-04-27 22:56:26 -0700 patch 3 0001-Qt-QWebPage-viewMode-property.patch text/plain 5393 luiz RnJvbSBiM2ZkNTFlNTNhYjA2MmY0NjZmMzA5ZTIxM2Y1NmIyYjY4MThlZGQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IE1vbiwgMjYgQXByIDIwMTAgMjA6NTY6MjEgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMTkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK UmVwbGFjaW5nIG1ldGhvZCBxdF93cnRfc2V0Vmlld01vZGUgYnkgd3J0X3ZpZXdNb2RlIHByb3Bl cnR5LgoKV2ViS2l0L3F0OgoKKiBBcGkvcXdlYnBhZ2UuY3BwOgooUVdlYlBhZ2VQcml2YXRlOjpk eW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCk6CihRV2ViUGFnZTo6ZXZlbnQpOgoqIEFwaS9xd2Vi cGFnZV9wLmg6CgpXZWJLaXRUb29sczoKCiogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENv bnRyb2xsZXJRdC5jcHA6CihMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZl YXR1cmUpOgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAyNiArKysrKysrKysrKysrLS0tLS0tLQogV2ViS2l0L3F0L0FwaS9xd2VicGFn ZV9wLmggICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAyICsKIFdlYktpdC9xdC9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNCArKysrKysrKysrCiBXZWJL aXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysr KysrKysrCiAuLi4vRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAg ICB8ICAgIDMgKy0KIDUgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9XZWJLaXQv cXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAxNjhlYzU4Li43ZDJjOTBkIDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cApAQCAtMTIwLDE1ICsxMjAsNiBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotdm9p ZCBRV0VCS0lUX0VYUE9SVCBxdF93cnRfc2V0Vmlld01vZGUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0 IFFTdHJpbmcmIG1vZGUpCi17Ci0gICAgUVdlYlBhZ2VQcml2YXRlOjpwcml2KHBhZ2UpLT52aWV3 TW9kZSA9IG1vZGU7Ci0gICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0 ZTo6Y29yZShwYWdlLT5tYWluRnJhbWUoKSk7Ci0gICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3 ID0gZnJhbWUtPnZpZXcoKTsKLSAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVTZWxl Y3RvcigpOwotICAgIHZpZXctPmZvcmNlTGF5b3V0KCk7Ci19Ci0KIGJvb2wgUVdlYlBhZ2VQcml2 YXRlOjpkcnRSdW4gPSBmYWxzZTsKIAogLy8gTG9va3VwIHRhYmxlIG1hcHBpbmcgUVdlYlBhZ2U6 OldlYkFjdGlvbnMgdG8gdGhlIGFzc29jaWF0ZWQgRWRpdG9yIGNvbW1hbmRzCkBAIC0xMjE0LDYg KzEyMDUsMjAgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUUlucHV0 TWV0aG9kRXZlbnQgKmV2KQogICAgIGV2LT5hY2NlcHQoKTsKIH0KIAordm9pZCBRV2ViUGFnZVBy aXZhdGU6OmR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2ZW50KFFEeW5hbWljUHJvcGVydHlDaGFuZ2VF dmVudCogZXZlbnQpCit7CisgICAgaWYgKGV2ZW50LT5wcm9wZXJ0eU5hbWUoKSA9PSAid3J0X3Zp ZXdNb2RlIikgeworICAgICAgICBRU3RyaW5nIG1vZGUgPSBxLT5wcm9wZXJ0eSgid3J0X3ZpZXdN b2RlIikudG9TdHJpbmcoKTsKKyAgICAgICAgaWYgKG1vZGUgIT0gdmlld01vZGUpIHsKKyAgICAg ICAgICAgIHZpZXdNb2RlID0gbW9kZTsKKyAgICAgICAgICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFt ZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUocS0+bWFpbkZyYW1lKCkpOworICAgICAgICAgICAg V2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKKyAgICAgICAgICAgIGZy YW1lLT5kb2N1bWVudCgpLT51cGRhdGVTdHlsZVNlbGVjdG9yKCk7CisgICAgICAgICAgICB2aWV3 LT5mb3JjZUxheW91dCgpOworICAgICAgICB9CisgICAgfQorfQorCiB2b2lkIFFXZWJQYWdlUHJp dmF0ZTo6c2hvcnRjdXRPdmVycmlkZUV2ZW50KFFLZXlFdmVudCogZXZlbnQpCiB7CiAgICAgV2Vi Q29yZTo6RnJhbWUqIGZyYW1lID0gcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1h aW5GcmFtZSgpOwpAQCAtMjU2Miw2ICsyNTY3LDkgQEAgYm9vbCBRV2ViUGFnZTo6ZXZlbnQoUUV2 ZW50ICpldikKICAgICAgICAgZC0+dG91Y2hFdmVudChzdGF0aWNfY2FzdDxRVG91Y2hFdmVudCo+ KGV2KSk7CiAgICAgICAgIGJyZWFrOwogI2VuZGlmCisgICAgY2FzZSBRRXZlbnQ6OkR5bmFtaWNQ cm9wZXJ0eUNoYW5nZToKKyAgICAgICAgZC0+ZHluYW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQoc3Rh dGljX2Nhc3Q8UUR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2ZW50Kj4oZXYpKTsKKyAgICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIFFPYmplY3Q6OmV2ZW50KGV2KTsKICAg ICB9CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlX3AuaCBiL1dlYktpdC9xdC9B cGkvcXdlYnBhZ2VfcC5oCmluZGV4IGY0MDA1M2IuLjc0MTQ3MTYgMTAwNjQ0Ci0tLSBhL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2VfcC5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oCkBA IC0xMTMsNiArMTEzLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBpbnB1dE1ldGhvZEV2ZW50KFFJ bnB1dE1ldGhvZEV2ZW50Kik7CiAKKyAgICB2b2lkIGR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2ZW50 KFFEeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCopOworCiAgICAgdm9pZCBzaG9ydGN1dE92ZXJy aWRlRXZlbnQoUUtleUV2ZW50Kik7CiAgICAgdm9pZCBsZWF2ZUV2ZW50KFFFdmVudCopOwogICAg IHZvaWQgaGFuZGxlQ2xpcGJvYXJkKFFFdmVudCosIFF0OjpNb3VzZUJ1dHRvbik7CmRpZmYgLS1n aXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA2MWI3 MWMzLi42ZmU1NDMxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktp dC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNC0yNiAgTHVpeiBBZ29zdGlu aSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODExOQor CisgICAgICAgIFJlcGxhY2luZyBtZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIGJ5IHdydF92aWV3 TW9kZSBwcm9wZXJ0eS4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChR V2ViUGFnZVByaXZhdGU6OmR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2ZW50KToKKyAgICAgICAgKFFX ZWJQYWdlOjpldmVudCk6CisgICAgICAgICogQXBpL3F3ZWJwYWdlX3AuaDoKKwogMjAxMC0wNC0y NiAgVGhpYWdvIE1hY2llaXJhICA8dGhpYWdvLm1hY2llaXJhQG5va2lhLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0No YW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBhMmYzMmZlLi5jNmI5YWYwIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMjYgIEx1aXogQWdvc3RpbmkgIDxsdWl6LmFn b3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBRV2ViUGFnZSB2aWV3TW9kZSBwcm9wZXJ0eQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMTkKKworICAgICAgICBS ZXBsYWNpbmcgbWV0aG9kIHF0X3dydF9zZXRWaWV3TW9kZSBieSB3cnRfdmlld01vZGUgcHJvcGVy dHkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0 LmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlhRmVh dHVyZSk6CisKIDIwMTAtMDQtMDYgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAppbmRleCBiOTVm ZTIzLi5hZmYxMDhkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9M YXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcApAQCAtMzcsNyArMzcsNiBAQAogI2luY2x1 ZGUgPFFMb2NhbGU+CiAjaW5jbHVkZSA8cXdlYnNldHRpbmdzLmg+CiAKLWV4dGVybiB2b2lkIHF0 X3dydF9zZXRWaWV3TW9kZShRV2ViUGFnZSogcGFnZSwgY29uc3QgUVN0cmluZyYgbW9kZSk7CiBl eHRlcm4gdm9pZCBxdF9kdW1wX2VkaXRpbmdfY2FsbGJhY2tzKGJvb2wgYik7CiBleHRlcm4gdm9p ZCBxdF9kdW1wX2ZyYW1lX2xvYWRlcihib29sIGIpOwogZXh0ZXJuIHZvaWQgcXRfZHVtcF9yZXNv dXJjZV9sb2FkX2NhbGxiYWNrcyhib29sIGIpOwpAQCAtMTQxLDcgKzE0MCw3IEBAIFFTdHJpbmcg TGF5b3V0VGVzdENvbnRyb2xsZXI6OmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNvbnN0IFFT dHJpbmcmIGlkKQogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlh RmVhdHVyZShjb25zdCBRU3RyaW5nJiBtb2RlKQogewotICAgIHF0X3dydF9zZXRWaWV3TW9kZSht X2RydC0+d2ViUGFnZSgpLCBtb2RlKTsKKyAgICBtX2RydC0+d2ViUGFnZSgpLT5zZXRQcm9wZXJ0 eSgid3J0X3ZpZXdNb2RlIiwgbW9kZSk7CiB9CiAKIGludCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 d2ViSGlzdG9yeUl0ZW1Db3VudCgpCi0tIAoxLjYuMy4zCgo= 54525 2010-04-27 22:56:26 -0700 2010-04-28 05:58:27 -0700 patch 4 0001-Qt-QWebPage-viewMode-property.patch text/plain 7075 luiz RnJvbSA4MTk0YWVhOTkyMDE4ZmMyMDdmMTZkZjg2NzBhMTEyZjUyYjcxMmNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFdlZCwgMjggQXByIDIwMTAgMDI6NDQ6MDUgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMTkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK UmVwbGFjaW5nIG1ldGhvZCBxdF93cnRfc2V0Vmlld01vZGUgYnkgd3J0X3ZpZXdNb2RlIHByb3Bl cnR5LgoKV2ViS2l0L3F0OgoKKiBBcGkvcXdlYnBhZ2UuY3BwOgooUVdlYlBhZ2VQcml2YXRlOjpk eW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCk6CihRV2ViUGFnZTo6ZXZlbnQpOgoqIEFwaS9xd2Vi cGFnZV9wLmg6CiogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKHRzdF9RV2ViUGFn ZTo6d3J0X3ZpZXdNb2Rlcyk6CgpXZWJLaXRUb29sczoKCiogRHVtcFJlbmRlclRyZWUvcXQvTGF5 b3V0VGVzdENvbnRyb2xsZXJRdC5jcHA6CihMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Vmlld01v ZGVNZWRpYUZlYXR1cmUpOgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAyNiArKysrKysrKysrKysrLS0tLS0tLQogV2ViS2l0L3F0L0Fw aS9xd2VicGFnZV9wLmggICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAyICsKIFdlYktpdC9x dC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysr KysrKysKIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwICAgICAgICAg IHwgICAxNyArKysrKysrKysrKysrCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrCiAuLi4vRHVtcFJlbmRlclRyZWUvcXQv TGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAgICB8ICAgIDMgKy0KIDYgZmlsZXMgY2hhbmdlZCwg NjUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAxNjhl YzU4Li43ZDJjOTBkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMTIwLDE1ICsxMjAsNiBAQAogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotdm9pZCBRV0VCS0lUX0VYUE9SVCBxdF93cnRfc2V0Vmll d01vZGUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJpbmcmIG1vZGUpCi17Ci0gICAgUVdlYlBh Z2VQcml2YXRlOjpwcml2KHBhZ2UpLT52aWV3TW9kZSA9IG1vZGU7Ci0gICAgV2ViQ29yZTo6RnJh bWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShwYWdlLT5tYWluRnJhbWUoKSk7Ci0g ICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKLSAgICBmcmFtZS0+ ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVTZWxlY3RvcigpOwotICAgIHZpZXctPmZvcmNlTGF5b3V0 KCk7Ci19Ci0KIGJvb2wgUVdlYlBhZ2VQcml2YXRlOjpkcnRSdW4gPSBmYWxzZTsKIAogLy8gTG9v a3VwIHRhYmxlIG1hcHBpbmcgUVdlYlBhZ2U6OldlYkFjdGlvbnMgdG8gdGhlIGFzc29jaWF0ZWQg RWRpdG9yIGNvbW1hbmRzCkBAIC0xMjE0LDYgKzEyMDUsMjAgQEAgdm9pZCBRV2ViUGFnZVByaXZh dGU6OmlucHV0TWV0aG9kRXZlbnQoUUlucHV0TWV0aG9kRXZlbnQgKmV2KQogICAgIGV2LT5hY2Nl cHQoKTsKIH0KIAordm9pZCBRV2ViUGFnZVByaXZhdGU6OmR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2 ZW50KFFEeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCogZXZlbnQpCit7CisgICAgaWYgKGV2ZW50 LT5wcm9wZXJ0eU5hbWUoKSA9PSAid3J0X3ZpZXdNb2RlIikgeworICAgICAgICBRU3RyaW5nIG1v ZGUgPSBxLT5wcm9wZXJ0eSgid3J0X3ZpZXdNb2RlIikudG9TdHJpbmcoKTsKKyAgICAgICAgaWYg KG1vZGUgIT0gdmlld01vZGUpIHsKKyAgICAgICAgICAgIHZpZXdNb2RlID0gbW9kZTsKKyAgICAg ICAgICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUocS0+ bWFpbkZyYW1lKCkpOworICAgICAgICAgICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0gZnJh bWUtPnZpZXcoKTsKKyAgICAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVTdHlsZVNl bGVjdG9yKCk7CisgICAgICAgICAgICB2aWV3LT5mb3JjZUxheW91dCgpOworICAgICAgICB9Cisg ICAgfQorfQorCiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6c2hvcnRjdXRPdmVycmlkZUV2ZW50KFFL ZXlFdmVudCogZXZlbnQpCiB7CiAgICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1lID0gcGFnZS0+Zm9j dXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOwpAQCAtMjU2Miw2ICsyNTY3LDkg QEAgYm9vbCBRV2ViUGFnZTo6ZXZlbnQoUUV2ZW50ICpldikKICAgICAgICAgZC0+dG91Y2hFdmVu dChzdGF0aWNfY2FzdDxRVG91Y2hFdmVudCo+KGV2KSk7CiAgICAgICAgIGJyZWFrOwogI2VuZGlm CisgICAgY2FzZSBRRXZlbnQ6OkR5bmFtaWNQcm9wZXJ0eUNoYW5nZToKKyAgICAgICAgZC0+ZHlu YW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQoc3RhdGljX2Nhc3Q8UUR5bmFtaWNQcm9wZXJ0eUNoYW5n ZUV2ZW50Kj4oZXYpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0 dXJuIFFPYmplY3Q6OmV2ZW50KGV2KTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBp L3F3ZWJwYWdlX3AuaCBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oCmluZGV4IGY0MDA1M2Iu Ljc0MTQ3MTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oCisrKyBiL1dl YktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oCkBAIC0xMTMsNiArMTEzLDggQEAgcHVibGljOgogCiAg ICAgdm9pZCBpbnB1dE1ldGhvZEV2ZW50KFFJbnB1dE1ldGhvZEV2ZW50Kik7CiAKKyAgICB2b2lk IGR5bmFtaWNQcm9wZXJ0eUNoYW5nZUV2ZW50KFFEeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCop OworCiAgICAgdm9pZCBzaG9ydGN1dE92ZXJyaWRlRXZlbnQoUUtleUV2ZW50Kik7CiAgICAgdm9p ZCBsZWF2ZUV2ZW50KFFFdmVudCopOwogICAgIHZvaWQgaGFuZGxlQ2xpcGJvYXJkKFFFdmVudCos IFF0OjpNb3VzZUJ1dHRvbik7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwppbmRleCA2MWI3MWMzLi5mMzFhNTZlIDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBA QAorMjAxMC0wNC0yNyAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zODExOQorCisgICAgICAgIFJlcGxhY2luZyBtZXRob2QgcXRf d3J0X3NldFZpZXdNb2RlIGJ5IHdydF92aWV3TW9kZSBwcm9wZXJ0eS4KKworICAgICAgICAqIEFw aS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmR5bmFtaWNQcm9wZXJ0 eUNoYW5nZUV2ZW50KToKKyAgICAgICAgKFFXZWJQYWdlOjpldmVudCk6CisgICAgICAgICogQXBp L3F3ZWJwYWdlX3AuaDoKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw OgorICAgICAgICAodHN0X1FXZWJQYWdlOjp3cnRfdmlld01vZGVzKToKKwogMjAxMC0wNC0yNiAg VGhpYWdvIE1hY2llaXJhICA8dGhpYWdvLm1hY2llaXJhQG5va2lhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9x d2VicGFnZS5jcHAKaW5kZXggNThlYjBjMC4uMGJmZTExZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKQEAgLTEwOCw2ICsxMDgsOCBAQCBwcml2YXRlIHNsb3Rz OgogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uSW5JRnJhbWVzKCk7CiAgICAgdm9pZCBlcnJv clBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0KCk7CiAKKyAgICB2b2lkIHdydF92aWV3TW9kZXMoKTsK KwogICAgIHZvaWQgY3Jhc2hUZXN0c19MYXp5SW5pdGlhbGl6YXRpb25PZk1haW5GcmFtZSgpOwog CiAgICAgdm9pZCBzY3JlZW5zaG90X2RhdGEoKTsKQEAgLTM1NSw2ICszNTcsMjEgQEAgdm9pZCB0 c3RfUVdlYlBhZ2U6OnVzZXJTdHlsZVNoZWV0KCkKICAgICBRQ09NUEFSRShuZXR3b3JrTWFuYWdl ci0+cmVxdWVzdGVkVXJscy5hdCgwKSwgUVVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0LnBuZyIp KTsKIH0KIAordm9pZCB0c3RfUVdlYlBhZ2U6OndydF92aWV3TW9kZXMoKQoreworICAgIG1fdmll dy0+c2V0SHRtbCgiPGJvZHk+PC9ib2R5PiIpOworICAgIG1fcGFnZS0+c2V0UHJvcGVydHkoIndy dF92aWV3TW9kZSIsICJtaW5pbWl6ZWQiKTsKKworICAgIFFWYXJpYW50IGVtcHR5ID0gbV9wYWdl LT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ3aW5kb3cuc3R5bGVNZWRpYS5tYXRj aE1lZGl1bShcIigtd2Via2l0LXZpZXctbW9kZSlcIikiKTsKKyAgICBRVkVSSUZZKGVtcHR5LnR5 cGUoKSA9PSBRVmFyaWFudDo6Qm9vbCAmJiBlbXB0eS50b0Jvb2woKSk7CisKKyAgICBRVmFyaWFu dCBtaW5pbWl6ZWQgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndp bmRvdy5zdHlsZU1lZGlhLm1hdGNoTWVkaXVtKFwiKC13ZWJraXQtdmlldy1tb2RlOiBtaW5pbWl6 ZWQpXCIpIik7CisgICAgUVZFUklGWShtaW5pbWl6ZWQudHlwZSgpID09IFFWYXJpYW50OjpCb29s ICYmIG1pbmltaXplZC50b0Jvb2woKSk7CisKKyAgICBRVmFyaWFudCBtYXhpbWl6ZWQgPSBtX3Bh Z2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5zdHlsZU1lZGlhLm1h dGNoTWVkaXVtKFwiKC13ZWJraXQtdmlldy1tb2RlOiBtYXhpbWl6ZWQpXCIpIik7CisgICAgUVZF UklGWShtYXhpbWl6ZWQudHlwZSgpID09IFFWYXJpYW50OjpCb29sICYmICFtYXhpbWl6ZWQudG9C b29sKCkpOworfQorCiB2b2lkIHRzdF9RV2ViUGFnZTo6bW9kaWZpZWQoKQogewogICAgIG1fcGFn ZS0+bWFpbkZyYW1lKCktPnNldFVybChRVXJsKCJkYXRhOnRleHQvaHRtbCw8Ym9keT5ibHViIikp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCmluZGV4IGEyZjMyZmUuLjViYjUwZmUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0w NC0yNyAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFXZWJQYWdl IHZpZXdNb2RlIHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zODExOQorCisgICAgICAgIFJlcGxhY2luZyBtZXRob2QgcXRfd3J0X3NldFZp ZXdNb2RlIGJ5IHdydF92aWV3TW9kZSBwcm9wZXJ0eS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENv bnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKToKKwogMjAxMC0wNC0wNiAgT2phbiBW YWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFy dGguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0 Q29udHJvbGxlclF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRl c3RDb250cm9sbGVyUXQuY3BwCmluZGV4IGI5NWZlMjMuLmFmZjEwOGQgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCisr KyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQu Y3BwCkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSA8UUxvY2FsZT4KICNpbmNsdWRlIDxxd2Vi c2V0dGluZ3MuaD4KIAotZXh0ZXJuIHZvaWQgcXRfd3J0X3NldFZpZXdNb2RlKFFXZWJQYWdlKiBw YWdlLCBjb25zdCBRU3RyaW5nJiBtb2RlKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZWRpdGluZ19j YWxsYmFja3MoYm9vbCBiKTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfZnJhbWVfbG9hZGVyKGJvb2wg Yik7CiBleHRlcm4gdm9pZCBxdF9kdW1wX3Jlc291cmNlX2xvYWRfY2FsbGJhY2tzKGJvb2wgYik7 CkBAIC0xNDEsNyArMTQwLDcgQEAgUVN0cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y291bnRl clZhbHVlRm9yRWxlbWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQpCiAKIHZvaWQgTGF5b3V0VGVz dENvbnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKGNvbnN0IFFTdHJpbmcmIG1vZGUp CiB7Ci0gICAgcXRfd3J0X3NldFZpZXdNb2RlKG1fZHJ0LT53ZWJQYWdlKCksIG1vZGUpOworICAg IG1fZHJ0LT53ZWJQYWdlKCktPnNldFByb3BlcnR5KCJ3cnRfdmlld01vZGUiLCBtb2RlKTsKIH0K IAogaW50IExheW91dFRlc3RDb250cm9sbGVyOjp3ZWJIaXN0b3J5SXRlbUNvdW50KCkKLS0gCjEu Ni4zLjMKCg== 54668 2010-04-28 21:07:53 -0700 2010-05-03 22:04:27 -0700 drop wrt prefix from the property name 38119.patch text/plain 3697 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTg0NjkpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMjggIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gUVdlYlBhZ2Ugdmlld01vZGUgcHJvcGVydHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MTE5CisKKyAgICAgICAgUmVu YW1lIHRoZSBwcm9wZXJ0eSBmcm9tIHdydF92aWV3TW9kZSB0byB2aWV3TW9kZS4KKworICAgICAg ICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmR5bmFtaWNQ cm9wZXJ0eUNoYW5nZUV2ZW50KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp2aWV3TW9kZXMpOgorCiAyMDEwLTA0LTI4 ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCBRdCBidWlsZCBmaXguCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNTg0 NjIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIw OSw4ICsxMjA5LDggQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUQog CiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6ZHluYW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQoUUR5bmFt aWNQcm9wZXJ0eUNoYW5nZUV2ZW50KiBldmVudCkKIHsKLSAgICBpZiAoZXZlbnQtPnByb3BlcnR5 TmFtZSgpID09ICJ3cnRfdmlld01vZGUiKSB7Ci0gICAgICAgIFFTdHJpbmcgbW9kZSA9IHEtPnBy b3BlcnR5KCJ3cnRfdmlld01vZGUiKS50b1N0cmluZygpOworICAgIGlmIChldmVudC0+cHJvcGVy dHlOYW1lKCkgPT0gInZpZXdNb2RlIikgeworICAgICAgICBRU3RyaW5nIG1vZGUgPSBxLT5wcm9w ZXJ0eSgidmlld01vZGUiKS50b1N0cmluZygpOwogICAgICAgICBpZiAobW9kZSAhPSB2aWV3TW9k ZSkgewogICAgICAgICAgICAgdmlld01vZGUgPSBtb2RlOwogICAgICAgICAgICAgV2ViQ29yZTo6 RnJhbWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShxLT5tYWluRnJhbWUoKSk7Cklu ZGV4OiBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2aXNpb24g NTg0NjIpCisrKyBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTA4LDcgKzEwOCw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBl cnJvclBhZ2VFeHRlbnNpb25JbklGcmFtZXMoKTsKICAgICB2b2lkIGVycm9yUGFnZUV4dGVuc2lv bkluRnJhbWVzZXQoKTsKIAotICAgIHZvaWQgd3J0X3ZpZXdNb2RlcygpOworICAgIHZvaWQgdmll d01vZGVzKCk7CiAKICAgICB2b2lkIGNyYXNoVGVzdHNfTGF6eUluaXRpYWxpemF0aW9uT2ZNYWlu RnJhbWUoKTsKIApAQCAtMzU3LDEwICszNTcsMTAgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnVzZXJT dHlsZVNoZWV0KCkKICAgICBRQ09NUEFSRShuZXR3b3JrTWFuYWdlci0+cmVxdWVzdGVkVXJscy5h dCgwKSwgUVVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0LnBuZyIpKTsKIH0KIAotdm9pZCB0c3Rf UVdlYlBhZ2U6OndydF92aWV3TW9kZXMoKQordm9pZCB0c3RfUVdlYlBhZ2U6OnZpZXdNb2Rlcygp CiB7CiAgICAgbV92aWV3LT5zZXRIdG1sKCI8Ym9keT48L2JvZHk+Iik7Ci0gICAgbV9wYWdlLT5z ZXRQcm9wZXJ0eSgid3J0X3ZpZXdNb2RlIiwgIm1pbmltaXplZCIpOworICAgIG1fcGFnZS0+c2V0 UHJvcGVydHkoInZpZXdNb2RlIiwgIm1pbmltaXplZCIpOwogCiAgICAgUVZhcmlhbnQgZW1wdHkg PSBtX3BhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5zdHlsZU1l ZGlhLm1hdGNoTWVkaXVtKFwiKC13ZWJraXQtdmlldy1tb2RlKVwiKSIpOwogICAgIFFWRVJJRlko ZW1wdHkudHlwZSgpID09IFFWYXJpYW50OjpCb29sICYmIGVtcHR5LnRvQm9vbCgpKTsKSW5kZXg6 IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VM b2cJKHJldmlzaW9uIDU4NDY5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMjggIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gUVdlYlBhZ2Ugdmlld01vZGUgcHJvcGVydHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MTE5CisKKyAgICAgICAgUmVu YW1lIHRoZSBwcm9wZXJ0eSBmcm9tIHdydF92aWV3TW9kZSB0byB2aWV3TW9kZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKToKKwogMjAx MC0wNC0yOCAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAkocmV2aXNp b24gNTg0NjIpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQwLDcgKzE0MCw3IEBAIFFTdHJpbmcg TGF5b3V0VGVzdENvbnRyb2xsZXI6OmNvdW50ZXJWYWwKIAogdm9pZCBMYXlvdXRUZXN0Q29udHJv bGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUoY29uc3QgUVN0cmluZyYgbW9kZSkKIHsKLSAg ICBtX2RydC0+d2ViUGFnZSgpLT5zZXRQcm9wZXJ0eSgid3J0X3ZpZXdNb2RlIiwgbW9kZSk7Cisg ICAgbV9kcnQtPndlYlBhZ2UoKS0+c2V0UHJvcGVydHkoInZpZXdNb2RlIiwgbW9kZSk7CiB9CiAK IGludCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6d2ViSGlzdG9yeUl0ZW1Db3VudCgpCg== 54995 2010-05-03 22:04:27 -0700 2010-05-04 09:31:35 -0700 Use _q_ prefix for the property name 38119.patch text/plain 3693 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTg3MzQpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMDMgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gUVdlYlBhZ2Ugdmlld01vZGUgcHJvcGVydHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MTE5CisKKyAgICAgICAgUmVu YW1lIHRoZSBwcm9wZXJ0eSBmcm9tIHdydF92aWV3TW9kZSB0byBfcV92aWV3TW9kZS4KKworICAg ICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmR5bmFt aWNQcm9wZXJ0eUNoYW5nZUV2ZW50KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdl YnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp2aWV3TW9kZXMpOgorCiAyMDEwLTA1 LTAzICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnBh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lv biA1ODczNCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMjA1LDggKzEyMDUsOCBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6aW5wdXRNZXRob2RFdmVu dChRCiAKIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudChR RHluYW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQqIGV2ZW50KQogewotICAgIGlmIChldmVudC0+cHJv cGVydHlOYW1lKCkgPT0gIndydF92aWV3TW9kZSIpIHsKLSAgICAgICAgUVN0cmluZyBtb2RlID0g cS0+cHJvcGVydHkoIndydF92aWV3TW9kZSIpLnRvU3RyaW5nKCk7CisgICAgaWYgKGV2ZW50LT5w cm9wZXJ0eU5hbWUoKSA9PSAiX3Ffdmlld01vZGUiKSB7CisgICAgICAgIFFTdHJpbmcgbW9kZSA9 IHEtPnByb3BlcnR5KCJfcV92aWV3TW9kZSIpLnRvU3RyaW5nKCk7CiAgICAgICAgIGlmIChtb2Rl ICE9IHZpZXdNb2RlKSB7CiAgICAgICAgICAgICB2aWV3TW9kZSA9IG1vZGU7CiAgICAgICAgICAg ICBXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHEtPm1haW5G cmFtZSgpKTsKSW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw CShyZXZpc2lvbiA1ODczNCkKKysrIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNyArMTExLDcgQEAgcHJpdmF0ZSBzbG90czoK ICAgICB2b2lkIHVzZXJBZ2VudEFwcGxpY2F0aW9uTmFtZSgpOwogICAgIHZvaWQgdXNlckFnZW50 TG9jYWxlQ2hhbmdlKCk7CiAKLSAgICB2b2lkIHdydF92aWV3TW9kZXMoKTsKKyAgICB2b2lkIHZp ZXdNb2RlcygpOwogCiAgICAgdm9pZCBjcmFzaFRlc3RzX0xhenlJbml0aWFsaXphdGlvbk9mTWFp bkZyYW1lKCk7CiAKQEAgLTM2MCwxMCArMzYwLDEwIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2Vy U3R5bGVTaGVldCgpCiAgICAgUUNPTVBBUkUobmV0d29ya01hbmFnZXItPnJlcXVlc3RlZFVybHMu YXQoMCksIFFVcmwoImh0dHA6Ly9kb2VzLm5vdC9leGlzdC5wbmciKSk7CiB9CiAKLXZvaWQgdHN0 X1FXZWJQYWdlOjp3cnRfdmlld01vZGVzKCkKK3ZvaWQgdHN0X1FXZWJQYWdlOjp2aWV3TW9kZXMo KQogewogICAgIG1fdmlldy0+c2V0SHRtbCgiPGJvZHk+PC9ib2R5PiIpOwotICAgIG1fcGFnZS0+ c2V0UHJvcGVydHkoIndydF92aWV3TW9kZSIsICJtaW5pbWl6ZWQiKTsKKyAgICBtX3BhZ2UtPnNl dFByb3BlcnR5KCJfcV92aWV3TW9kZSIsICJtaW5pbWl6ZWQiKTsKIAogICAgIFFWYXJpYW50IGVt cHR5ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ3aW5kb3cuc3R5 bGVNZWRpYS5tYXRjaE1lZGl1bShcIigtd2Via2l0LXZpZXctbW9kZSlcIikiKTsKICAgICBRVkVS SUZZKGVtcHR5LnR5cGUoKSA9PSBRVmFyaWFudDo6Qm9vbCAmJiBlbXB0eS50b0Jvb2woKSk7Cklu ZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1ODczNCkKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA1LTAzICBMYXN6bG8gR29tYm9zICA8bGFz emxvLjEuZ29tYm9zQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUXRdIFFXZWJQYWdlIHZpZXdNb2RlIHByb3BlcnR5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODExOQorCisgICAgICAg IFJlbmFtZSB0aGUgcHJvcGVydHkgZnJvbSB3cnRfdmlld01vZGUgdG8gX3Ffdmlld01vZGUuCisK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDoK KyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRWaWV3TW9kZU1lZGlhRmVhdHVyZSk6 CisKIDIwMTAtMDUtMDMgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZC4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCShyZXZpc2lvbiA1ODcz NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVy UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDAsNyArMTQwLDcgQEAgUVN0cmluZyBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6Y291bnRlclZhbAogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpz ZXRWaWV3TW9kZU1lZGlhRmVhdHVyZShjb25zdCBRU3RyaW5nJiBtb2RlKQogewotICAgIG1fZHJ0 LT53ZWJQYWdlKCktPnNldFByb3BlcnR5KCJ3cnRfdmlld01vZGUiLCBtb2RlKTsKKyAgICBtX2Ry dC0+d2ViUGFnZSgpLT5zZXRQcm9wZXJ0eSgiX3Ffdmlld01vZGUiLCBtb2RlKTsKIH0KIAogaW50 IExheW91dFRlc3RDb250cm9sbGVyOjp3ZWJIaXN0b3J5SXRlbUNvdW50KCkK