95444 2012-08-30 04:38:49 -0700 [EFL] Simplify FrameLoaderClientEfl by adding a private method. 2012-08-31 04:35:08 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 jinwoo7.song jinwoo7.song cdumez gyuyoung.kim kangil.han lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 708496 0 jinwoo7.song 2012-08-30 04:38:49 -0700 In the FrameLoaderClientEfl, the codes which checks that if current frame is main frame are frequently used. This patch adds a private method and replaces those codes with the method to simplify. 708499 1 161441 jinwoo7.song 2012-08-30 04:44:15 -0700 Created attachment 161441 patch 708512 2 161441 cdumez 2012-08-30 05:06:25 -0700 Comment on attachment 161441 patch View in context: https://bugs.webkit.org/attachment.cgi?id=161441&action=review > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:1057 > +bool FrameLoaderClientEfl::isMainFrame() const Sounds like a good idea but the name is not explicit enough IMO. How about "isLoadingMainFrame()" ? 708514 3 161441 gyuyoung.kim 2012-08-30 05:13:02 -0700 Comment on attachment 161441 patch From the refactoring view, looks good. But, this checking is used by ChromeClientEfl, DumpRenderTreeSupportEfl as well. IMO, it would be good if this patch covers them as well. 708522 4 jinwoo7.song 2012-08-30 05:33:14 -0700 (In reply to comment #2) > (From update of attachment 161441 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161441&action=review > > > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:1057 > > +bool FrameLoaderClientEfl::isMainFrame() const > > Sounds like a good idea but the name is not explicit enough IMO. How about "isLoadingMainFrame()" ? I agree to you and will change the name as your suggestion. Thanks for nice name. 709365 5 jinwoo7.song 2012-08-31 01:17:07 -0700 (In reply to comment #3) > (From update of attachment 161441 [details]) > From the refactoring view, looks good. But, this checking is used by ChromeClientEfl, DumpRenderTreeSupportEfl as well. IMO, it would be good if this patch covers them as well. Okay, I'll do refactoring for the ChromeClientEfl and DumpRenderTreeSupportEfl, too. But as the aspect is different and this patch cannot cover them, I'll cover them in another bug. 709367 6 161635 jinwoo7.song 2012-08-31 01:20:16 -0700 Created attachment 161635 patch. 709375 7 161635 gyuyoung.kim 2012-08-31 01:29:44 -0700 Comment on attachment 161635 patch. View in context: https://bugs.webkit.org/attachment.cgi?id=161635&action=review > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:227 > + bool isLoadingMainFrame() const; Generally, function is placed before member variable. 709382 8 161638 jinwoo7.song 2012-08-31 01:39:54 -0700 Created attachment 161638 patch. 709383 9 jinwoo7.song 2012-08-31 01:40:08 -0700 (In reply to comment #7) > (From update of attachment 161635 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161635&action=review > > > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:227 > > + bool isLoadingMainFrame() const; > > Generally, function is placed before member variable. Done. 709384 10 161638 rakuco 2012-08-31 01:42:05 -0700 Comment on attachment 161638 patch. View in context: https://bugs.webkit.org/attachment.cgi?id=161638&action=review > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:1060 > +bool FrameLoaderClientEfl::isLoadingMainFrame() const > +{ > + return m_frame == ewk_view_frame_main_get(m_view); > +} This looks simple enough to be declared inline. 709400 11 161642 jinwoo7.song 2012-08-31 02:00:08 -0700 Created attachment 161642 patch. 709402 12 jinwoo7.song 2012-08-31 02:01:05 -0700 (In reply to comment #10) > (From update of attachment 161638 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161638&action=review > > > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp:1060 > > +bool FrameLoaderClientEfl::isLoadingMainFrame() const > > +{ > > + return m_frame == ewk_view_frame_main_get(m_view); > > +} > > This looks simple enough to be declared inline. Done. 709460 13 161642 gyuyoung.kim 2012-08-31 03:35:53 -0700 Comment on attachment 161642 patch. View in context: https://bugs.webkit.org/attachment.cgi?id=161642&action=review > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:214 > + bool isLoadingMainFrame() const { return m_frame == ewk_view_frame_main_get(m_view); } Add a new line. 709465 14 161655 jinwoo7.song 2012-08-31 03:56:04 -0700 Created attachment 161655 patch. 709466 15 jinwoo7.song 2012-08-31 03:56:44 -0700 (In reply to comment #13) > (From update of attachment 161642 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161642&action=review > > > Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:214 > > + bool isLoadingMainFrame() const { return m_frame == ewk_view_frame_main_get(m_view); } > > Add a new line. Done. 709485 16 161655 webkit.review.bot 2012-08-31 04:35:03 -0700 Comment on attachment 161655 patch. Clearing flags on attachment: 161655 Committed r127244: <http://trac.webkit.org/changeset/127244> 709486 17 webkit.review.bot 2012-08-31 04:35:08 -0700 All reviewed patches have been landed. Closing bug. 161441 2012-08-30 04:44:15 -0700 2012-08-31 01:20:16 -0700 patch isMainFrame.patch text/plain 4899 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAxNmE4OTFlLi5kMDM3ZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDgtMzAgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIFNpbXBsaWZ5IEZyYW1lTG9hZGVyQ2xpbmV0RWZs IGJ5IGFkZGluZyBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgRnJhbWVMb2FkZXJDbGllbnRFZmwsIHRoZSBjb2Rl cyB3aGljaCBjaGVja3MgdGhhdCAKKyAgICAgICAgaWYgY3VycmVudCBmcmFtZSBpcyBtYWluIGZy YW1lIGFyZSBmcmVxdWVudGx5IHVzZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIHByaXZh dGUgbWV0aG9kIGFuZCByZXBsYWNlcyB0aG9zZSBjb2RlcyAKKyAgICAgICAgd2l0aCB0aGUgbWV0 aG9kIHRvIHNpbXBsaWZ5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRp c3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmlzTWFpbkZyYW1lKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50RWZsLmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudEVmbCk6CisKIDIwMTItMDgt MjkgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50RWZsLmNwcAppbmRleCA1YzIxYjYzLi4xMzI3MWE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRFZmwuY3BwCkBAIC02MTgsNyArNjE4LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQogewogICAgIGV3a19mcmFtZV91 cmlfY2hhbmdlZChtX2ZyYW1lKTsKIAotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWluX2dldCht X3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFpc01haW5GcmFtZSgpKQogICAgICAgICByZXR1 cm47CiAgICAgZXdrX3ZpZXdfdXJpX2NoYW5nZWQobV92aWV3KTsKIH0KQEAgLTYzMSw3ICs2MzEs NyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaFdpbGxDbG9zZSgpCiB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKCkKIHsKICAgICAv LyBJY29uQ29udHJvbGxlciBsb2FkcyBpY29ucyBvbmx5IGZvciB0aGUgbWFpbiBmcmFtZS4KLSAg ICBBU1NFUlQoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSA9PSBtX2ZyYW1lKTsKKyAg ICBBU1NFUlQoaXNNYWluRnJhbWUoKSk7CiAKICAgICBld2tfdmlld19mcmFtZV9tYWluX2ljb25f cmVjZWl2ZWQobV92aWV3KTsKIH0KQEAgLTYzOSw3ICs2MzksNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKCkKIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRFZmw6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQoKQogewogICAgIGV3a19mcmFt ZV9sb2FkX3Byb3Zpc2lvbmFsKG1fZnJhbWUpOwotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWlu X2dldChtX3ZpZXcpID09IG1fZnJhbWUpCisgICAgaWYgKGlzTWFpbkZyYW1lKCkpCiAgICAgICAg IGV3a192aWV3X2xvYWRfcHJvdmlzaW9uYWwobV92aWV3KTsKIH0KIApAQCAtNjUxLDcgKzY1MSw3 IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNv bnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mIHRpCiAgICAgZXdrVGl0bGUuZGlyZWN0aW9uID0gKHRp dGxlLmRpcmVjdGlvbigpID09IExUUikgPyBFV0tfVEVYVF9ESVJFQ1RJT05fTEVGVF9UT19SSUdI VCA6IEVXS19URVhUX0RJUkVDVElPTl9SSUdIVF9UT19MRUZUOwogICAgIGV3a19mcmFtZV90aXRs ZV9zZXQobV9mcmFtZSwgJmV3a1RpdGxlKTsKIAotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWlu X2dldChtX3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFpc01haW5GcmFtZSgpKQogICAgICAg ICByZXR1cm47CiAgICAgZXdrX3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgJmV3a1RpdGxlKTsKIH0K QEAgLTY2Nyw3ICs2NjcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZENvbW1pdExvYWQoKQogewogICAgIGV3a19mcmFtZV91cmlfY2hhbmdlZChtX2ZyYW1lKTsKICAg ICBld2tfZnJhbWVfbG9hZF9jb21taXR0ZWQobV9mcmFtZSk7Ci0gICAgaWYgKGV3a192aWV3X2Zy YW1lX21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkKKyAgICBpZiAoIWlzTWFpbkZyYW1lKCkp CiAgICAgICAgIHJldHVybjsKICAgICBld2tfdmlld190aXRsZV9zZXQobV92aWV3LCAwKTsKICAg ICBld2tfdmlld191cmlfY2hhbmdlZChtX3ZpZXcpOwpAQCAtODQxLDcgKzg0MSw3IEBAIHZvaWQg RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZChjb25z dCBSZXNvdXJjZUVycm9yJiBlCiAgICAgZXJyb3IuZnJhbWUgPSBtX2ZyYW1lOwogCiAgICAgZXdr X2ZyYW1lX2xvYWRfcHJvdmlzaW9uYWxfZmFpbGVkKG1fZnJhbWUsICZlcnJvcik7Ci0gICAgaWYg KGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgPT0gbV9mcmFtZSkKKyAgICBpZiAoaXNN YWluRnJhbWUoKSkKICAgICAgICAgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbF9mYWlsZWQobV92 aWV3LCAmZXJyb3IpOwogCiAgICAgZGlzcGF0Y2hEaWRGYWlsTG9hZChlcnIpOwpAQCAtMTAwNyw3 ICsxMDA3LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkRm9yTmV3UGFnZSgpCiAKICAgICBld2tfZnJhbWVfdmlld19jcmVhdGVfZm9yX3ZpZXcobV9m cmFtZSwgbV92aWV3KTsKIAotICAgIGlmIChtX2ZyYW1lID09IGV3a192aWV3X2ZyYW1lX21haW5f Z2V0KG1fdmlldykpIHsKKyAgICBpZiAoaXNNYWluRnJhbWUoKSkgewogICAgICAgICBld2tfdmll d19mcmFtZV92aWV3X2NyZWF0aW9uX25vdGlmeShtX3ZpZXcpOwogICAgICAgICBld2tfdmlld19m cmFtZV9tYWluX2NsZWFyZWQobV92aWV3KTsKICAgICB9CkBAIC0xMDU0LDQgKzEwNTQsOSBAQCBQ YXNzUmVmUHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpj cmVhdGVOZXR3b3JraW5nQ29udGV4dAogICAgIHJldHVybiBGcmFtZU5ldHdvcmtpbmdDb250ZXh0 RWZsOjpjcmVhdGUoRVdLUHJpdmF0ZTo6Y29yZUZyYW1lKG1fZnJhbWUpLCBtX2ZyYW1lKTsKIH0K IAorYm9vbCBGcmFtZUxvYWRlckNsaWVudEVmbDo6aXNNYWluRnJhbWUoKSBjb25zdAoreworICAg IHJldHVybiBtX2ZyYW1lID09IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldyk7Cit9CisK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50RWZsLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudEVmbC5oCmluZGV4IDYzZDhhNDQuLjA1ZWE0ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmgKKysrIGIv U291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaApA QCAtMjIzLDYgKzIyMyw4IEBAIGNsYXNzIEZyYW1lTG9hZGVyQ2xpZW50RWZsIDogcHVibGljIEZy YW1lTG9hZGVyQ2xpZW50IHsKICAgICAvLyBQbHVnaW4gdmlldyB0byByZWRpcmVjdCBkYXRhIHRv CiAgICAgUGx1Z2luVmlldyogbV9wbHVnaW5WaWV3OwogICAgIGJvb2wgbV9oYXNTZW50UmVzcG9u c2VUb1BsdWdpbjsKKworICAgIGJvb2wgaXNNYWluRnJhbWUoKSBjb25zdDsKIH07CiAKIH0K 161635 2012-08-31 01:20:16 -0700 2012-08-31 01:39:54 -0700 patch. isLoadingMainFrame.patch text/plain 4962 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAxNmE4OTFlLi5kMDM3ZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDgtMzAgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIFNpbXBsaWZ5IEZyYW1lTG9hZGVyQ2xpbmV0RWZs IGJ5IGFkZGluZyBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgRnJhbWVMb2FkZXJDbGllbnRFZmwsIHRoZSBjb2Rl cyB3aGljaCBjaGVja3MgdGhhdCAKKyAgICAgICAgaWYgY3VycmVudCBmcmFtZSBpcyBtYWluIGZy YW1lIGFyZSBmcmVxdWVudGx5IHVzZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIHByaXZh dGUgbWV0aG9kIGFuZCByZXBsYWNlcyB0aG9zZSBjb2RlcyAKKyAgICAgICAgd2l0aCB0aGUgbWV0 aG9kIHRvIHNpbXBsaWZ5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRp c3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmlzTWFpbkZyYW1lKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50RWZsLmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudEVmbCk6CisKIDIwMTItMDgt MjkgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50RWZsLmNwcAppbmRleCA1YzIxYjYzLi41MWM4NWNlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRFZmwuY3BwCkBAIC02MTgsNyArNjE4LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQogewogICAgIGV3a19mcmFtZV91 cmlfY2hhbmdlZChtX2ZyYW1lKTsKIAotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWluX2dldCht X3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAg ICAgcmV0dXJuOwogICAgIGV3a192aWV3X3VyaV9jaGFuZ2VkKG1fdmlldyk7CiB9CkBAIC02MzEs NyArNjMxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hXaWxsQ2xvc2Uo KQogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigpCiB7 CiAgICAgLy8gSWNvbkNvbnRyb2xsZXIgbG9hZHMgaWNvbnMgb25seSBmb3IgdGhlIG1haW4gZnJh bWUuCi0gICAgQVNTRVJUKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgPT0gbV9mcmFt ZSk7CisgICAgQVNTRVJUKGlzTG9hZGluZ01haW5GcmFtZSgpKTsKIAogICAgIGV3a192aWV3X2Zy YW1lX21haW5faWNvbl9yZWNlaXZlZChtX3ZpZXcpOwogfQpAQCAtNjM5LDcgKzYzOSw3IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKQogdm9pZCBG cmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCiB7 CiAgICAgZXdrX2ZyYW1lX2xvYWRfcHJvdmlzaW9uYWwobV9mcmFtZSk7Ci0gICAgaWYgKGV3a192 aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgPT0gbV9mcmFtZSkKKyAgICBpZiAoaXNMb2FkaW5n TWFpbkZyYW1lKCkpCiAgICAgICAgIGV3a192aWV3X2xvYWRfcHJvdmlzaW9uYWwobV92aWV3KTsK IH0KIApAQCAtNjUxLDcgKzY1MSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3Bh dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mIHRpCiAgICAgZXdr VGl0bGUuZGlyZWN0aW9uID0gKHRpdGxlLmRpcmVjdGlvbigpID09IExUUikgPyBFV0tfVEVYVF9E SVJFQ1RJT05fTEVGVF9UT19SSUdIVCA6IEVXS19URVhUX0RJUkVDVElPTl9SSUdIVF9UT19MRUZU OwogICAgIGV3a19mcmFtZV90aXRsZV9zZXQobV9mcmFtZSwgJmV3a1RpdGxlKTsKIAotICAgIGlm IChld2tfdmlld19mcmFtZV9tYWluX2dldChtX3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFp c0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogICAgIGV3a192aWV3X3RpdGxl X3NldChtX3ZpZXcsICZld2tUaXRsZSk7CiB9CkBAIC02NjcsNyArNjY3LDcgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKIHsKICAgICBld2tfZnJh bWVfdXJpX2NoYW5nZWQobV9mcmFtZSk7CiAgICAgZXdrX2ZyYW1lX2xvYWRfY29tbWl0dGVkKG1f ZnJhbWUpOwotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWluX2dldChtX3ZpZXcpICE9IG1fZnJh bWUpCisgICAgaWYgKCFpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogICAg IGV3a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIDApOwogICAgIGV3a192aWV3X3VyaV9jaGFuZ2Vk KG1fdmlldyk7CkBAIC04NDEsNyArODQxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGUKICAg ICBlcnJvci5mcmFtZSA9IG1fZnJhbWU7CiAKICAgICBld2tfZnJhbWVfbG9hZF9wcm92aXNpb25h bF9mYWlsZWQobV9mcmFtZSwgJmVycm9yKTsKLSAgICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9n ZXQobV92aWV3KSA9PSBtX2ZyYW1lKQorICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAg ICAgICAgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbF9mYWlsZWQobV92aWV3LCAmZXJyb3IpOwog CiAgICAgZGlzcGF0Y2hEaWRGYWlsTG9hZChlcnIpOwpAQCAtMTAwNyw3ICsxMDA3LDcgQEAgdm9p ZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgp CiAKICAgICBld2tfZnJhbWVfdmlld19jcmVhdGVfZm9yX3ZpZXcobV9mcmFtZSwgbV92aWV3KTsK IAotICAgIGlmIChtX2ZyYW1lID09IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykpIHsK KyAgICBpZiAoaXNMb2FkaW5nTWFpbkZyYW1lKCkpIHsKICAgICAgICAgZXdrX3ZpZXdfZnJhbWVf dmlld19jcmVhdGlvbl9ub3RpZnkobV92aWV3KTsKICAgICAgICAgZXdrX3ZpZXdfZnJhbWVfbWFp bl9jbGVhcmVkKG1fdmlldyk7CiAgICAgfQpAQCAtMTA1NCw0ICsxMDU0LDkgQEAgUGFzc1JlZlB0 cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBGcmFtZUxvYWRlckNsaWVudEVmbDo6Y3JlYXRlTmV0 d29ya2luZ0NvbnRleHQKICAgICByZXR1cm4gRnJhbWVOZXR3b3JraW5nQ29udGV4dEVmbDo6Y3Jl YXRlKEVXS1ByaXZhdGU6OmNvcmVGcmFtZShtX2ZyYW1lKSwgbV9mcmFtZSk7CiB9CiAKK2Jvb2wg RnJhbWVMb2FkZXJDbGllbnRFZmw6OmlzTG9hZGluZ01haW5GcmFtZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fZnJhbWUgPT0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KTsKK30KKwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRFZmwuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50RWZsLmgKaW5kZXggNjNkOGE0NC4uM2JkY2Y2NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAorKysgYi9T b3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCkBA IC0yMjMsNiArMjIzLDggQEAgY2xhc3MgRnJhbWVMb2FkZXJDbGllbnRFZmwgOiBwdWJsaWMgRnJh bWVMb2FkZXJDbGllbnQgewogICAgIC8vIFBsdWdpbiB2aWV3IHRvIHJlZGlyZWN0IGRhdGEgdG8K ICAgICBQbHVnaW5WaWV3KiBtX3BsdWdpblZpZXc7CiAgICAgYm9vbCBtX2hhc1NlbnRSZXNwb25z ZVRvUGx1Z2luOworCisgICAgYm9vbCBpc0xvYWRpbmdNYWluRnJhbWUoKSBjb25zdDsKIH07CiAK IH0K 161638 2012-08-31 01:39:54 -0700 2012-08-31 02:00:08 -0700 patch. isLoadingMainFrame.patch text/plain 4962 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAxNmE4OTFlLi5kMDM3ZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDgtMzAgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIFNpbXBsaWZ5IEZyYW1lTG9hZGVyQ2xpbmV0RWZs IGJ5IGFkZGluZyBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgRnJhbWVMb2FkZXJDbGllbnRFZmwsIHRoZSBjb2Rl cyB3aGljaCBjaGVja3MgdGhhdCAKKyAgICAgICAgaWYgY3VycmVudCBmcmFtZSBpcyBtYWluIGZy YW1lIGFyZSBmcmVxdWVudGx5IHVzZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIHByaXZh dGUgbWV0aG9kIGFuZCByZXBsYWNlcyB0aG9zZSBjb2RlcyAKKyAgICAgICAgd2l0aCB0aGUgbWV0 aG9kIHRvIHNpbXBsaWZ5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRp c3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmlzTWFpbkZyYW1lKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50RWZsLmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudEVmbCk6CisKIDIwMTItMDgt MjkgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50RWZsLmNwcAppbmRleCA1YzIxYjYzLi41MWM4NWNlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRFZmwuY3BwCkBAIC02MTgsNyArNjE4LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQogewogICAgIGV3a19mcmFtZV91 cmlfY2hhbmdlZChtX2ZyYW1lKTsKIAotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWluX2dldCht X3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAg ICAgcmV0dXJuOwogICAgIGV3a192aWV3X3VyaV9jaGFuZ2VkKG1fdmlldyk7CiB9CkBAIC02MzEs NyArNjMxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hXaWxsQ2xvc2Uo KQogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigpCiB7 CiAgICAgLy8gSWNvbkNvbnRyb2xsZXIgbG9hZHMgaWNvbnMgb25seSBmb3IgdGhlIG1haW4gZnJh bWUuCi0gICAgQVNTRVJUKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgPT0gbV9mcmFt ZSk7CisgICAgQVNTRVJUKGlzTG9hZGluZ01haW5GcmFtZSgpKTsKIAogICAgIGV3a192aWV3X2Zy YW1lX21haW5faWNvbl9yZWNlaXZlZChtX3ZpZXcpOwogfQpAQCAtNjM5LDcgKzYzOSw3IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKQogdm9pZCBG cmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCiB7 CiAgICAgZXdrX2ZyYW1lX2xvYWRfcHJvdmlzaW9uYWwobV9mcmFtZSk7Ci0gICAgaWYgKGV3a192 aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgPT0gbV9mcmFtZSkKKyAgICBpZiAoaXNMb2FkaW5n TWFpbkZyYW1lKCkpCiAgICAgICAgIGV3a192aWV3X2xvYWRfcHJvdmlzaW9uYWwobV92aWV3KTsK IH0KIApAQCAtNjUxLDcgKzY1MSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3Bh dGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mIHRpCiAgICAgZXdr VGl0bGUuZGlyZWN0aW9uID0gKHRpdGxlLmRpcmVjdGlvbigpID09IExUUikgPyBFV0tfVEVYVF9E SVJFQ1RJT05fTEVGVF9UT19SSUdIVCA6IEVXS19URVhUX0RJUkVDVElPTl9SSUdIVF9UT19MRUZU OwogICAgIGV3a19mcmFtZV90aXRsZV9zZXQobV9mcmFtZSwgJmV3a1RpdGxlKTsKIAotICAgIGlm IChld2tfdmlld19mcmFtZV9tYWluX2dldChtX3ZpZXcpICE9IG1fZnJhbWUpCisgICAgaWYgKCFp c0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogICAgIGV3a192aWV3X3RpdGxl X3NldChtX3ZpZXcsICZld2tUaXRsZSk7CiB9CkBAIC02NjcsNyArNjY3LDcgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKIHsKICAgICBld2tfZnJh bWVfdXJpX2NoYW5nZWQobV9mcmFtZSk7CiAgICAgZXdrX2ZyYW1lX2xvYWRfY29tbWl0dGVkKG1f ZnJhbWUpOwotICAgIGlmIChld2tfdmlld19mcmFtZV9tYWluX2dldChtX3ZpZXcpICE9IG1fZnJh bWUpCisgICAgaWYgKCFpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwogICAg IGV3a192aWV3X3RpdGxlX3NldChtX3ZpZXcsIDApOwogICAgIGV3a192aWV3X3VyaV9jaGFuZ2Vk KG1fdmlldyk7CkBAIC04NDEsNyArODQxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGUKICAg ICBlcnJvci5mcmFtZSA9IG1fZnJhbWU7CiAKICAgICBld2tfZnJhbWVfbG9hZF9wcm92aXNpb25h bF9mYWlsZWQobV9mcmFtZSwgJmVycm9yKTsKLSAgICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9n ZXQobV92aWV3KSA9PSBtX2ZyYW1lKQorICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAg ICAgICAgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbF9mYWlsZWQobV92aWV3LCAmZXJyb3IpOwog CiAgICAgZGlzcGF0Y2hEaWRGYWlsTG9hZChlcnIpOwpAQCAtMTAwNyw3ICsxMDA3LDcgQEAgdm9p ZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgp CiAKICAgICBld2tfZnJhbWVfdmlld19jcmVhdGVfZm9yX3ZpZXcobV9mcmFtZSwgbV92aWV3KTsK IAotICAgIGlmIChtX2ZyYW1lID09IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykpIHsK KyAgICBpZiAoaXNMb2FkaW5nTWFpbkZyYW1lKCkpIHsKICAgICAgICAgZXdrX3ZpZXdfZnJhbWVf dmlld19jcmVhdGlvbl9ub3RpZnkobV92aWV3KTsKICAgICAgICAgZXdrX3ZpZXdfZnJhbWVfbWFp bl9jbGVhcmVkKG1fdmlldyk7CiAgICAgfQpAQCAtMTA1NCw0ICsxMDU0LDkgQEAgUGFzc1JlZlB0 cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBGcmFtZUxvYWRlckNsaWVudEVmbDo6Y3JlYXRlTmV0 d29ya2luZ0NvbnRleHQKICAgICByZXR1cm4gRnJhbWVOZXR3b3JraW5nQ29udGV4dEVmbDo6Y3Jl YXRlKEVXS1ByaXZhdGU6OmNvcmVGcmFtZShtX2ZyYW1lKSwgbV9mcmFtZSk7CiB9CiAKK2Jvb2wg RnJhbWVMb2FkZXJDbGllbnRFZmw6OmlzTG9hZGluZ01haW5GcmFtZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fZnJhbWUgPT0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KTsKK30KKwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRFZmwuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50RWZsLmgKaW5kZXggNjNkOGE0NC4uM2JkY2Y2NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAorKysgYi9T b3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCkBA IC0yMjMsNiArMjIzLDggQEAgY2xhc3MgRnJhbWVMb2FkZXJDbGllbnRFZmwgOiBwdWJsaWMgRnJh bWVMb2FkZXJDbGllbnQgewogICAgIC8vIFBsdWdpbiB2aWV3IHRvIHJlZGlyZWN0IGRhdGEgdG8K ICAgICBQbHVnaW5WaWV3KiBtX3BsdWdpblZpZXc7CiAgICAgYm9vbCBtX2hhc1NlbnRSZXNwb25z ZVRvUGx1Z2luOworCisgICAgYm9vbCBpc0xvYWRpbmdNYWluRnJhbWUoKSBjb25zdDsKIH07CiAK IH0K 161642 2012-08-31 02:00:08 -0700 2012-08-31 03:56:04 -0700 patch. isLoadingMainFrame.patch text/plain 4685 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAxNmE4OTFlLi4xYmMwMmU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDgtMzEgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIFNpbXBsaWZ5IEZyYW1lTG9hZGVyQ2xpbmV0RWZs IGJ5IGFkZGluZyBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgRnJhbWVMb2FkZXJDbGllbnRFZmwsIHRoZSBjb2Rl cyB3aGljaCBjaGVja3MgdGhhdCAKKyAgICAgICAgaWYgY3VycmVudCBmcmFtZSBpcyBtYWluIGZy YW1lIGFyZSBmcmVxdWVudGx5IHVzZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIHByaXZh dGUgbWV0aG9kIGFuZCByZXBsYWNlcyB0aG9zZSBjb2RlcyAKKyAgICAgICAgd2l0aCB0aGUgbWV0 aG9kIHRvIHNpbXBsaWZ5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRp c3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Up OgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6aXNMb2FkaW5nTWFpbkZyYW1lKToK KwogMjAxMi0wOC0yOSAgS2FtaWwgQmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSBmb3IgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNz IGZyb20gZmlsZSBVUkxzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCmluZGV4IDVjMjFiNjMuLjkyYWVmNjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEVmbC5jcHAKQEAgLTYxOCw3ICs2MTgsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpCiB7CiAgICAg ZXdrX2ZyYW1lX3VyaV9jaGFuZ2VkKG1fZnJhbWUpOwogCi0gICAgaWYgKGV3a192aWV3X2ZyYW1l X21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkKKyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFt ZSgpKQogICAgICAgICByZXR1cm47CiAgICAgZXdrX3ZpZXdfdXJpX2NoYW5nZWQobV92aWV3KTsK IH0KQEAgLTYzMSw3ICs2MzEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRj aFdpbGxDbG9zZSgpCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2Vp dmVJY29uKCkKIHsKICAgICAvLyBJY29uQ29udHJvbGxlciBsb2FkcyBpY29ucyBvbmx5IGZvciB0 aGUgbWFpbiBmcmFtZS4KLSAgICBBU1NFUlQoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3 KSA9PSBtX2ZyYW1lKTsKKyAgICBBU1NFUlQoaXNMb2FkaW5nTWFpbkZyYW1lKCkpOwogCiAgICAg ZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX3JlY2VpdmVkKG1fdmlldyk7CiB9CkBAIC02MzksNyAr NjM5LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNv bigpCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkKCkKIHsKICAgICBld2tfZnJhbWVfbG9hZF9wcm92aXNpb25hbChtX2ZyYW1lKTsKLSAg ICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSA9PSBtX2ZyYW1lKQorICAgIGlm IChpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25h bChtX3ZpZXcpOwogfQogCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVu dEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYg dGkKICAgICBld2tUaXRsZS5kaXJlY3Rpb24gPSAodGl0bGUuZGlyZWN0aW9uKCkgPT0gTFRSKSA/ IEVXS19URVhUX0RJUkVDVElPTl9MRUZUX1RPX1JJR0hUIDogRVdLX1RFWFRfRElSRUNUSU9OX1JJ R0hUX1RPX0xFRlQ7CiAgICAgZXdrX2ZyYW1lX3RpdGxlX3NldChtX2ZyYW1lLCAmZXdrVGl0bGUp OwogCi0gICAgaWYgKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkK KyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAgICAgZXdr X3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgJmV3a1RpdGxlKTsKIH0KQEAgLTY2Nyw3ICs2NjcsNyBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogewog ICAgIGV3a19mcmFtZV91cmlfY2hhbmdlZChtX2ZyYW1lKTsKICAgICBld2tfZnJhbWVfbG9hZF9j b21taXR0ZWQobV9mcmFtZSk7Ci0gICAgaWYgKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmll dykgIT0gbV9mcmFtZSkKKyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFtZSgpKQogICAgICAgICBy ZXR1cm47CiAgICAgZXdrX3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgMCk7CiAgICAgZXdrX3ZpZXdf dXJpX2NoYW5nZWQobV92aWV3KTsKQEAgLTg0MSw3ICs4NDEsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VF cnJvciYgZQogICAgIGVycm9yLmZyYW1lID0gbV9mcmFtZTsKIAogICAgIGV3a19mcmFtZV9sb2Fk X3Byb3Zpc2lvbmFsX2ZhaWxlZChtX2ZyYW1lLCAmZXJyb3IpOwotICAgIGlmIChld2tfdmlld19m cmFtZV9tYWluX2dldChtX3ZpZXcpID09IG1fZnJhbWUpCisgICAgaWYgKGlzTG9hZGluZ01haW5G cmFtZSgpKQogICAgICAgICBld2tfdmlld19sb2FkX3Byb3Zpc2lvbmFsX2ZhaWxlZChtX3ZpZXcs ICZlcnJvcik7CiAKICAgICBkaXNwYXRjaERpZEZhaWxMb2FkKGVycik7CkBAIC0xMDA3LDcgKzEw MDcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjp0cmFuc2l0aW9uVG9Db21taXR0ZWRG b3JOZXdQYWdlKCkKIAogICAgIGV3a19mcmFtZV92aWV3X2NyZWF0ZV9mb3JfdmlldyhtX2ZyYW1l LCBtX3ZpZXcpOwogCi0gICAgaWYgKG1fZnJhbWUgPT0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQo bV92aWV3KSkgeworICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkgewogICAgICAgICBld2tf dmlld19mcmFtZV92aWV3X2NyZWF0aW9uX25vdGlmeShtX3ZpZXcpOwogICAgICAgICBld2tfdmll d19mcmFtZV9tYWluX2NsZWFyZWQobV92aWV3KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oIGIvU291cmNl L1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAppbmRleCA2 M2Q4YTQ0Li5hNDRkMzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmgKQEAgLTIxMSw2ICsyMTEsNyBAQCBjbGFz cyBGcmFtZUxvYWRlckNsaWVudEVmbCA6IHB1YmxpYyBGcmFtZUxvYWRlckNsaWVudCB7CiAKICAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RnJhbWVOZXR3b3JraW5nQ29udGV4dD4gY3Jl YXRlTmV0d29ya2luZ0NvbnRleHQoKTsKICBwcml2YXRlOgorICAgIGJvb2wgaXNMb2FkaW5nTWFp bkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZSA9PSBld2tfdmlld19mcmFtZV9tYWluX2dl dChtX3ZpZXcpOyB9CiAgICAgRXZhc19PYmplY3QgKm1fdmlldzsKICAgICBFdmFzX09iamVjdCAq bV9mcmFtZTsKIAo= 161655 2012-08-31 03:56:04 -0700 2012-08-31 04:35:03 -0700 patch. isLoadingMainFrame.patch text/plain 4687 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAxNmE4OTFlLi4xYmMwMmU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDgtMzEgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNh bXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIFNpbXBsaWZ5IEZyYW1lTG9hZGVyQ2xpbmV0RWZs IGJ5IGFkZGluZyBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgRnJhbWVMb2FkZXJDbGllbnRFZmwsIHRoZSBjb2Rl cyB3aGljaCBjaGVja3MgdGhhdCAKKyAgICAgICAgaWYgY3VycmVudCBmcmFtZSBpcyBtYWluIGZy YW1lIGFyZSBmcmVxdWVudGx5IHVzZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIHByaXZh dGUgbWV0aG9kIGFuZCByZXBsYWNlcyB0aG9zZSBjb2RlcyAKKyAgICAgICAgd2l0aCB0aGUgbWV0 aG9kIHRvIHNpbXBsaWZ5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRp c3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2Up OgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6aXNMb2FkaW5nTWFpbkZyYW1lKToK KwogMjAxMi0wOC0yOSAgS2FtaWwgQmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSBmb3IgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNz IGZyb20gZmlsZSBVUkxzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCmluZGV4IDVjMjFiNjMuLjkyYWVmNjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEVmbC5jcHAKQEAgLTYxOCw3ICs2MTgsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50RWZsOjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpCiB7CiAgICAg ZXdrX2ZyYW1lX3VyaV9jaGFuZ2VkKG1fZnJhbWUpOwogCi0gICAgaWYgKGV3a192aWV3X2ZyYW1l X21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkKKyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFt ZSgpKQogICAgICAgICByZXR1cm47CiAgICAgZXdrX3ZpZXdfdXJpX2NoYW5nZWQobV92aWV3KTsK IH0KQEAgLTYzMSw3ICs2MzEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRj aFdpbGxDbG9zZSgpCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2Vp dmVJY29uKCkKIHsKICAgICAvLyBJY29uQ29udHJvbGxlciBsb2FkcyBpY29ucyBvbmx5IGZvciB0 aGUgbWFpbiBmcmFtZS4KLSAgICBBU1NFUlQoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3 KSA9PSBtX2ZyYW1lKTsKKyAgICBBU1NFUlQoaXNMb2FkaW5nTWFpbkZyYW1lKCkpOwogCiAgICAg ZXdrX3ZpZXdfZnJhbWVfbWFpbl9pY29uX3JlY2VpdmVkKG1fdmlldyk7CiB9CkBAIC02MzksNyAr NjM5LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNv bigpCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkKCkKIHsKICAgICBld2tfZnJhbWVfbG9hZF9wcm92aXNpb25hbChtX2ZyYW1lKTsKLSAg ICBpZiAoZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KSA9PSBtX2ZyYW1lKQorICAgIGlm IChpc0xvYWRpbmdNYWluRnJhbWUoKSkKICAgICAgICAgZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25h bChtX3ZpZXcpOwogfQogCkBAIC02NTEsNyArNjUxLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVu dEVmbDo6ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYg dGkKICAgICBld2tUaXRsZS5kaXJlY3Rpb24gPSAodGl0bGUuZGlyZWN0aW9uKCkgPT0gTFRSKSA/ IEVXS19URVhUX0RJUkVDVElPTl9MRUZUX1RPX1JJR0hUIDogRVdLX1RFWFRfRElSRUNUSU9OX1JJ R0hUX1RPX0xFRlQ7CiAgICAgZXdrX2ZyYW1lX3RpdGxlX3NldChtX2ZyYW1lLCAmZXdrVGl0bGUp OwogCi0gICAgaWYgKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkK KyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAgICAgZXdr X3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgJmV3a1RpdGxlKTsKIH0KQEAgLTY2Nyw3ICs2NjcsNyBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogewog ICAgIGV3a19mcmFtZV91cmlfY2hhbmdlZChtX2ZyYW1lKTsKICAgICBld2tfZnJhbWVfbG9hZF9j b21taXR0ZWQobV9mcmFtZSk7Ci0gICAgaWYgKGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmll dykgIT0gbV9mcmFtZSkKKyAgICBpZiAoIWlzTG9hZGluZ01haW5GcmFtZSgpKQogICAgICAgICBy ZXR1cm47CiAgICAgZXdrX3ZpZXdfdGl0bGVfc2V0KG1fdmlldywgMCk7CiAgICAgZXdrX3ZpZXdf dXJpX2NoYW5nZWQobV92aWV3KTsKQEAgLTg0MSw3ICs4NDEsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50RWZsOjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VF cnJvciYgZQogICAgIGVycm9yLmZyYW1lID0gbV9mcmFtZTsKIAogICAgIGV3a19mcmFtZV9sb2Fk X3Byb3Zpc2lvbmFsX2ZhaWxlZChtX2ZyYW1lLCAmZXJyb3IpOwotICAgIGlmIChld2tfdmlld19m cmFtZV9tYWluX2dldChtX3ZpZXcpID09IG1fZnJhbWUpCisgICAgaWYgKGlzTG9hZGluZ01haW5G cmFtZSgpKQogICAgICAgICBld2tfdmlld19sb2FkX3Byb3Zpc2lvbmFsX2ZhaWxlZChtX3ZpZXcs ICZlcnJvcik7CiAKICAgICBkaXNwYXRjaERpZEZhaWxMb2FkKGVycik7CkBAIC0xMDA3LDcgKzEw MDcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjp0cmFuc2l0aW9uVG9Db21taXR0ZWRG b3JOZXdQYWdlKCkKIAogICAgIGV3a19mcmFtZV92aWV3X2NyZWF0ZV9mb3JfdmlldyhtX2ZyYW1l LCBtX3ZpZXcpOwogCi0gICAgaWYgKG1fZnJhbWUgPT0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQo bV92aWV3KSkgeworICAgIGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkgewogICAgICAgICBld2tf dmlld19mcmFtZV92aWV3X2NyZWF0aW9uX25vdGlmeShtX3ZpZXcpOwogICAgICAgICBld2tfdmll d19mcmFtZV9tYWluX2NsZWFyZWQobV92aWV3KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oIGIvU291cmNl L1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaAppbmRleCA2 M2Q4YTQ0Li44YzA5NjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmgKQEAgLTIxMSw2ICsyMTEsOCBAQCBjbGFz cyBGcmFtZUxvYWRlckNsaWVudEVmbCA6IHB1YmxpYyBGcmFtZUxvYWRlckNsaWVudCB7CiAKICAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RnJhbWVOZXR3b3JraW5nQ29udGV4dD4gY3Jl YXRlTmV0d29ya2luZ0NvbnRleHQoKTsKICBwcml2YXRlOgorICAgIGJvb2wgaXNMb2FkaW5nTWFp bkZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZSA9PSBld2tfdmlld19mcmFtZV9tYWluX2dl dChtX3ZpZXcpOyB9CisKICAgICBFdmFzX09iamVjdCAqbV92aWV3OwogICAgIEV2YXNfT2JqZWN0 ICptX2ZyYW1lOwogCg==