70459 2011-10-19 17:11:11 -0700 Page Scale Factor broken when navigating history on pages with child frames 2011-10-26 01:52:03 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68075 70559 1 fsamuel fsamuel dglazkov fishd gustavo japhet rjkroege webkit.review.bot xan.lopez oldest_to_newest 487158 0 fsamuel 2011-10-19 17:11:11 -0700 This broke with the change to Frame::frameScaleFactor here: https://bugs.webkit.org/show_bug.cgi?id=68081 The fix involves some changes to HistoryController.cpp, and HistoryItem.h/cpp. I will upload a patch tomorrow. 488023 1 111879 fsamuel 2011-10-20 17:25:48 -0700 Created attachment 111879 Patch 488025 2 fsamuel 2011-10-20 17:26:28 -0700 With frameScaleFactor now always returning 1.0 for subframes and pageScaleFactor for the mainFrame, and there being only a single pageScaleFactor, history for scaling is broken. Scaling history is saved on a per frame basis but restored, overriding the per-page pageScaleFactor multiple times. As a result, sometimes pages that should be scaled end up getting a scale factor of 1.0. The easy solution is only restore pageScaleFactor for the main frame, but I'm not satisfied with this solution. We need to change the names of methods in HistoryItem to correspond to the reality that these are frameScaleFactors and not pageScaleFactors. But given that all frames except the main frame have a scale factor of 1.0, does it even make sense to store this information? Is there a global level History object where I should be storing pageScaleFactor? 488027 3 webkit.review.bot 2011-10-20 17:27:41 -0700 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 488037 4 111879 webkit.review.bot 2011-10-20 17:43:11 -0700 Comment on attachment 111879 Patch Attachment 111879 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10180704 488108 5 111879 dbates 2011-10-20 20:05:38 -0700 Comment on attachment 111879 Patch Attachment 111879 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/10182675 488112 6 111879 gustavo 2011-10-20 20:28:09 -0700 Comment on attachment 111879 Patch Attachment 111879 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/10183738 488152 7 fishd 2011-10-20 21:50:56 -0700 I think it is better to continue referring to this as page scale factor since that's what it is. That it is stored on HistoryItem doesn't change the fact that it still acts like a page scale factor. I think I'd just add a comment to HistoryItem indicating that the page scale factor field is ignored for subframes. 488395 8 fsamuel 2011-10-21 08:17:26 -0700 (In reply to comment #7) > I think it is better to continue referring to this as page scale factor since that's what it is. That it is stored on HistoryItem doesn't change the fact that it still acts like a page scale factor. I think I'd just add a comment to HistoryItem indicating that the page scale factor field is ignored for subframes. (In reply to comment #7) > I think it is better to continue referring to this as page scale factor since that's what it is. That it is stored on HistoryItem doesn't change the fact that it still acts like a page scale factor. I think I'd just add a comment to HistoryItem indicating that the page scale factor field is ignored for subframes. That's a fair short term solution. Ideally, I'd like to store the pageScaleFactor once per page. Simon Fraser told me to take a look at CachedPage to see if pageScaleFactor might belong there. I haven't looked at it yet, but I intend to investigate where would be a better place to store cached pages' pageScaleFactors... Maybe that clean up effort should be logged as a separate bug... 490198 9 112369 fsamuel 2011-10-25 11:55:45 -0700 Created attachment 112369 Patch 490667 10 fishd 2011-10-26 01:33:14 -0700 (In reply to comment #8) > That's a fair short term solution. Ideally, I'd like to store the pageScaleFactor once per page. Simon Fraser told me to take a look at CachedPage to see if pageScaleFactor might belong there. I haven't looked at it yet, but I intend to investigate where would be a better place to store cached pages' pageScaleFactors... > > Maybe that clean up effort should be logged as a separate bug... I'm confused by the CachedPage suggestion. (Chrome does not use CachedPage.) That is part of the back/forward caching feature, but even for ports that do enable the back/forward cache, there is not always a cached page. This is very different from session history (HistoryItem), which contains information required to re-create the page by loading the URL of the page, restoring form fields and adjusting scroll offsets. 490669 11 112369 fishd 2011-10-26 01:34:47 -0700 Comment on attachment 112369 Patch Is there anyway to create a layout test for this bug? 490675 12 112369 webkit.review.bot 2011-10-26 01:51:57 -0700 Comment on attachment 112369 Patch Clearing flags on attachment: 112369 Committed r98453: <http://trac.webkit.org/changeset/98453> 490676 13 webkit.review.bot 2011-10-26 01:52:03 -0700 All reviewed patches have been landed. Closing bug. 111879 2011-10-20 17:25:48 -0700 2011-10-25 11:55:18 -0700 Patch bug-70459-20111020202547.patch text/plain 10060 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogOTgwNDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMzY4ZjA1NmQwMGM0OWVl NmIzYmYzY2MyYTM2MmNkZTQ2ZjNhY2Q4Li40YmUyNzE5NGQzMmRlY2RhZGMwYzQ3MGMxMTUwMWNj YzYzZGMxZTczIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMTAtMjAgIEZhZHkg U2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGFnZSBTY2FsZSBGYWN0 b3IgYnJva2VuIHdoZW4gbmF2aWdhdGluZyBoaXN0b3J5IG9uIHBhZ2VzIHdpdGggY2hpbGQgZnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDQ1 OQorCisgICAgICAgIFdpdGggZnJhbWVTY2FsZUZhY3RvciBub3cgYWx3YXlzIHJldHVybmluZyAx LjAgZm9yIHN1YmZyYW1lcyBhbmQgcGFnZVNjYWxlRmFjdG9yIGZvciB0aGUgbWFpbkZyYW1lLAor ICAgICAgICBhbmQgdGhlcmUgYmVpbmcgb25seSBhIHNpbmdsZSBwYWdlU2NhbGVGYWN0b3IsIGhp c3RvcnkgZm9yIHNjYWxpbmcgaXMgYnJva2VuLiBTY2FsaW5nIGhpc3RvcnkgaXMKKyAgICAgICAg c2F2ZWQgb24gYSBwZXIgZnJhbWUgYmFzaXMgYnV0IHJlc3RvcmVkLCBvdmVycmlkaW5nIHRoZSBw ZXItcGFnZSBwYWdlU2NhbGVGYWN0b3IgbXVsdGlwbGUgdGltZXMuCisgICAgICAgIEFzIGEgcmVz dWx0LCBzb21ldGltZXMgcGFnZXMgdGhhdCBzaG91bGQgYmUgc2NhbGVkIGVuZCB1cCBnZXR0aW5n IGEgc2NhbGUgZmFjdG9yIG9mIDEuMC4KKworICAgICAgICBUaGUgZWFzeSBzb2x1dGlvbiBpcyBv bmx5IHJlc3RvcmUgcGFnZVNjYWxlRmFjdG9yIGZvciB0aGUgbWFpbiBmcmFtZSwgYnV0IEknbSBu b3Qgc2F0aXNmaWVkIHdpdGggdGhpcworICAgICAgICBzb2x1dGlvbi4gV2UgbmVlZCB0byBjaGFu Z2UgdGhlIG5hbWVzIG9mIG1ldGhvZHMgaW4gSGlzdG9yeUl0ZW0gdG8gY29ycmVzcG9uZCB0byB0 aGUgcmVhbGl0eSB0aGF0CisgICAgICAgIHRoZXNlIGFyZSBmcmFtZVNjYWxlRmFjdG9ycyBhbmQg bm90IHBhZ2VTY2FsZUZhY3RvcnMuIEJ1dCBnaXZlbiB0aGF0IGFsbCBmcmFtZXMgZXhjZXB0IHRo ZSBtYWluIGZyYW1lCisgICAgICAgIGhhdmUgYSBzY2FsZSBmYWN0b3Igb2YgMS4wLCBkb2VzIGl0 IGV2ZW4gbWFrZSBzZW5zZSB0byBzdG9yZSB0aGlzIGluZm9ybWF0aW9uPyBJcyB0aGVyZSBhIGds b2JhbCBsZXZlbAorICAgICAgICBIaXN0b3J5IHdoZXJlIEkgc2hvdWxkIGJlIHN0b3JpbmcgcGFn ZVNjYWxlRmFjdG9yPworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisK KyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhp c3RvcnlJdGVtOjpIaXN0b3J5SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6 ZnJhbWVTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0RnJh bWVTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6ZW5jb2RlQmFj a0ZvcndhcmRUcmVlTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6ZGVjb2Rl QmFja0ZvcndhcmRUcmVlKToKKyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVtLmg6CisgICAg ICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhp c3RvcnlDb250cm9sbGVyOjpzYXZlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGVUb0l0ZW0pOgor ICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnJlc3RvcmVTY3JvbGxQb3NpdGlv bkFuZFZpZXdTdGF0ZSk6CisKIDIwMTEtMTAtMjAgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUm91dGUgb25Td2FwQnVmZmVyc0NvbXBsZXRlIGZy b20gTGF5ZXJSZW5kZXJlciB0byBDQ1NjaGVkdWxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK aW5kZXggNzM4ZDJkYWNkMjg1YWVjZWU5NGFmOWMxN2Q3NmFiNmEwYWM2ZmZkZC4uNGIxZDU1N2Mw ODY2ZWMxYmNhZjVmM2IzNzgxMGI2M2E4YmVmZDdmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0xMC0yMCAgRmFkeSBTYW11ZWwgIDxmc2FtdWVsQGNo cm9taXVtLm9yZz4KKworICAgICAgICBQYWdlIFNjYWxlIEZhY3RvciBicm9rZW4gd2hlbiBuYXZp Z2F0aW5nIGhpc3Rvcnkgb24gcGFnZXMgd2l0aCBjaGlsZCBmcmFtZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNDU5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViSGlzdG9yeUl0ZW0u aDoKKyAgICAgICAgKiBzcmMvV2ViSGlzdG9yeUl0ZW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJIaXN0b3J5SXRlbTo6ZnJhbWVTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OldlYkhp c3RvcnlJdGVtOjpzZXRGcmFtZVNjYWxlRmFjdG9yKToKKwogMjAxMS0xMC0yMCAgTmF0IER1Y2Eg IDxuZHVjYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSb3V0ZSBvblN3YXBC dWZmZXJzQ29tcGxldGUgZnJvbSBMYXllclJlbmRlcmVyIHRvIENDU2NoZWR1bGVyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAppbmRleCAyMWM4MWVkZTdlZmUyNjFhZDg2OTc1 MWRjZjllOGYyYTQwYTVlODkyLi5iOWMxODUwMzU1NGRhN2NlMzBjNzZjNzVmOGI1MmJjNDU3YTY2 OTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcApAQCAtNjEsNyArNjEs NyBAQCB2b2lkICgqbm90aWZ5SGlzdG9yeUl0ZW1DaGFuZ2VkKShIaXN0b3J5SXRlbSopID0gZGVm YXVsdE5vdGlmeUhpc3RvcnlJdGVtQ2hhbmdlZAogSGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKCkK ICAgICA6IG1fbGFzdFZpc2l0ZWRUaW1lKDApCiAgICAgLCBtX2xhc3RWaXNpdFdhc0hUVFBOb25H ZXQoZmFsc2UpCi0gICAgLCBtX3BhZ2VTY2FsZUZhY3RvcigxKQorICAgICwgbV9mcmFtZVNjYWxl RmFjdG9yKDEpCiAgICAgLCBtX2xhc3RWaXNpdFdhc0ZhaWx1cmUoZmFsc2UpCiAgICAgLCBtX2lz VGFyZ2V0SXRlbShmYWxzZSkKICAgICAsIG1fdmlzaXRDb3VudCgwKQpAQCAtNzgsNyArNzgsNyBA QCBIaXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgdGl0bGUsIGRvdWJsZSB0aQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1f bGFzdFZpc2l0ZWRUaW1lKHRpbWUpCiAgICAgLCBtX2xhc3RWaXNpdFdhc0hUVFBOb25HZXQoZmFs c2UpCi0gICAgLCBtX3BhZ2VTY2FsZUZhY3RvcigxKQorICAgICwgbV9mcmFtZVNjYWxlRmFjdG9y KDEpCiAgICAgLCBtX2xhc3RWaXNpdFdhc0ZhaWx1cmUoZmFsc2UpCiAgICAgLCBtX2lzVGFyZ2V0 SXRlbShmYWxzZSkKICAgICAsIG1fdmlzaXRDb3VudCgwKQpAQCAtOTcsNyArOTcsNyBAQCBIaXN0 b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgdGl0bGUsIGNvbnN0IFN0cgogICAgICwgbV9kaXNwbGF5VGl0bGUoYWx0ZXJuYXRlVGl0bGUp CiAgICAgLCBtX2xhc3RWaXNpdGVkVGltZSh0aW1lKQogICAgICwgbV9sYXN0VmlzaXRXYXNIVFRQ Tm9uR2V0KGZhbHNlKQotICAgICwgbV9wYWdlU2NhbGVGYWN0b3IoMSkKKyAgICAsIG1fZnJhbWVT Y2FsZUZhY3RvcigxKQogICAgICwgbV9sYXN0VmlzaXRXYXNGYWlsdXJlKGZhbHNlKQogICAgICwg bV9pc1RhcmdldEl0ZW0oZmFsc2UpCiAgICAgLCBtX3Zpc2l0Q291bnQoMCkKQEAgLTExNyw3ICsx MTcsNyBAQCBIaXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgS1VSTCYgdXJsLCBjb25zdCBT dHJpbmcmIHRhcmdldCwgY29uc3QgU3RyaW5nJiBwYQogICAgICwgbV90aXRsZSh0aXRsZSkKICAg ICAsIG1fbGFzdFZpc2l0ZWRUaW1lKDApCiAgICAgLCBtX2xhc3RWaXNpdFdhc0hUVFBOb25HZXQo ZmFsc2UpCi0gICAgLCBtX3BhZ2VTY2FsZUZhY3RvcigxKQorICAgICwgbV9mcmFtZVNjYWxlRmFj dG9yKDEpCiAgICAgLCBtX2xhc3RWaXNpdFdhc0ZhaWx1cmUoZmFsc2UpCiAgICAgLCBtX2lzVGFy Z2V0SXRlbShmYWxzZSkKICAgICAsIG1fdmlzaXRDb3VudCgwKQpAQCAtMTQ3LDcgKzE0Nyw3IEBA IGlubGluZSBIaXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgSGlzdG9yeUl0ZW0mIGl0ZW0p CiAgICAgLCBtX2xhc3RWaXNpdGVkVGltZShpdGVtLm1fbGFzdFZpc2l0ZWRUaW1lKQogICAgICwg bV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0KGl0ZW0ubV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0KQog ICAgICwgbV9zY3JvbGxQb2ludChpdGVtLm1fc2Nyb2xsUG9pbnQpCi0gICAgLCBtX3BhZ2VTY2Fs ZUZhY3RvcihpdGVtLm1fcGFnZVNjYWxlRmFjdG9yKQorICAgICwgbV9mcmFtZVNjYWxlRmFjdG9y KGl0ZW0ubV9mcmFtZVNjYWxlRmFjdG9yKQogICAgICwgbV9sYXN0VmlzaXRXYXNGYWlsdXJlKGl0 ZW0ubV9sYXN0VmlzaXRXYXNGYWlsdXJlKQogICAgICwgbV9pc1RhcmdldEl0ZW0oaXRlbS5tX2lz VGFyZ2V0SXRlbSkKICAgICAsIG1fdmlzaXRDb3VudChpdGVtLm1fdmlzaXRDb3VudCkKQEAgLTQx OCwxNCArNDE4LDE0IEBAIHZvaWQgSGlzdG9yeUl0ZW06OmNsZWFyU2Nyb2xsUG9pbnQoKQogICAg IG1fc2Nyb2xsUG9pbnQuc2V0WSgwKTsKIH0KIAotZmxvYXQgSGlzdG9yeUl0ZW06OnBhZ2VTY2Fs ZUZhY3RvcigpIGNvbnN0CitmbG9hdCBIaXN0b3J5SXRlbTo6ZnJhbWVTY2FsZUZhY3RvcigpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIG1fcGFnZVNjYWxlRmFjdG9yOworICAgIHJldHVybiBtX2ZyYW1l U2NhbGVGYWN0b3I7CiB9CiAKLXZvaWQgSGlzdG9yeUl0ZW06OnNldFBhZ2VTY2FsZUZhY3Rvcihm bG9hdCBzY2FsZUZhY3RvcikKK3ZvaWQgSGlzdG9yeUl0ZW06OnNldEZyYW1lU2NhbGVGYWN0b3Io ZmxvYXQgc2NhbGVGYWN0b3IpCiB7Ci0gICAgbV9wYWdlU2NhbGVGYWN0b3IgPSBzY2FsZUZhY3Rv cjsKKyAgICBtX2ZyYW1lU2NhbGVGYWN0b3IgPSBzY2FsZUZhY3RvcjsKIH0KIAogdm9pZCBIaXN0 b3J5SXRlbTo6c2V0RG9jdW1lbnRTdGF0ZShjb25zdCBWZWN0b3I8U3RyaW5nPiYgc3RhdGUpCkBA IC03MDAsNyArNzAwLDcgQEAgdm9pZCBIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRUcmVl Tm9kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIuZW5jb2RlSW50MzIobV9z Y3JvbGxQb2ludC54KCkpOwogICAgIGVuY29kZXIuZW5jb2RlSW50MzIobV9zY3JvbGxQb2ludC55 KCkpOwogICAgIAotICAgIGVuY29kZXIuZW5jb2RlRmxvYXQobV9wYWdlU2NhbGVGYWN0b3IpOwor ICAgIGVuY29kZXIuZW5jb2RlRmxvYXQobV9mcmFtZVNjYWxlRmFjdG9yKTsKIAogICAgIGVuY29k ZXIuZW5jb2RlQm9vbChtX3N0YXRlT2JqZWN0KTsKICAgICBpZiAobV9zdGF0ZU9iamVjdCkgewpA QCAtODA4LDcgKzgwOCw3IEBAIHJlc3VtZToKICAgICAgICAgcmV0dXJuIDA7CiAgICAgbm9kZS0+ bV9zY3JvbGxQb2ludCA9IEludFBvaW50KHgsIHkpOwogICAgIAotICAgIGlmICghZGVjb2Rlci5k ZWNvZGVGbG9hdChub2RlLT5tX3BhZ2VTY2FsZUZhY3RvcikpCisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZUZsb2F0KG5vZGUtPm1fZnJhbWVTY2FsZUZhY3RvcikpCiAgICAgICAgIHJldHVybiAwOwog CiAgICAgYm9vbCBoYXNTdGF0ZU9iamVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hp c3RvcnkvSGlzdG9yeUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u aAppbmRleCAyOTI5NDJiOTBhOGIzMmRiMzMxZmUxYjNlNjhiMTJhMzQ5ZjQ3YTQ0Li5lYTgyNmJh Y2VlYjc4YjNjNTQ3ZWQzYmY0NDNjMjQwNzhiNjkxZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9I aXN0b3J5SXRlbS5oCkBAIC0xMjIsOCArMTIyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2Ny b2xsUG9pbnQoY29uc3QgSW50UG9pbnQmKTsKICAgICB2b2lkIGNsZWFyU2Nyb2xsUG9pbnQoKTsK ICAgICAKLSAgICBmbG9hdCBwYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKLSAgICB2b2lkIHNldFBh Z2VTY2FsZUZhY3RvcihmbG9hdCk7CisgICAgZmxvYXQgZnJhbWVTY2FsZUZhY3RvcigpIGNvbnN0 OworICAgIHZvaWQgc2V0RnJhbWVTY2FsZUZhY3RvcihmbG9hdCk7CiAgICAgCiAgICAgY29uc3Qg VmVjdG9yPFN0cmluZz4mIGRvY3VtZW50U3RhdGUoKSBjb25zdDsKICAgICB2b2lkIHNldERvY3Vt ZW50U3RhdGUoY29uc3QgVmVjdG9yPFN0cmluZz4mKTsKQEAgLTI0Myw3ICsyNDMsNyBAQCBwcml2 YXRlOgogICAgIGJvb2wgbV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0OwogCiAgICAgSW50UG9pbnQg bV9zY3JvbGxQb2ludDsKLSAgICBmbG9hdCBtX3BhZ2VTY2FsZUZhY3RvcjsKKyAgICBmbG9hdCBt X2ZyYW1lU2NhbGVGYWN0b3I7CiAgICAgVmVjdG9yPFN0cmluZz4gbV9kb2N1bWVudFN0YXRlOwog ICAgIAogICAgIEhpc3RvcnlJdGVtVmVjdG9yIG1fY2hpbGRyZW47CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAppbmRleCBjNmM3YjAyN2Q0ZjZlMDlmNmM5YzFi M2VkZDM5OWRmMjNlZTVmNGU5Li5iOTlmNWNkYTRhZjAzZDJmMDIwMDI1YzQ2ZjM2ZGNiMTQwYTQ0 OGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKQEAg LTg2LDcgKzg2LDcgQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6c2F2ZVNjcm9sbFBvc2l0aW9u QW5kVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVtKiBpdGVtKQogICAgIGVsc2UKICAgICAgICAg aXRlbS0+c2V0U2Nyb2xsUG9pbnQobV9mcmFtZS0+dmlldygpLT5zY3JvbGxQb3NpdGlvbigpKTsK IAotICAgIGl0ZW0tPnNldFBhZ2VTY2FsZUZhY3RvcihtX2ZyYW1lLT5mcmFtZVNjYWxlRmFjdG9y KCkpOworICAgIGl0ZW0tPnNldEZyYW1lU2NhbGVGYWN0b3IobV9mcmFtZS0+ZnJhbWVTY2FsZUZh Y3RvcigpKTsKICAgICAKICAgICAvLyBGSVhNRTogSXQgd291bGQgYmUgZ3JlYXQgdG8gd29yayBv dXQgYSB3YXkgdG8gcHV0IHRoaXMgY29kZSBpbiBXZWJDb3JlIGluc3RlYWQgb2YgY2FsbGluZyB0 aHJvdWdoIHRvIHRoZSBjbGllbnQuCiAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5z YXZlVmlld1N0YXRlVG9JdGVtKGl0ZW0pOwpAQCAtMTI1LDggKzEyNSw5IEBAIHZvaWQgSGlzdG9y eUNvbnRyb2xsZXI6OnJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpCiAgICAgaWYg KEZyYW1lVmlldyogdmlldyA9IG1fZnJhbWUtPnZpZXcoKSkgewogICAgICAgICBpZiAoIXZpZXct Pndhc1Njcm9sbGVkQnlVc2VyKCkpIHsKICAgICAgICAgICAgIHZpZXctPnNldFNjcm9sbFBvc2l0 aW9uKG1fY3VycmVudEl0ZW0tPnNjcm9sbFBvaW50KCkpOwotICAgICAgICAgICAgaWYgKFBhZ2Uq IHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpCi0gICAgICAgICAgICAgICAgcGFnZS0+c2V0UGFnZVNj YWxlRmFjdG9yKG1fY3VycmVudEl0ZW0tPnBhZ2VTY2FsZUZhY3RvcigpLCBtX2N1cnJlbnRJdGVt LT5zY3JvbGxQb2ludCgpKTsKKyAgICAgICAgICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdl KCk7CisgICAgICAgICAgICBpZiAocGFnZSAmJiBwYWdlLT5tYWluRnJhbWUoKSA9PSBtX2ZyYW1l KQorICAgICAgICAgICAgICAgIHBhZ2UtPnNldFBhZ2VTY2FsZUZhY3RvcihtX2N1cnJlbnRJdGVt LT5mcmFtZVNjYWxlRmFjdG9yKCksIG1fY3VycmVudEl0ZW0tPnNjcm9sbFBvaW50KCkpOwogICAg ICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViSGlzdG9yeUl0ZW0uaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhp c3RvcnlJdGVtLmgKaW5kZXggNmJhMTc0MmI1ZGE4ZDM0ZDJkNDU5NWFkODdkMGNkOTlmZTU1MjMx My4uNGM5NDYzNTk1ZTY4NzRiZWQyZDk0MDRmMzYwN2I5NmY0MjRmZWIxZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSGlzdG9yeUl0ZW0uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJIaXN0b3J5SXRlbS5oCkBAIC05Myw4ICs5Myw4 IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfRVhQT1JUIFdlYlBvaW50IHNjcm9sbE9mZnNldCgpIGNv bnN0OwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgV2ViUG9p bnQmKTsKIAotICAgIFdFQktJVF9FWFBPUlQgZmxvYXQgcGFnZVNjYWxlRmFjdG9yKCkgY29uc3Q7 Ci0gICAgV0VCS0lUX0VYUE9SVCB2b2lkIHNldFBhZ2VTY2FsZUZhY3RvcihmbG9hdCk7CisgICAg V0VCS0lUX0VYUE9SVCBmbG9hdCBmcmFtZVNjYWxlRmFjdG9yKCkgY29uc3Q7CisgICAgV0VCS0lU X0VYUE9SVCB2b2lkIHNldEZyYW1lU2NhbGVGYWN0b3IoZmxvYXQpOwogCiAgICAgV0VCS0lUX0VY UE9SVCBib29sIGlzVGFyZ2V0SXRlbSgpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBz ZXRJc1RhcmdldEl0ZW0oYm9vbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJIaXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJI aXN0b3J5SXRlbS5jcHAKaW5kZXggNzE1M2IzMmZlMTAxNTA5MjNhNmY5OTdkNjRkMzA3OTQ0YmE1 MTNjOC4uNWI5NTQxMzM4ZjA0YjZmZTk4OTQ3ZjE0MmZiYWU0ZjVlYzBlODViOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSGlzdG9yeUl0ZW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkhpc3RvcnlJdGVtLmNwcApAQCAtMTY1LDE1ICsx NjUsMTUgQEAgdm9pZCBXZWJIaXN0b3J5SXRlbTo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYlBv aW50JiBzY3JvbGxPZmZzZXQpCiAgICAgbV9wcml2YXRlLT5zZXRTY3JvbGxQb2ludChzY3JvbGxP ZmZzZXQpOwogfQogCi1mbG9hdCBXZWJIaXN0b3J5SXRlbTo6cGFnZVNjYWxlRmFjdG9yKCkgY29u c3QKK2Zsb2F0IFdlYkhpc3RvcnlJdGVtOjpmcmFtZVNjYWxlRmFjdG9yKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gbV9wcml2YXRlLT5wYWdlU2NhbGVGYWN0b3IoKTsKKyAgICByZXR1cm4gbV9wcml2 YXRlLT5mcmFtZVNjYWxlRmFjdG9yKCk7CiB9CiAKLXZvaWQgV2ViSGlzdG9yeUl0ZW06OnNldFBh Z2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSkKK3ZvaWQgV2ViSGlzdG9yeUl0ZW06OnNldEZyYW1l U2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUpCiB7CiAgICAgZW5zdXJlTXV0YWJsZSgpOwotICAgIHJl dHVybiBtX3ByaXZhdGUtPnNldFBhZ2VTY2FsZUZhY3RvcihzY2FsZSk7CisgICAgcmV0dXJuIG1f cHJpdmF0ZS0+c2V0RnJhbWVTY2FsZUZhY3RvcihzY2FsZSk7CiB9CiAKIGJvb2wgV2ViSGlzdG9y eUl0ZW06OmlzVGFyZ2V0SXRlbSgpIGNvbnN0Cg== 112369 2011-10-25 11:55:45 -0700 2011-10-26 01:51:57 -0700 Patch bug-70459-20111025145543.patch text/plain 2106 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogOTgzNDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiMGQxZTYyZjg3YmViYTI3 OTc2NjE0MjAyOTdlMmIwMDhiN2NhYTYxLi44ODcyYjcxNjU3N2VjODA3N2Y2YjZiYzFjMDA5YmZl NDExYzY2MTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTAtMjUgIEZhZHkg U2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUGFnZSBTY2FsZSBGYWN0 b3IgYnJva2VuIHdoZW4gbmF2aWdhdGluZyBoaXN0b3J5IG9uIHBhZ2VzIHdpdGggY2hpbGQgZnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDQ1 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpdGgg ZnJhbWVTY2FsZUZhY3RvciBub3cgYWx3YXlzIHJldHVybmluZyAxLjAgZm9yIHN1YmZyYW1lcyBh bmQgcGFnZVNjYWxlRmFjdG9yIGZvciB0aGUgbWFpbkZyYW1lLAorICAgICAgICBhbmQgdGhlcmUg YmVpbmcgb25seSBhIHNpbmdsZSBwYWdlU2NhbGVGYWN0b3IsIGhpc3RvcnkgZm9yIHNjYWxpbmcg aXMgYnJva2VuLiBTY2FsaW5nIGhpc3RvcnkgaXMKKyAgICAgICAgc2F2ZWQgb24gYSBwZXIgZnJh bWUgYmFzaXMgYnV0IHJlc3RvcmVkLCBvdmVycmlkaW5nIHRoZSBwZXItcGFnZSBwYWdlU2NhbGVG YWN0b3IgbXVsdGlwbGUgdGltZXMuCisgICAgICAgIEFzIGEgcmVzdWx0LCBzb21ldGltZXMgcGFn ZXMgdGhhdCBoYXZlIHN1YmZyYW1lcyBlbmQgdXAgZ2V0dGluZyBhIHNjYWxlIGZhY3RvciBvZiAx LjAgaW5zdGVhZAorICAgICAgICBvZiB0aGUgY29ycmVjdCBzY2FsZSBmYWN0b3IgdGhhdCB3YXMg YXNzaWduZWQgdG8gdGhlIG1haW4gZnJhbWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1 c2UgSSBkb24ndCBrbm93IGhvdyB0byB0ZXN0IHRoaXMuCisKKyAgICAgICAgKiBsb2FkZXIvSGlz dG9yeUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6 OnJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSk6CisKIDIwMTEtMTAtMjQgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogZml4IGVtcHR5IGxpbmUgaGFuZGxpbmcgaW4gc291cmNlIG1hcHMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAppbmRleCBjNmM3YjAyN2Q0ZjZlMDlm NmM5YzFiM2VkZDM5OWRmMjNlZTVmNGU5Li5iOTYzZmRkOTU2MTcwNTMyZWU2N2QyNGRhODQ1Yzk0 MDkxODNhYjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRy b2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5j cHAKQEAgLTEyNSw3ICsxMjUsOCBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpyZXN0b3JlU2Ny b2xsUG9zaXRpb25BbmRWaWV3U3RhdGUoKQogICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBtX2Zy YW1lLT52aWV3KCkpIHsKICAgICAgICAgaWYgKCF2aWV3LT53YXNTY3JvbGxlZEJ5VXNlcigpKSB7 CiAgICAgICAgICAgICB2aWV3LT5zZXRTY3JvbGxQb3NpdGlvbihtX2N1cnJlbnRJdGVtLT5zY3Jv bGxQb2ludCgpKTsKLSAgICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgp KQorICAgICAgICAgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKKyAgICAgICAgICAg IGlmIChwYWdlICYmIHBhZ2UtPm1haW5GcmFtZSgpID09IG1fZnJhbWUpCiAgICAgICAgICAgICAg ICAgcGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9yKG1fY3VycmVudEl0ZW0tPnBhZ2VTY2FsZUZhY3Rv cigpLCBtX2N1cnJlbnRJdGVtLT5zY3JvbGxQb2ludCgpKTsKICAgICAgICAgfQogICAgIH0K