97049 2012-09-18 15:17:30 -0700 Remove RenderIFrame::updateLogicalHeight and RenderIFrame::updateLogicalWidth 2012-09-19 14:47:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96804 1 tony tony eric kenneth ojan simon.fraser webkit.review.bot oldest_to_newest 723084 0 tony 2012-09-18 15:17:30 -0700 Replace RenderIFrame::updateLogicalHeight with RenderIFrame::computeLogicalHeight 723092 1 164629 tony 2012-09-18 15:28:02 -0700 Created attachment 164629 Patch 723097 2 164629 eric 2012-09-18 15:35:12 -0700 Comment on attachment 164629 Patch LGTM. Do we (I?) need to add a test for changed behavior here? I'm sure I may have gotten this function wrong in my initial implementation. 723103 3 164632 tony 2012-09-18 15:40:23 -0700 Created attachment 164632 Patch 723106 4 tony 2012-09-18 15:42:28 -0700 (In reply to comment #2) > (From update of attachment 164629 [details]) > LGTM. Do we (I?) need to add a test for changed behavior here? I'm sure I may have gotten this function wrong in my initial implementation. I tried, but it involves enabling frame flattening in Chromium DRT. That's easy enough through internal.settings, but it looks like someone already tried this https://bugs.webkit.org/show_bug.cgi?id=87149, which lead me to https://bugs.webkit.org/show_bug.cgi?id=87993 at which point I cried and gave up. 723113 5 eric 2012-09-18 16:01:21 -0700 I see, these are frame-flattening only paths? Should we add a mac-only test? 723119 6 164632 tony 2012-09-18 16:09:31 -0700 Comment on attachment 164632 Patch Oh yeah, I could write a test and verify it using Qt or GTK+. I'll add a test and re-upload. 723121 7 eric 2012-09-18 16:15:07 -0700 I really appreciate your thoroughness. Thanks. 723807 8 164773 tony 2012-09-19 14:04:59 -0700 Created attachment 164773 Patch 723833 9 eric 2012-09-19 14:28:23 -0700 We should CC whoever wrote frame flattening. I don't have enough knowledge to know if this is correct or not. 723835 10 eric 2012-09-19 14:29:38 -0700 I think Kenneth did. 723837 11 164773 eric 2012-09-19 14:31:05 -0700 Comment on attachment 164773 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164773&action=review > Source/WebCore/rendering/RenderIFrame.cpp:-78 > - if (isScrollable || !style()->width().isFixed()) { > - FrameView* view = static_cast<FrameView*>(widget()); I take it we don't need this scrollable-case code? I would not trust the flattening tests to be comprehensive (that isn't to say we regard this code as sacred or shy away from changing it). 723844 12 164773 tony 2012-09-19 14:34:51 -0700 Comment on attachment 164773 Patch Sorry, didn't see Eric's comments. 723845 13 eric 2012-09-19 14:37:27 -0700 Don't let me stand in the way of your commit. :) Just trying to do my reviewing-due-diligence. :) (Also since I was the last to touch this code, I guess I'm supposed to make sure it stays working...) 723846 14 tony 2012-09-19 14:38:57 -0700 (In reply to comment #11) > (From update of attachment 164773 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164773&action=review > > > Source/WebCore/rendering/RenderIFrame.cpp:-78 > > - if (isScrollable || !style()->width().isFixed()) { > > - FrameView* view = static_cast<FrameView*>(widget()); > > I take it we don't need this scrollable-case code? I would not trust the flattening tests to be comprehensive (that isn't to say we regard this code as sacred or shy away from changing it). I believe that is already covered by RenderIFrame::flattenFrame(), which also looks at scrollingMode() and does the isFixed() checks. 723848 15 eric 2012-09-19 14:40:01 -0700 OK. 723852 16 164773 webkit.review.bot 2012-09-19 14:47:18 -0700 Comment on attachment 164773 Patch Clearing flags on attachment: 164773 Committed r129046: <http://trac.webkit.org/changeset/129046> 723853 17 webkit.review.bot 2012-09-19 14:47:22 -0700 All reviewed patches have been landed. Closing bug. 164629 2012-09-18 15:28:02 -0700 2012-09-18 15:40:22 -0700 Patch bug-97049-20120918152729.patch text/plain 3998 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0ZmMyZGExNGRiMTJl MGRiOTZhYTcyNDUyM2UwY2QyMmI4MjAxYS4uOTEzZjFlMTc0ZWFkMDg4NDAwYWM4MjY2Njg0NDI0 MzExODNmYjk3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTE4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBSZW5kZXJJRnJh bWU6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQgd2l0aCBSZW5kZXJJRnJhbWU6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NzA0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgaXMgYW4gaW5jcmVtZW50YWwgc3RlcCBpbiBtYWtpbmcgdXBkYXRlTG9naWNhbEhlaWdodCBu b24tdmlydHVhbCBzbyBpdCdzCisgICAgICAgIHBvc3NpYmxlIHRvIGNhbGwgY29tcHV0ZUxvZ2lj YWxIZWlnaHQgb24gYW55IFJlbmRlckJveCBhbmQgZ2V0IHRoZSByaWdodAorICAgICAgICB2ZXJz aW9uIG9mIHRoZSBmdW5jdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgaXMgYSBy ZWZhY3RvcmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAg KFJlbmRlckJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJJRnJhbWU6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KTogQWxzbyB1 c2UgbG9naWNhbCB2YWx1ZXMgZm9yIGJvcmRlci4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy SUZyYW1lLmg6CisgICAgICAgIChSZW5kZXJJRnJhbWUpOgorCiAyMDEyLTA5LTE4ICBBbmRyZXkg S29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog W0V4dGVuc2lvbnMgQVBJXSBwb3N0cG9uZSByZXF1ZXN0cyB0byBhZGQgZXh0ZW5zaW9ucyB1bnRp bCBleHRlbnNpb24gc2VydmVyIGlzIGluaXRpYWxpemVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKaW5kZXggNDBkZmUxNTM5MTU1MzA0MmNjM2U1Mjc1MDc0MDcwNTdiOTgwZDcxYS4u ODc3YjlkZjAxNDYxYmJjMmVjMjIwMjE2MTY4YzYzNTkyYTc0NzNlZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaApAQCAtMzY2LDcgKzM2Niw3IEBAIHB1YmxpYzoKIAogICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVMb2dpY2FsV2lkdGgoKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl TG9naWNhbEhlaWdodCgpOwotICAgIHZvaWQgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5p dCBsb2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExvZ2ljYWxFeHRlbnRDb21w dXRlZFZhbHVlcyYpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdo dChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNh bEV4dGVudENvbXB1dGVkVmFsdWVzJikgY29uc3Q7CiAKICAgICBSZW5kZXJCb3hSZWdpb25JbmZv KiByZW5kZXJCb3hSZWdpb25JbmZvKFJlbmRlclJlZ2lvbiosIExheW91dFVuaXQgb2Zmc2V0RnJv bUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSwgUmVuZGVyQm94UmVnaW9uSW5mb0ZsYWdzID0gQ2FjaGVS ZW5kZXJCb3hSZWdpb25JbmZvKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhJ blJlZ2lvbihMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmLCBSZW5kZXJSZWdpb24qID0gMCwg TGF5b3V0VW5pdCBvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlID0gWkVST19MQVlPVVRf VU5JVCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SUZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwCmlu ZGV4IGM0NWU4MDU5YTBkOGQyNTRjOWZjMTRiNzlhOTUyODg2YjcyY2ZkMDQuLmQyZWRiYWZlNDhm NzdkZDUzMjg4MzAzM2M3YTFkOGU3NmU1NGFkMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJRnJhbWUuY3BwCkBAIC00Myw5ICs0Myw5IEBAIFJlbmRlcklGcmFtZTo6UmVuZGVy SUZyYW1lKEVsZW1lbnQqIGVsZW1lbnQpCiB7CiB9CiAKLXZvaWQgUmVuZGVySUZyYW1lOjp1cGRh dGVMb2dpY2FsSGVpZ2h0KCkKK3ZvaWQgUmVuZGVySUZyYW1lOjpjb21wdXRlTG9naWNhbEhlaWdo dChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNh bEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKLSAgICBSZW5k ZXJQYXJ0Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KCk7CisgICAgUmVuZGVyUGFydDo6Y29tcHV0ZUxv Z2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCwgbG9naWNhbFRvcCwgY29tcHV0ZWRWYWx1ZXMpOwog ICAgIGlmICghZmxhdHRlbkZyYW1lKCkpCiAgICAgICAgICByZXR1cm47CiAKQEAgLTU2LDggKzU2 LDggQEAgdm9pZCBSZW5kZXJJRnJhbWU6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQogICAgICAgICBG cmFtZVZpZXcqIHZpZXcgPSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPih3aWRnZXQoKSk7CiAgICAg ICAgIGlmICghdmlldykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaW50IGJvcmRlciA9 IGJvcmRlclRvcCgpICsgYm9yZGVyQm90dG9tKCk7Ci0gICAgICAgIHNldEhlaWdodChtYXg8TGF5 b3V0VW5pdD4oaGVpZ2h0KCksIHZpZXctPmNvbnRlbnRzSGVpZ2h0KCkgKyBib3JkZXIpKTsKKyAg ICAgICAgaW50IGJvcmRlciA9IGJvcmRlckJlZm9yZSgpICsgYm9yZGVyQWZ0ZXIoKTsKKyAgICAg ICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBtYXg8TGF5b3V0VW5pdD4oY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQsIHZpZXctPmNvbnRlbnRzSGVpZ2h0KCkgKyBib3JkZXIpOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5oCmluZGV4IDY5ZTQzODIxM2U3 MmM4MmU1MmQ0ZjQ4M2E3NTA5ZTg1YmRiMzA4NjUuLjY0NWQ1ZmI5ODBiYzU5MmU1ZGJkYmJhY2Fj ZDE5ZDI0YzNkMGE0YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmgK QEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVMb2dpY2FsV2lkdGgoKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9n aWNhbEhlaWdodCgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhl aWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9n aWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFs IExheW91dFVuaXQgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgY29uc3QgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCBMYXlvdXRVbml0IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0IE9W RVJSSURFOwo= 164632 2012-09-18 15:40:23 -0700 2012-09-19 14:04:56 -0700 Patch bug-97049-20120918153950.patch text/plain 4102 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0ZmMyZGExNGRiMTJl MGRiOTZhYTcyNDUyM2UwY2QyMmI4MjAxYS4uYTlhYmI3YjY1Yzk5YmY4MDU5MWMzODhlNmViMDQ0 ZjAxNDE5OGZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTE4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBSZW5kZXJJRnJh bWU6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQgd2l0aCBSZW5kZXJJRnJhbWU6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NzA0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgaXMgYW4gaW5jcmVtZW50YWwgc3RlcCBpbiBtYWtpbmcgdXBkYXRlTG9naWNhbEhlaWdodCBu b24tdmlydHVhbCBzbyBpdCdzCisgICAgICAgIHBvc3NpYmxlIHRvIGNhbGwgY29tcHV0ZUxvZ2lj YWxIZWlnaHQgb24gYW55IFJlbmRlckJveCBhbmQgZ2V0IHRoZSByaWdodAorICAgICAgICB2ZXJz aW9uIG9mIHRoZSBmdW5jdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgaXMgYSBy ZWZhY3RvcmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAg KFJlbmRlckJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJJRnJhbWU6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KTogQWxzbyBo YW5kbGUgdmVydGljYWwgd3JpdGluZyBtb2RlIHByb3Blcmx5LgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJJRnJhbWUuaDoKKyAgICAgICAgKFJlbmRlcklGcmFtZSk6CisKIDIwMTItMDktMTgg IEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBbRXh0ZW5zaW9ucyBBUEldIHBvc3Rwb25lIHJlcXVlc3RzIHRvIGFkZCBleHRlbnNp b25zIHVudGlsIGV4dGVuc2lvbiBzZXJ2ZXIgaXMgaW5pdGlhbGl6ZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guaAppbmRleCA0MGRmZTE1MzkxNTUzMDQyY2MzZTUyNzUwNzQwNzA1N2I5 ODBkNzFhLi44NzdiOWRmMDE0NjFiYmMyZWMyMjAyMTYxNjhjNjM1OTJhNzQ3M2VlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC0zNjYsNyArMzY2LDcgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxvZ2ljYWxXaWR0aCgpOwogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChM YXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4 dGVudENvbXB1dGVkVmFsdWVzJikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dp Y2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9w LCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdDsKIAogICAgIFJlbmRlckJveFJl Z2lvbkluZm8qIHJlbmRlckJveFJlZ2lvbkluZm8oUmVuZGVyUmVnaW9uKiwgTGF5b3V0VW5pdCBv ZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlLCBSZW5kZXJCb3hSZWdpb25JbmZvRmxhZ3Mg PSBDYWNoZVJlbmRlckJveFJlZ2lvbkluZm8pIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZUxvZ2lj YWxXaWR0aEluUmVnaW9uKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYsIFJlbmRlclJlZ2lv biogPSAwLCBMYXlvdXRVbml0IG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UgPSBaRVJP X0xBWU9VVF9VTklUKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFt ZS5jcHAKaW5kZXggYzQ1ZTgwNTlhMGQ4ZDI1NGM5ZmMxNGI3OWE5NTI4ODZiNzJjZmQwNC4uYjdm NTUwNmFlNmM5NTgwMDk5MWEwN2QxODY5YjNjNGNjNWRjNmY5OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKQEAgLTQzLDkgKzQzLDkgQEAgUmVuZGVySUZyYW1l OjpSZW5kZXJJRnJhbWUoRWxlbWVudCogZWxlbWVudCkKIHsKIH0KIAotdm9pZCBSZW5kZXJJRnJh bWU6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQordm9pZCBSZW5kZXJJRnJhbWU6OmNvbXB1dGVMb2dp Y2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9w LCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewot ICAgIFJlbmRlclBhcnQ6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKTsKKyAgICBSZW5kZXJQYXJ0Ojpj b21wdXRlTG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0LCBsb2dpY2FsVG9wLCBjb21wdXRlZFZh bHVlcyk7CiAgICAgaWYgKCFmbGF0dGVuRnJhbWUoKSkKICAgICAgICAgIHJldHVybjsKIApAQCAt NTYsOCArNTYsOSBAQCB2b2lkIFJlbmRlcklGcmFtZTo6dXBkYXRlTG9naWNhbEhlaWdodCgpCiAg ICAgICAgIEZyYW1lVmlldyogdmlldyA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHdpZGdldCgp KTsKICAgICAgICAgaWYgKCF2aWV3KQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpbnQg Ym9yZGVyID0gYm9yZGVyVG9wKCkgKyBib3JkZXJCb3R0b20oKTsKLSAgICAgICAgc2V0SGVpZ2h0 KG1heDxMYXlvdXRVbml0PihoZWlnaHQoKSwgdmlldy0+Y29udGVudHNIZWlnaHQoKSArIGJvcmRl cikpOworICAgICAgICBpbnQgYm9yZGVyID0gYm9yZGVyQmVmb3JlKCkgKyBib3JkZXJBZnRlcigp OworICAgICAgICBpbnQgY29udGVudEV4dGVudCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PyB2aWV3LT5jb250ZW50c0hlaWdodCgpIDogdmlldy0+Y29udGVudHNXaWR0aCgpOworICAgICAg ICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IG1heDxMYXlvdXRVbml0Pihjb21wdXRlZFZhbHVl cy5tX2V4dGVudCwgY29udGVudEV4dGVudCArIGJvcmRlcik7CiAgICAgfQogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmgKaW5kZXggNjllNDM4MjEzZTcyYzgyZTUyZDRm NDgzYTc1MDllODViZGIzMDg2NS4uNjQ1ZDVmYjk4MGJjNTkyZTVkYmRiYmFjYWNkMTlkMjRjM2Qw YTRhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuaApAQCAtNDEsNyAr NDEsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxvZ2lj YWxXaWR0aCgpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2FsSGVpZ2h0 KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91 dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50 Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgTGF5b3V0VW5p dCBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFs IExheW91dFVuaXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgY29uc3QgT1ZFUlJJREU7Cg== 164773 2012-09-19 14:04:59 -0700 2012-09-19 14:47:18 -0700 Patch bug-97049-20120919140424.patch text/plain 4740 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0ZmMyZGExNGRiMTJl MGRiOTZhYTcyNDUyM2UwY2QyMmI4MjAxYS4uMDE1ZDBmMmVhZjJmYzczNGZkNTg3ODcwYjk1MDk0 MmU0YjBiMDdmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTE4ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFJlbmRlcklGcmFt ZTo6dXBkYXRlTG9naWNhbEhlaWdodCBhbmQgUmVuZGVySUZyYW1lOjp1cGRhdGVMb2dpY2FsV2lk dGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MDQ5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBp cyBhbiBpbmNyZW1lbnRhbCBzdGVwIGluIG1ha2luZyB1cGRhdGVMb2dpY2FsSGVpZ2h0IG5vbi12 aXJ0dWFsIHNvIGl0J3MKKyAgICAgICAgcG9zc2libGUgdG8gY2FsbCBjb21wdXRlTG9naWNhbEhl aWdodCBvbiBhbnkgUmVuZGVyQm94IGFuZCBnZXQgdGhlIHJpZ2h0CisgICAgICAgIHZlcnNpb24g b2YgdGhlIGZ1bmN0aW9uLgorCisgICAgICAgIFRoZSBjb2RlIGluIFJlbmRlcklGcmFtZTo6bGF5 b3V0IHdhcyBjYWxsaW5nIGZsYXR0ZW5GcmFtZSgpLCB3aGljaCB3b3VsZAorICAgICAgICBxdWVy eSBpdCdzIGJvdW5kaW5nIGJveCBzaXplLiAgU2luY2Ugd2UgaGFkbid0IGRvbmUgYSBsYXlvdXQg eWV0LCB0aGUgc2l6ZQorICAgICAgICBpcyB1bmtub3duLiAgVGhlIGZpeCBpcyB0byBvbmx5IGNh bGwgZmxhdHRlbkZyYW1lKCkgYWZ0ZXIgY2FsbGluZworICAgICAgICB1cGRhdGVMb2dpY2FsV2lk dGggYW5kIHVwZGF0ZUxvZ2ljYWxIZWlnaHQuIFdlIGNhbiB0aGVuIGZpeHVwIHRoZSBzaXplIG9m CisgICAgICAgIHRoZSBpZnJhbWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBleGlzdGluZyB0 ZXN0cyBpbiBmYXN0L2ZyYW1lcy9mbGF0dGVuaW5nIHNob3VsZCBjb250aW51ZSB0byBwYXNzLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJJRnJhbWU6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFt ZS5oOgorICAgICAgICAoUmVuZGVySUZyYW1lKToKKwogMjAxMi0wOS0xOCAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRl bnNpb25zIEFQSV0gcG9zdHBvbmUgcmVxdWVzdHMgdG8gYWRkIGV4dGVuc2lvbnMgdW50aWwgZXh0 ZW5zaW9uIHNlcnZlciBpcyBpbml0aWFsaXplZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySUZyYW1lLmNwcAppbmRleCBjNDVlODA1OWEwZDhkMjU0YzlmYzE0Yjc5YTk1Mjg4NmI3MmNm ZDA0Li42NjQ5ZDU2MTA0MzU4M2ZkYWVkN2FjYzUzOTU1YzE3NzNiNGM1YzZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcApAQCAtNDMsNDYgKzQzLDYgQEAgUmVu ZGVySUZyYW1lOjpSZW5kZXJJRnJhbWUoRWxlbWVudCogZWxlbWVudCkKIHsKIH0KIAotdm9pZCBS ZW5kZXJJRnJhbWU6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQotewotICAgIFJlbmRlclBhcnQ6OnVw ZGF0ZUxvZ2ljYWxIZWlnaHQoKTsKLSAgICBpZiAoIWZsYXR0ZW5GcmFtZSgpKQotICAgICAgICAg cmV0dXJuOwotCi0gICAgSFRNTElGcmFtZUVsZW1lbnQqIGZyYW1lID0gc3RhdGljX2Nhc3Q8SFRN TElGcmFtZUVsZW1lbnQqPihub2RlKCkpOwotICAgIGJvb2wgaXNTY3JvbGxhYmxlID0gZnJhbWUt PnNjcm9sbGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmY7Ci0KLSAgICBpZiAoaXNTY3Jv bGxhYmxlIHx8ICFzdHlsZSgpLT5oZWlnaHQoKS5pc0ZpeGVkKCkpIHsKLSAgICAgICAgRnJhbWVW aWV3KiB2aWV3ID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4od2lkZ2V0KCkpOwotICAgICAgICBp ZiAoIXZpZXcpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGludCBib3JkZXIgPSBib3Jk ZXJUb3AoKSArIGJvcmRlckJvdHRvbSgpOwotICAgICAgICBzZXRIZWlnaHQobWF4PExheW91dFVu aXQ+KGhlaWdodCgpLCB2aWV3LT5jb250ZW50c0hlaWdodCgpICsgYm9yZGVyKSk7Ci0gICAgfQot fQotCi12b2lkIFJlbmRlcklGcmFtZTo6dXBkYXRlTG9naWNhbFdpZHRoKCkKLXsKLSAgICAvLyBX aGVuIHdlJ3JlIHNlYW1sZXNzLCB3ZSBiZWhhdmUgbGlrZSBhIGJsb2NrLiBUaGFua2Z1bGx5IFJl bmRlckJveCBoYXMgYWxsIHRoZSByaWdodCBsb2dpYyBmb3IgdGhpcy4KLSAgICBpZiAoaXNTZWFt bGVzcygpKQotICAgICAgICByZXR1cm4gUmVuZGVyQm94Ojp1cGRhdGVMb2dpY2FsV2lkdGgoKTsK LQotICAgIFJlbmRlclBhcnQ6OnVwZGF0ZUxvZ2ljYWxXaWR0aCgpOwotICAgIGlmICghZmxhdHRl bkZyYW1lKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIEhUTUxJRnJhbWVFbGVtZW50KiBmcmFt ZSA9IHN0YXRpY19jYXN0PEhUTUxJRnJhbWVFbGVtZW50Kj4obm9kZSgpKTsKLSAgICBib29sIGlz U2Nyb2xsYWJsZSA9IGZyYW1lLT5zY3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2Zm OwotCi0gICAgaWYgKGlzU2Nyb2xsYWJsZSB8fCAhc3R5bGUoKS0+d2lkdGgoKS5pc0ZpeGVkKCkp IHsKLSAgICAgICAgRnJhbWVWaWV3KiB2aWV3ID0gc3RhdGljX2Nhc3Q8RnJhbWVWaWV3Kj4od2lk Z2V0KCkpOwotICAgICAgICBpZiAoIXZpZXcpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IExheW91dFVuaXQgYm9yZGVyID0gYm9yZGVyTGVmdCgpICsgYm9yZGVyUmlnaHQoKTsKLSAgICAg ICAgc2V0V2lkdGgobWF4PExheW91dFVuaXQ+KHdpZHRoKCksIHZpZXctPmNvbnRlbnRzV2lkdGgo KSArIGJvcmRlcikpOwotICAgIH0KLX0KLQogYm9vbCBSZW5kZXJJRnJhbWU6OnNob3VsZENvbXB1 dGVTaXplQXNSZXBsYWNlZCgpIGNvbnN0CiB7CiAgICAgLy8gV2hlbiB3ZSdyZSBzZWFtbGVzcywg d2UgdXNlIG5vcm1hbCBibG9jay9ib3ggc2l6aW5nIGNvZGUgZXhjZXB0IHdoZW4gaW5saW5lLgpA QCAtMTg5LDE5ICsxNDksMTYgQEAgdm9pZCBSZW5kZXJJRnJhbWU6OmxheW91dCgpCiB7CiAgICAg QVNTRVJUKG5lZWRzTGF5b3V0KCkpOwogCi0gICAgaWYgKGZsYXR0ZW5GcmFtZSgpKSB7Ci0gICAg ICAgIFJlbmRlclBhcnQ6OnVwZGF0ZUxvZ2ljYWxXaWR0aCgpOwotICAgICAgICBSZW5kZXJQYXJ0 Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgIGxheW91dFdpdGhGbGF0dGVuaW5nKHN0 eWxlKCktPndpZHRoKCkuaXNGaXhlZCgpLCBzdHlsZSgpLT5oZWlnaHQoKS5pc0ZpeGVkKCkpOwot ICAgICAgICAvLyBGSVhNRTogSXMgZWFybHkgcmV0dXJuIHJlYWxseSBPSyBoZXJlPyBXaGF0IGFi b3V0IHRyYW5zZm9ybS9vdmVyZmxvdyBjb2RlIGJlbG93PwotICAgICAgICByZXR1cm47Ci0gICAg fSBlbHNlIGlmIChpc1NlYW1sZXNzKCkpIHsKKyAgICBpZiAoaXNTZWFtbGVzcygpKSB7CiAgICAg ICAgIGxheW91dFNlYW1sZXNzbHkoKTsKICAgICAgICAgLy8gRG8gbm90IHJldHVybiBzbyBhcyB0 byBzaGFyZSB0aGUgbGF5ZXIgYW5kIG92ZXJmbG93IHVwZGF0ZXMgYmVsb3cuCiAgICAgfSBlbHNl IHsKICAgICAgICAgdXBkYXRlTG9naWNhbFdpZHRoKCk7CiAgICAgICAgIC8vIE5vIGtpZHMgdG8g bGF5b3V0IGFzIGEgcmVwbGFjZWQgZWxlbWVudC4KICAgICAgICAgdXBkYXRlTG9naWNhbEhlaWdo dCgpOworCisgICAgICAgIGlmIChmbGF0dGVuRnJhbWUoKSkKKyAgICAgICAgICAgIGxheW91dFdp dGhGbGF0dGVuaW5nKHN0eWxlKCktPndpZHRoKCkuaXNGaXhlZCgpLCBzdHlsZSgpLT5oZWlnaHQo KS5pc0ZpeGVkKCkpOwogICAgIH0KIAogICAgIG1fb3ZlcmZsb3cuY2xlYXIoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuaAppbmRleCA2OWU0MzgyMTNlNzJjODJlNTJkNGY0 ODNhNzUwOWU4NWJkYjMwODY1Li43NDE2M2ViNzk1ZGE3NmZiZDQ3ZjdkN2Y3NzA3N2FiODRhODUw YThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5oCkBAIC00MCw5ICs0 MCw2IEBAIHB1YmxpYzoKICAgICBib29sIGlzU2VhbWxlc3MoKSBjb25zdDsKIAogcHJpdmF0ZToK LSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNhbFdpZHRoKCkgT1ZFUlJJREU7Ci0gICAgdmly dHVhbCB2b2lkIHVwZGF0ZUxvZ2ljYWxIZWlnaHQoKSBPVkVSUklERTsKLQogICAgIHZpcnR1YWwg TGF5b3V0VW5pdCBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSBjb25zdCBPVkVSUklERTsKICAg ICB2aXJ0dWFsIExheW91dFVuaXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgY29uc3QgT1ZF UlJJREU7CiAK