101380 2012-11-06 11:29:33 -0800 Autoresize should work even if turned on while the page is loading. 2012-11-07 12:11:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fsamuel fsamuel abarth japhet levin webkit.review.bot oldest_to_newest 759914 0 fsamuel 2012-11-06 11:29:33 -0800 Complete AutoSize after loading 759915 1 172624 fsamuel 2012-11-06 11:29:52 -0800 Created attachment 172624 Patch 760191 2 levin 2012-11-06 16:30:11 -0800 Looking at this. 760217 3 levin 2012-11-06 17:00:43 -0800 The problem isn't that autoresize really needs to be run after loadcomplete. The bug is in the case of turning on autoresize after the load has started but before it completed when the initial size is huge. We have some code in the autoresize function that prevents the size from getting smaller during the load due to janky-ness that happens when we allow this. However, in this case when autoresize is turned on or set to a smaller size, we should make the size smaller. Here's my suggested fix: Look for the code in autoSizeIfEnabled that looks like this: // Avoid doing resizing to a smaller size while the frame is loading to avoid switching to a small size // during an intermediate state (and then changing back to a bigger size as the load progresses). if (!frame()->loader()->isComplete() && (newSize.height() < size.height() || newSize.width() < size.width())) { Change the if to be: if (m_didRunAutosize && size.height() <= m_maxAutoSize.height() && size.width() <= m_maxAutoSize.width() && (!frame()->loader()->isComplete() && (newSize.height() < size.height() || newSize.width() < size.width()))) And adjust the comment and braces appropriately. Let me know if this doesn't make sense or you need help with the comment, etc. What should happen is that 760316 4 172705 fsamuel 2012-11-06 19:38:44 -0800 Created attachment 172705 Patch 760317 5 fsamuel 2012-11-06 19:40:01 -0800 (In reply to comment #3) > The problem isn't that autoresize really needs to be run after loadcomplete. > > The bug is in the case of turning on autoresize after the load has started but before it completed when the initial size is huge. > > We have some code in the autoresize function that prevents the size from getting smaller during the load due to janky-ness that happens when we allow this. However, in this case when autoresize is turned on or set to a smaller size, we should make the size smaller. > > Here's my suggested fix: > > Look for the code in autoSizeIfEnabled that looks like this: > // Avoid doing resizing to a smaller size while the frame is loading to avoid switching to a small size > // during an intermediate state (and then changing back to a bigger size as the load progresses). > if (!frame()->loader()->isComplete() && (newSize.height() < size.height() || newSize.width() < size.width())) { > > Change the if to be: > > if (m_didRunAutosize && size.height() <= m_maxAutoSize.height() && size.width() <= m_maxAutoSize.width() > && (!frame()->loader()->isComplete() && (newSize.height() < size.height() || newSize.width() < size.width()))) > > And adjust the comment and braces appropriately. > > > Let me know if this doesn't make sense or you need help with the comment, etc. > > > What should happen is that I've applied your change locally, and I've confirmed that it solves my problem! Thanks! I'm not too familiar with this algorithm and how it works so I don't really know how to best update this comment. Suggestions would be most helpful. :-) 760322 6 levin 2012-11-06 19:46:20 -0800 (In reply to comment #5) > > I've applied your change locally, and I've confirmed that it solves my problem! Thanks! I'm not too familiar with this algorithm and how it works so I don't really know how to best update this comment. Suggestions would be most helpful. :-) Here's my suggested rewrite: // While loading only allow the size to increase (to avoid twitching during intermediate smaller states) // unless autoresize has just been turned on or the maximum size is smaller than the current size. I hope this makes sense. The idea would be that this helps explain the code to someone who may not know the code as well so you are an ideal candidate to judge that! 760323 7 levin 2012-11-06 19:47:22 -0800 And I just noticed that I put in too many parenthesis. This is just as clear: if (m_didRunAutosize && size.height() <= m_maxAutoSize.height() && size.width() <= m_maxAutoSize.width() && !frame()->loader()->isComplete() && (newSize.height() < size.height() || newSize.width() < size.width())) 760326 8 172705 levin 2012-11-06 19:49:56 -0800 Comment on attachment 172705 Patch Please update the comment and fix the parens. Then I'd be happy to r+. 760328 9 172705 levin 2012-11-06 19:50:59 -0800 Comment on attachment 172705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172705&action=review > Source/WebCore/ChangeLog:3 > + Complete AutoSize after loading This comment no longer makes sense. (Perhaps the bug should be titled that autoresize should work even if turned on while the page is loading.) 760684 10 fsamuel 2012-11-07 07:32:31 -0800 (In reply to comment #9) > (From update of attachment 172705 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172705&action=review > > > Source/WebCore/ChangeLog:3 > > + Complete AutoSize after loading > > This comment no longer makes sense. (Perhaps the bug should be titled that autoresize should work even if turned on while the page is loading.) Doh! I take that back. While this works with manual testing, this broke one of my browser_tests. I'm investigating further. 760696 11 levin 2012-11-07 07:51:00 -0800 I am starting to believe that it may be good to do your original change *and* the change I gave you. The issue is that it does allow the size to get smaller while loading but after load complete, it should likely be given the chance to adjust the size one last time in case the size got smaller. It is a little odd to the name of the function. Recommendation: Do your original change and my addition. Also, change the name of the function to handleLoadCompleted from checkFlushDeferredRepaintsAfterLoadComplete and add a comment about why the auto size is called there. (See what I wrote above about "the issue". 760713 12 fsamuel 2012-11-07 08:10:57 -0800 (In reply to comment #10) > (In reply to comment #9) > > (From update of attachment 172705 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=172705&action=review > > > > > Source/WebCore/ChangeLog:3 > > > + Complete AutoSize after loading > > > > This comment no longer makes sense. (Perhaps the bug should be titled that autoresize should work even if turned on while the page is loading.) > > Doh! I take that back. While this works with manual testing, this broke one of my browser_tests. I'm investigating further. It looks like these two lines, immediately after the break, are the culprit: if (document->processingLoadEvent()) newSize = newSize.expandedTo(size); Why are we doing this? Does this make sense? If so, I would say this part needs a comment too, because I can't understand why it's there :-) 760865 13 172836 fsamuel 2012-11-07 10:47:39 -0800 Created attachment 172836 Patch 760883 14 172836 levin 2012-11-07 10:54:38 -0800 Comment on attachment 172836 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172836&action=review > Source/WebCore/ChangeLog:11 > + Typically in WebKit, the changelog has some small per function comments as well to explain why a change was done there. I'll add some below as an example. I would suggest adding them or something of this sort to your change log. > Source/WebCore/ChangeLog:13 > + (WebCore::FrameLoader::checkCompleted): Adjust to function rename. > Source/WebCore/ChangeLog:15 > + (WebCore::FrameView::handleLoadCompleted): Rename function to encompass its expanded responsibilities (which include doing the final auto size after the load is completed). > Source/WebCore/ChangeLog:16 > + (WebCore::FrameView::autoSizeIfEnabled): Allow the size to shrink if autosize is adjusted while the page is loading. > Source/WebCore/ChangeLog:18 > + (FrameView): Function rename. 760911 15 172845 fsamuel 2012-11-07 11:24:42 -0800 Created attachment 172845 Patch 760955 16 172845 webkit.review.bot 2012-11-07 12:11:15 -0800 Comment on attachment 172845 Patch Clearing flags on attachment: 172845 Committed r133790: <http://trac.webkit.org/changeset/133790> 760956 17 webkit.review.bot 2012-11-07 12:11:19 -0800 All reviewed patches have been landed. Closing bug. 172624 2012-11-06 11:29:52 -0800 2012-11-06 19:38:42 -0800 Patch bug-101380-20121106142804.patch text/plain 1380 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxYTk1Y2E2NTczZGNj YmJiMGYxN2ZiYzZlM2I3MWM0MDRmNzhkMC4uZmU0MTc5Yzc3YWFhMGQ0ZDY1MjI4NGY4YWIwOTI0 Zjg3ZTI3NTk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTA2ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENvbXBsZXRlIEF1dG9T aXplIGFmdGVyIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMTM4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGl0aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNoYW5nZSBzdWNoIGFzIGFw cHJvYWNoLCByYXRpb25hbGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9ucyBi ZWxvdyAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpjaGVj a0ZsdXNoRGVmZXJyZWRSZXBhaW50c0FmdGVyTG9hZENvbXBsZXRlKToKKwogMjAxMi0xMS0wNiAg QW5kcmV5IEx1c2huaWtvdiAgPGx1c2huaWtvdkBnb29nbGUuY29tPgogCiAgICAgICAgIEFkZGVk IGNvbnNvbGUuY2xlYXIoKSBtZXRob2QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAy OWIwNzVjZDM3MWU5ZWJjZDhmMDcwZDVmOTJjZDhiM2Q5MmFlMzlkLi5jODAyYzEyNjIwOTMxMTkw OGFmMDAwNDQ5OTI5MDVmZjFiZjVlYjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBA IC0yMDQ3LDYgKzIwNDcsNyBAQCB2b2lkIEZyYW1lVmlldzo6c3RhcnREZWZlcnJlZFJlcGFpbnRU aW1lcihkb3VibGUgZGVsYXkpCiAKIHZvaWQgRnJhbWVWaWV3OjpjaGVja0ZsdXNoRGVmZXJyZWRS ZXBhaW50c0FmdGVyTG9hZENvbXBsZXRlKCkKIHsKKyAgICBhdXRvU2l6ZUlmRW5hYmxlZCgpOwog ICAgIGlmIChzaG91bGRVc2VMb2FkVGltZURlZmVycmVkUmVwYWludERlbGF5KCkpCiAgICAgICAg IHJldHVybjsKICAgICBtX2RlZmVycmVkUmVwYWludERlbGF5ID0gc19ub3JtYWxEZWZlcnJlZFJl cGFpbnREZWxheTsK 172705 2012-11-06 19:38:44 -0800 2012-11-07 10:47:37 -0800 Patch bug-101380-20121106223656.patch text/plain 1881 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxYTk1Y2E2NTczZGNj YmJiMGYxN2ZiYzZlM2I3MWM0MDRmNzhkMC4uNjdjMWU2NWYxZWRhZDBkYWMwMTUwZWI1NWI4ZTgw ZThkMzA2MTlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTExLTA2ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENvbXBsZXRlIEF1dG9T aXplIGFmdGVyIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMTM4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjphdXRvU2l6ZUlmRW5hYmxlZCk6CisKIDIwMTItMTEtMDYgIEFuZHJleSBMdXNobmlrb3Yg IDxsdXNobmlrb3ZAZ29vZ2xlLmNvbT4KIAogICAgICAgICBBZGRlZCBjb25zb2xlLmNsZWFyKCkg bWV0aG9kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMjliMDc1Y2QzNzFlOWViY2Q4 ZjA3MGQ1ZjkyY2Q4YjNkOTJhZTM5ZC4uMjBmNWJkZDdmNWY5MDQ2N2I2NzBjM2UyNWQyZDA4NzU0 MzY0YmQzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjY1Myw5ICsyNjUzLDEx IEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCgpCiAKICAgICAgICAgLy8gQXZv aWQgZG9pbmcgcmVzaXppbmcgdG8gYSBzbWFsbGVyIHNpemUgd2hpbGUgdGhlIGZyYW1lIGlzIGxv YWRpbmcgdG8gYXZvaWQgc3dpdGNoaW5nIHRvIGEgc21hbGwgc2l6ZQogICAgICAgICAvLyBkdXJp bmcgYW4gaW50ZXJtZWRpYXRlIHN0YXRlIChhbmQgdGhlbiBjaGFuZ2luZyBiYWNrIHRvIGEgYmln Z2VyIHNpemUgYXMgdGhlIGxvYWQgcHJvZ3Jlc3NlcykuCi0gICAgICAgIGlmICghZnJhbWUoKS0+ bG9hZGVyKCktPmlzQ29tcGxldGUoKSAmJiAobmV3U2l6ZS5oZWlnaHQoKSA8IHNpemUuaGVpZ2h0 KCkgfHwgbmV3U2l6ZS53aWR0aCgpIDwgc2l6ZS53aWR0aCgpKSkKKyAgICAgICAgaWYgKG1fZGlk UnVuQXV0b3NpemUgJiYgc2l6ZS5oZWlnaHQoKSA8PSBtX21heEF1dG9TaXplLmhlaWdodCgpICYm IHNpemUud2lkdGgoKSA8PSBtX21heEF1dG9TaXplLndpZHRoKCkKKyAgICAgICAgICAgICYmICgh ZnJhbWUoKS0+bG9hZGVyKCktPmlzQ29tcGxldGUoKSAmJiAobmV3U2l6ZS5oZWlnaHQoKSA8IHNp emUuaGVpZ2h0KCkgfHwgbmV3U2l6ZS53aWR0aCgpIDwgc2l6ZS53aWR0aCgpKSkpCiAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgZWxzZSBpZiAoZG9jdW1lbnQtPnByb2Nlc3NpbmdMb2FkRXZl bnQoKSkKKyAgICAgICAgCisgICAgICAgIGlmIChkb2N1bWVudC0+cHJvY2Vzc2luZ0xvYWRFdmVu dCgpKQogICAgICAgICAgICAgbmV3U2l6ZSA9IG5ld1NpemUuZXhwYW5kZWRUbyhzaXplKTsKICAg ICAgICAgcmVzaXplKG5ld1NpemUud2lkdGgoKSwgbmV3U2l6ZS5oZWlnaHQoKSk7CiAgICAgICAg IC8vIEZvcmNlIHRoZSBzY3JvbGxiYXIgc3RhdGUgdG8gYXZvaWQgdGhlIHNjcm9sbGJhciBjb2Rl IGFkZGluZyB0aGVtIGFuZCBjYXVzaW5nIHRoZW0gdG8gYmUgbmVlZGVkLiBGb3IgZXhhbXBsZSwK 172836 2012-11-07 10:47:39 -0800 2012-11-07 11:24:39 -0800 Patch bug-101380-20121107134550.patch text/plain 4633 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxYTk1Y2E2NTczZGNj YmJiMGYxN2ZiYzZlM2I3MWM0MDRmNzhkMC4uOTM4NjcyMmYzYTk1MDE4OWJlOGUwZDAwZjBhMTU0 MGJhZTlmMjdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTA3ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEF1dG9yZXNpemUgc2hv dWxkIHdvcmsgZXZlbiBpZiB0dXJuZWQgb24gd2hpbGUgdGhlIHBhZ2UgaXMgbG9hZGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTM4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF1dG9yZXNpemUg ZG9lcyBub3Qgd29yayBpbiBjYXNlcyB3aGVyZSBpdCBpcyB0dXJuZWQgb24gd2hpbGUgbG9hZGlu Zy4KKyAgICAgICAgVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhpcyBieSBhbGxvd2luZyBhdXRvU2l6 ZSB0byBjb21wbGV0ZSBpZiBpdCdzIHR1cm5lZCBvbgorICAgICAgICB3aGlsZSBsb2FkaW5nIGFu ZCBkb2luZyBhIGZpbmFsIHBhc3MgYWZ0ZXIgbG9hZGluZy4KKworICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hlY2tDb21w bGV0ZWQpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6aGFuZGxlTG9hZENvbXBsZXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmF1dG9TaXplSWZFbmFibGVkKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgor ICAgICAgICAoRnJhbWVWaWV3KToKKwogMjAxMi0xMS0wNiAgQW5kcmV5IEx1c2huaWtvdiAgPGx1 c2huaWtvdkBnb29nbGUuY29tPgogCiAgICAgICAgIEFkZGVkIGNvbnNvbGUuY2xlYXIoKSBtZXRo b2QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGMxZGE0NDU0N2I4ZWYx YjJhYTFmMjY0MzBhM2MwODE5MzYyMDliZjIuLmY1YzJhMzQzNjI1YmUzYTFhYzdkYjc4Y2E4MmNl ODM0YzcyOTVmMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtNzQy LDcgKzc0Miw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNoZWNrQ29tcGxldGVkKCkKICAgICBtX3No b3VsZENhbGxDaGVja0NvbXBsZXRlZCA9IGZhbHNlOwogCiAgICAgaWYgKG1fZnJhbWUtPnZpZXco KSkKLSAgICAgICAgbV9mcmFtZS0+dmlldygpLT5jaGVja0ZsdXNoRGVmZXJyZWRSZXBhaW50c0Fm dGVyTG9hZENvbXBsZXRlKCk7CisgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+aGFuZGxlTG9hZENv bXBsZXRlZCgpOwogCiAgICAgLy8gSGF2ZSB3ZSBjb21wbGV0ZWQgYmVmb3JlPwogICAgIGlmICht X2lzQ29tcGxldGUpCkBAIC03NzksNyArNzc5LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2hlY2tD b21wbGV0ZWQoKQogICAgICAgICBjaGVja0xvYWRDb21wbGV0ZSgpOwogCiAgICAgaWYgKG1fZnJh bWUtPnZpZXcoKSkKLSAgICAgICAgbV9mcmFtZS0+dmlldygpLT5jaGVja0ZsdXNoRGVmZXJyZWRS ZXBhaW50c0FmdGVyTG9hZENvbXBsZXRlKCk7CisgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+aGFu ZGxlTG9hZENvbXBsZXRlZCgpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpjaGVja1RpbWVyRmly ZWQoVGltZXI8RnJhbWVMb2FkZXI+KikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAy OWIwNzVjZDM3MWU5ZWJjZDhmMDcwZDVmOTJjZDhiM2Q5MmFlMzlkLi42YWNkMTA4N2Y5YjI2OThh MzczNTVlNmFkNTg3Y2E0OWYzN2I2NTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBA IC0yMDQ1LDggKzIwNDUsMTEgQEAgdm9pZCBGcmFtZVZpZXc6OnN0YXJ0RGVmZXJyZWRSZXBhaW50 VGltZXIoZG91YmxlIGRlbGF5KQogICAgIG1fZGVmZXJyZWRSZXBhaW50VGltZXIuc3RhcnRPbmVT aG90KGRlbGF5KTsKIH0KIAotdm9pZCBGcmFtZVZpZXc6OmNoZWNrRmx1c2hEZWZlcnJlZFJlcGFp bnRzQWZ0ZXJMb2FkQ29tcGxldGUoKQordm9pZCBGcmFtZVZpZXc6OmhhbmRsZUxvYWRDb21wbGV0 ZWQoKQogeworICAgIC8vIE9uY2UgbG9hZGluZyBoYXMgY29tcGxldGVkLCBhbGxvdyBhdXRvU2l6 ZSBvbmUgbGFzdCBvcHBvcnR1bml0eSB0bworICAgIC8vIHJlZHVjZSB0aGUgc2l6ZSBvZiB0aGUg ZnJhbWUuCisgICAgYXV0b1NpemVJZkVuYWJsZWQoKTsKICAgICBpZiAoc2hvdWxkVXNlTG9hZFRp bWVEZWZlcnJlZFJlcGFpbnREZWxheSgpKQogICAgICAgICByZXR1cm47CiAgICAgbV9kZWZlcnJl ZFJlcGFpbnREZWxheSA9IHNfbm9ybWFsRGVmZXJyZWRSZXBhaW50RGVsYXk7CkBAIC0yNjUxLDEy ICsyNjU0LDEyIEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCgpCiAgICAgICAg IGlmIChuZXdTaXplID09IHNpemUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAv LyBBdm9pZCBkb2luZyByZXNpemluZyB0byBhIHNtYWxsZXIgc2l6ZSB3aGlsZSB0aGUgZnJhbWUg aXMgbG9hZGluZyB0byBhdm9pZCBzd2l0Y2hpbmcgdG8gYSBzbWFsbCBzaXplCi0gICAgICAgIC8v IGR1cmluZyBhbiBpbnRlcm1lZGlhdGUgc3RhdGUgKGFuZCB0aGVuIGNoYW5naW5nIGJhY2sgdG8g YSBiaWdnZXIgc2l6ZSBhcyB0aGUgbG9hZCBwcm9ncmVzc2VzKS4KLSAgICAgICAgaWYgKCFmcmFt ZSgpLT5sb2FkZXIoKS0+aXNDb21wbGV0ZSgpICYmIChuZXdTaXplLmhlaWdodCgpIDwgc2l6ZS5o ZWlnaHQoKSB8fCBuZXdTaXplLndpZHRoKCkgPCBzaXplLndpZHRoKCkpKQorICAgICAgICAvLyBX aGlsZSBsb2FkaW5nIG9ubHkgYWxsb3cgdGhlIHNpemUgdG8gaW5jcmVhc2UgKHRvIGF2b2lkIHR3 aXRjaGluZyBkdXJpbmcgaW50ZXJtZWRpYXRlIHNtYWxsZXIgc3RhdGVzKQorICAgICAgICAvLyB1 bmxlc3MgYXV0b3Jlc2l6ZSBoYXMganVzdCBiZWVuIHR1cm5lZCBvbiBvciB0aGUgbWF4aW11bSBz aXplIGlzIHNtYWxsZXIgdGhhbiB0aGUgY3VycmVudCBzaXplLgorICAgICAgICBpZiAobV9kaWRS dW5BdXRvc2l6ZSAmJiBzaXplLmhlaWdodCgpIDw9IG1fbWF4QXV0b1NpemUuaGVpZ2h0KCkgJiYg c2l6ZS53aWR0aCgpIDw9IG1fbWF4QXV0b1NpemUud2lkdGgoKQorICAgICAgICAgICAgJiYgIWZy YW1lKCktPmxvYWRlcigpLT5pc0NvbXBsZXRlKCkgJiYgKG5ld1NpemUuaGVpZ2h0KCkgPCBzaXpl LmhlaWdodCgpIHx8IG5ld1NpemUud2lkdGgoKSA8IHNpemUud2lkdGgoKSkpCiAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgZWxzZSBpZiAoZG9jdW1lbnQtPnByb2Nlc3NpbmdMb2FkRXZlbnQo KSkKLSAgICAgICAgICAgIG5ld1NpemUgPSBuZXdTaXplLmV4cGFuZGVkVG8oc2l6ZSk7CisKICAg ICAgICAgcmVzaXplKG5ld1NpemUud2lkdGgoKSwgbmV3U2l6ZS5oZWlnaHQoKSk7CiAgICAgICAg IC8vIEZvcmNlIHRoZSBzY3JvbGxiYXIgc3RhdGUgdG8gYXZvaWQgdGhlIHNjcm9sbGJhciBjb2Rl IGFkZGluZyB0aGVtIGFuZCBjYXVzaW5nIHRoZW0gdG8gYmUgbmVlZGVkLiBGb3IgZXhhbXBsZSwK ICAgICAgICAgLy8gYSB2ZXJ0aWNhbCBzY3JvbGxiYXIgbWF5IGNhdXNlIHRleHQgdG8gd3JhcCBh bmQgdGh1cyBpbmNyZWFzZSB0aGUgaGVpZ2h0ICh3aGljaCBpcyB0aGUgb25seSByZWFzb24gdGhl IHNjb2xsYmFyIGlzIG5lZWRlZCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA1ODM0NTNi MjY1NTI5ZDMwM2NiMTJlYmJiYWJkNzI5MmM4YWU2ZWFjLi5hODAyMGYyM2YxYjhlMzhkZGZmZGI0 MmZlODNmNTdjMmU5Y2QwMzVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTIxNiw3ICsy MTYsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGJlZ2luRGVmZXJyZWRSZXBhaW50cygpOwogICAg IHZvaWQgZW5kRGVmZXJyZWRSZXBhaW50cygpOwotICAgIHZvaWQgY2hlY2tGbHVzaERlZmVycmVk UmVwYWludHNBZnRlckxvYWRDb21wbGV0ZSgpOworICAgIHZvaWQgaGFuZGxlTG9hZENvbXBsZXRl ZCgpOwogICAgIHZvaWQgZmx1c2hEZWZlcnJlZFJlcGFpbnRzKCk7CiAgICAgdm9pZCBzdGFydERl ZmVycmVkUmVwYWludFRpbWVyKGRvdWJsZSBkZWxheSk7CiAgICAgdm9pZCByZXNldERlZmVycmVk UmVwYWludERlbGF5KCk7Cg== 172845 2012-11-07 11:24:42 -0800 2012-11-07 12:11:15 -0800 Patch bug-101380-20121107142253.patch text/plain 4983 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxYTk1Y2E2NTczZGNj YmJiMGYxN2ZiYzZlM2I3MWM0MDRmNzhkMC4uYmI0MjhiMzdhNzJmMDQzODQyZmY5Y2Y4ODJkZGIy NDVhZTZiMzk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTExLTA3ICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEF1dG9yZXNpemUgc2hv dWxkIHdvcmsgZXZlbiBpZiB0dXJuZWQgb24gd2hpbGUgdGhlIHBhZ2UgaXMgbG9hZGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTM4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgorCisgICAgICAgIEF1dG9yZXNpemUgZG9l cyBub3Qgd29yayBpbiBjYXNlcyB3aGVyZSBpdCBpcyB0dXJuZWQgb24gd2hpbGUgbG9hZGluZy4K KyAgICAgICAgVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhpcyBieSBhbGxvd2luZyBhdXRvU2l6ZSB0 byBjb21wbGV0ZSBpZiBpdCdzIHR1cm5lZCBvbgorICAgICAgICB3aGlsZSBsb2FkaW5nIGFuZCBk b2luZyBhIGZpbmFsIHBhc3MgYWZ0ZXIgbG9hZGluZy4KKworICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hlY2tDb21wbGV0 ZWQpOgorICAgICAgICBBZGp1c3QgdG8gY2FsbCByZW5hbWVkIGZ1bmN0aW9uLgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aGFuZGxl TG9hZENvbXBsZXRlZCk6CisgICAgICAgIFJlbmFtZSBmdW5jdGlvbiB0byBlbmNvbXBhc3MgaXRz IGV4cGFuZGVkIHJlc3BvbnNpYmlsaXRpZXMgKHdoaWNoIGluY2x1ZGUgZG9pbmcgdGhlIGZpbmFs IGF1dG8gc2l6ZSBhZnRlciB0aGUgbG9hZCBpcyBjb21wbGV0ZWQpLgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCk6CisgICAgICAgIEFsbG93IHRoZSBzaXpl IHRvIHNocmluayBpZiBhdXRvc2l6ZSBpcyBhZGp1c3RlZCB3aGlsZSB0aGUgcGFnZSBpcyBsb2Fk aW5nLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChGcmFtZVZpZXcpOgor ICAgICAgICBSZW5hbWVkICdjaGVja0ZsdXNoRGVmZXJyZWRSZXBhaW50c0FmdGVyTG9hZENvbXBs ZXRlJyB0byAnaGFuZGxlTG9hZENvbXBsZXRlJworCiAyMDEyLTExLTA2ICBBbmRyZXkgTHVzaG5p a292ICA8bHVzaG5pa292QGdvb2dsZS5jb20+CiAKICAgICAgICAgQWRkZWQgY29uc29sZS5jbGVh cigpIG1ldGhvZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggYzFkYTQ0 NTQ3YjhlZjFiMmFhMWYyNjQzMGEzYzA4MTkzNjIwOWJmMi4uZjVjMmEzNDM2MjViZTNhMWFjN2Ri NzhjYTgyY2U4MzRjNzI5NWYyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CkBAIC03NDIsNyArNzQyLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2hlY2tDb21wbGV0ZWQoKQog ICAgIG1fc2hvdWxkQ2FsbENoZWNrQ29tcGxldGVkID0gZmFsc2U7CiAKICAgICBpZiAobV9mcmFt ZS0+dmlldygpKQotICAgICAgICBtX2ZyYW1lLT52aWV3KCktPmNoZWNrRmx1c2hEZWZlcnJlZFJl cGFpbnRzQWZ0ZXJMb2FkQ29tcGxldGUoKTsKKyAgICAgICAgbV9mcmFtZS0+dmlldygpLT5oYW5k bGVMb2FkQ29tcGxldGVkKCk7CiAKICAgICAvLyBIYXZlIHdlIGNvbXBsZXRlZCBiZWZvcmU/CiAg ICAgaWYgKG1faXNDb21wbGV0ZSkKQEAgLTc3OSw3ICs3NzksNyBAQCB2b2lkIEZyYW1lTG9hZGVy OjpjaGVja0NvbXBsZXRlZCgpCiAgICAgICAgIGNoZWNrTG9hZENvbXBsZXRlKCk7CiAKICAgICBp ZiAobV9mcmFtZS0+dmlldygpKQotICAgICAgICBtX2ZyYW1lLT52aWV3KCktPmNoZWNrRmx1c2hE ZWZlcnJlZFJlcGFpbnRzQWZ0ZXJMb2FkQ29tcGxldGUoKTsKKyAgICAgICAgbV9mcmFtZS0+dmll dygpLT5oYW5kbGVMb2FkQ29tcGxldGVkKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmNoZWNr VGltZXJGaXJlZChUaW1lcjxGcmFtZUxvYWRlcj4qKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDI5YjA3NWNkMzcxZTllYmNkOGYwNzBkNWY5MmNkOGIzZDkyYWUzOWQuLjZhY2QxMDg3 ZjliMjY5OGEzNzM1NWU2YWQ1ODdjYTQ5ZjM3YjY1NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKQEAgLTIwNDUsOCArMjA0NSwxMSBAQCB2b2lkIEZyYW1lVmlldzo6c3RhcnREZWZlcnJl ZFJlcGFpbnRUaW1lcihkb3VibGUgZGVsYXkpCiAgICAgbV9kZWZlcnJlZFJlcGFpbnRUaW1lci5z dGFydE9uZVNob3QoZGVsYXkpOwogfQogCi12b2lkIEZyYW1lVmlldzo6Y2hlY2tGbHVzaERlZmVy cmVkUmVwYWludHNBZnRlckxvYWRDb21wbGV0ZSgpCit2b2lkIEZyYW1lVmlldzo6aGFuZGxlTG9h ZENvbXBsZXRlZCgpCiB7CisgICAgLy8gT25jZSBsb2FkaW5nIGhhcyBjb21wbGV0ZWQsIGFsbG93 IGF1dG9TaXplIG9uZSBsYXN0IG9wcG9ydHVuaXR5IHRvCisgICAgLy8gcmVkdWNlIHRoZSBzaXpl IG9mIHRoZSBmcmFtZS4KKyAgICBhdXRvU2l6ZUlmRW5hYmxlZCgpOwogICAgIGlmIChzaG91bGRV c2VMb2FkVGltZURlZmVycmVkUmVwYWludERlbGF5KCkpCiAgICAgICAgIHJldHVybjsKICAgICBt X2RlZmVycmVkUmVwYWludERlbGF5ID0gc19ub3JtYWxEZWZlcnJlZFJlcGFpbnREZWxheTsKQEAg LTI2NTEsMTIgKzI2NTQsMTIgQEAgdm9pZCBGcmFtZVZpZXc6OmF1dG9TaXplSWZFbmFibGVkKCkK ICAgICAgICAgaWYgKG5ld1NpemUgPT0gc2l6ZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0g ICAgICAgIC8vIEF2b2lkIGRvaW5nIHJlc2l6aW5nIHRvIGEgc21hbGxlciBzaXplIHdoaWxlIHRo ZSBmcmFtZSBpcyBsb2FkaW5nIHRvIGF2b2lkIHN3aXRjaGluZyB0byBhIHNtYWxsIHNpemUKLSAg ICAgICAgLy8gZHVyaW5nIGFuIGludGVybWVkaWF0ZSBzdGF0ZSAoYW5kIHRoZW4gY2hhbmdpbmcg YmFjayB0byBhIGJpZ2dlciBzaXplIGFzIHRoZSBsb2FkIHByb2dyZXNzZXMpLgotICAgICAgICBp ZiAoIWZyYW1lKCktPmxvYWRlcigpLT5pc0NvbXBsZXRlKCkgJiYgKG5ld1NpemUuaGVpZ2h0KCkg PCBzaXplLmhlaWdodCgpIHx8IG5ld1NpemUud2lkdGgoKSA8IHNpemUud2lkdGgoKSkpCisgICAg ICAgIC8vIFdoaWxlIGxvYWRpbmcgb25seSBhbGxvdyB0aGUgc2l6ZSB0byBpbmNyZWFzZSAodG8g YXZvaWQgdHdpdGNoaW5nIGR1cmluZyBpbnRlcm1lZGlhdGUgc21hbGxlciBzdGF0ZXMpCisgICAg ICAgIC8vIHVubGVzcyBhdXRvcmVzaXplIGhhcyBqdXN0IGJlZW4gdHVybmVkIG9uIG9yIHRoZSBt YXhpbXVtIHNpemUgaXMgc21hbGxlciB0aGFuIHRoZSBjdXJyZW50IHNpemUuCisgICAgICAgIGlm IChtX2RpZFJ1bkF1dG9zaXplICYmIHNpemUuaGVpZ2h0KCkgPD0gbV9tYXhBdXRvU2l6ZS5oZWln aHQoKSAmJiBzaXplLndpZHRoKCkgPD0gbV9tYXhBdXRvU2l6ZS53aWR0aCgpCisgICAgICAgICAg ICAmJiAhZnJhbWUoKS0+bG9hZGVyKCktPmlzQ29tcGxldGUoKSAmJiAobmV3U2l6ZS5oZWlnaHQo KSA8IHNpemUuaGVpZ2h0KCkgfHwgbmV3U2l6ZS53aWR0aCgpIDwgc2l6ZS53aWR0aCgpKSkKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBlbHNlIGlmIChkb2N1bWVudC0+cHJvY2Vzc2luZ0xv YWRFdmVudCgpKQotICAgICAgICAgICAgbmV3U2l6ZSA9IG5ld1NpemUuZXhwYW5kZWRUbyhzaXpl KTsKKwogICAgICAgICByZXNpemUobmV3U2l6ZS53aWR0aCgpLCBuZXdTaXplLmhlaWdodCgpKTsK ICAgICAgICAgLy8gRm9yY2UgdGhlIHNjcm9sbGJhciBzdGF0ZSB0byBhdm9pZCB0aGUgc2Nyb2xs YmFyIGNvZGUgYWRkaW5nIHRoZW0gYW5kIGNhdXNpbmcgdGhlbSB0byBiZSBuZWVkZWQuIEZvciBl eGFtcGxlLAogICAgICAgICAvLyBhIHZlcnRpY2FsIHNjcm9sbGJhciBtYXkgY2F1c2UgdGV4dCB0 byB3cmFwIGFuZCB0aHVzIGluY3JlYXNlIHRoZSBoZWlnaHQgKHdoaWNoIGlzIHRoZSBvbmx5IHJl YXNvbiB0aGUgc2NvbGxiYXIgaXMgbmVlZGVkKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4 IDU4MzQ1M2IyNjU1MjlkMzAzY2IxMmViYmJhYmQ3MjkyYzhhZTZlYWMuLmE4MDIwZjIzZjFiOGUz OGRkZmZkYjQyZmU4M2Y1N2MyZTljZDAzNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAt MjE2LDcgKzIxNiw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYmVnaW5EZWZlcnJlZFJlcGFpbnRz KCk7CiAgICAgdm9pZCBlbmREZWZlcnJlZFJlcGFpbnRzKCk7Ci0gICAgdm9pZCBjaGVja0ZsdXNo RGVmZXJyZWRSZXBhaW50c0FmdGVyTG9hZENvbXBsZXRlKCk7CisgICAgdm9pZCBoYW5kbGVMb2Fk Q29tcGxldGVkKCk7CiAgICAgdm9pZCBmbHVzaERlZmVycmVkUmVwYWludHMoKTsKICAgICB2b2lk IHN0YXJ0RGVmZXJyZWRSZXBhaW50VGltZXIoZG91YmxlIGRlbGF5KTsKICAgICB2b2lkIHJlc2V0 RGVmZXJyZWRSZXBhaW50RGVsYXkoKTsK