48440 2010-10-27 10:42:07 -0700 [Qt] QtTestBrowser: User input lost when toggling use of QGraphicsView 2011-01-27 16:22:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Minor --- 1 dinu.jacob dinu.jacob commit-queue cshu kenneth tonikitoo webkit.review.bot oldest_to_newest 300354 0 dinu.jacob 2010-10-27 10:42:07 -0700 1. Open a launcher window 2. Type in google.com 3. Select Develop->QGraphicsView-> Toggle use of QGraphicsView Result: View changed but 'google.com' is removed from the url text box. Related use case: After loading a page, and the user enters a new url and then changes to graphicsview, old page is reloaded and not the new url entered by the user. 301036 1 72182 dinu.jacob 2010-10-28 06:45:23 -0700 Created attachment 72182 Patch 301048 2 72182 kling 2010-10-28 07:00:09 -0700 Comment on attachment 72182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72182&action=review First off, this behavior sounds a bit strange behavior to me, shouldn't we load what's currently loaded, and simply preserve the text in the location edit? > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > + QUrl url = getAddressUrl(); Extra space after = > WebKitTools/QtTestBrowser/mainwindow.h:56 > + QString getAddressUrl() const; Name should be "addressUrl" 301052 3 dinu.jacob 2010-10-28 07:08:50 -0700 (In reply to comment #2) > (From update of attachment 72182 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72182&action=review > > First off, this behavior sounds a bit strange behavior to me, shouldn't we load what's currently loaded, and simply preserve the text in the location edit? > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > > + QUrl url = getAddressUrl(); > > Extra space after = > > > WebKitTools/QtTestBrowser/mainwindow.h:56 > > + QString getAddressUrl() const; > > Name should be "addressUrl" As the page was being loaded when the view is toggled, I used the user input rather than the page to avoid having to request the page to be loaded again. If the current page is loaded and the user input is preserved, it would be confusing as there is indication of a page being loaded but that doesn't match the user input. 301110 4 72196 dinu.jacob 2010-10-28 09:33:38 -0700 Created attachment 72196 Patch with review comment changes 301112 5 webkit.review.bot 2010-10-28 09:36:22 -0700 Attachment 72196 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/QtTestBrowser/launcherwindow.cpp:100: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 301113 6 72198 dinu.jacob 2010-10-28 09:39:08 -0700 Created attachment 72198 Style fixed 301115 7 72198 kenneth 2010-10-28 09:41:38 -0700 Comment on attachment 72198 Style fixed View in context: https://bugs.webkit.org/attachment.cgi?id=72198&action=review > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > + QUrl url = addressUrl(); In your code below (impl of addressUrl) you return a string, which you convert into an QUrl here. > WebKitTools/QtTestBrowser/launcherwindow.cpp:143 > + load(url.toString()); Here you convert it into a string again! > WebKitTools/QtTestBrowser/mainwindow.cpp:120 > +QString MainWindow::addressUrl() const > +{ > + return urlEdit->text(); > +} This is what I mean! 301119 8 dinu.jacob 2010-10-28 09:52:18 -0700 (In reply to comment #7) > (From update of attachment 72198 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72198&action=review > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > > + QUrl url = addressUrl(); > > In your code below (impl of addressUrl) you return a string, which you convert into an QUrl here. > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:143 > > + load(url.toString()); > > Here you convert it into a string again! > > > WebKitTools/QtTestBrowser/mainwindow.cpp:120 > > +QString MainWindow::addressUrl() const > > +{ > > + return urlEdit->text(); > > +} > > This is what I mean! load is an overloaded function. I want the one that takes in a string so that the appropriate scheme is added which is done by the version that takes in a string. I convert it into QUrl to check whether it is valid before actually loading it. What can I do differently? 301143 9 kenneth 2010-10-28 10:22:03 -0700 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 72198 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=72198&action=review > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > > > + QUrl url = addressUrl(); > > > > In your code below (impl of addressUrl) you return a string, which you convert into an QUrl here. > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:143 > > > + load(url.toString()); > > > > Here you convert it into a string again! > > > > > WebKitTools/QtTestBrowser/mainwindow.cpp:120 > > > +QString MainWindow::addressUrl() const > > > +{ > > > + return urlEdit->text(); > > > +} > > > > This is what I mean! > > load is an overloaded function. I want the one that takes in a string so that the appropriate scheme is added which is done by the version that takes in a string. I convert it into QUrl to check whether it is valid before actually loading it. What can I do differently? We have a method that handles this QUrl::fromUserInput(). I'm pretty sure we are already using this in the test browser. At the end, WebKit expects a QUrl. 301154 10 tonikitoo 2010-10-28 10:42:00 -0700 (In reply to comment #0) > 1. Open a launcher window > 2. Type in google.com > 3. Select Develop->QGraphicsView-> Toggle use of QGraphicsView > > Result: View changed but 'google.com' is removed from the url text box. > > Related use case: After loading a page, and the user enters a new url and then changes to graphicsview, old page is reloaded and not the new url entered by the user. I can not reproduce it on trunk. Are you running 2.1 branch? 301163 11 dinu.jacob 2010-10-28 10:57:09 -0700 (In reply to comment #10) > (In reply to comment #0) > > 1. Open a launcher window > > 2. Type in google.com > > 3. Select Develop->QGraphicsView-> Toggle use of QGraphicsView > > > > Result: View changed but 'google.com' is removed from the url text box. > > > > Related use case: After loading a page, and the user enters a new url and then changes to graphicsview, old page is reloaded and not the new url entered by the user. > > I can not reproduce it on trunk. Are you running 2.1 branch? No, I am on trunk. 301169 12 dinu.jacob 2010-10-28 11:03:21 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > (From update of attachment 72198 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=72198&action=review > > > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > > > > + QUrl url = addressUrl(); > > > > > > In your code below (impl of addressUrl) you return a string, which you convert into an QUrl here. > > > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:143 > > > > + load(url.toString()); > > > > > > Here you convert it into a string again! > > > > > > > WebKitTools/QtTestBrowser/mainwindow.cpp:120 > > > > +QString MainWindow::addressUrl() const > > > > +{ > > > > + return urlEdit->text(); > > > > +} > > > > > > This is what I mean! > > > > load is an overloaded function. I want the one that takes in a string so that the appropriate scheme is added which is done by the version that takes in a string. I convert it into QUrl to check whether it is valid before actually loading it. What can I do differently? > > We have a method that handles this QUrl::fromUserInput(). I'm pretty sure we are already using this in the test browser. At the end, WebKit expects a QUrl. Yes, that is what MainWindow::load(const QString& url) is using too but in addition to that it it also converts relative file path to absolute file path and I am just continuing to use that. 301280 13 dinu.jacob 2010-10-28 13:23:19 -0700 (In reply to comment #12) > (In reply to comment #9) > > (In reply to comment #8) > > > (In reply to comment #7) > > > > (From update of attachment 72198 [details] [details] [details] [details]) > > > > View in context: https://bugs.webkit.org/attachment.cgi?id=72198&action=review > > > > > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:97 > > > > > + QUrl url = addressUrl(); > > > > > > > > In your code below (impl of addressUrl) you return a string, which you convert into an QUrl here. > > > > > > > > > WebKitTools/QtTestBrowser/launcherwindow.cpp:143 > > > > > + load(url.toString()); > > > > > > > > Here you convert it into a string again! > > > > > > > > > WebKitTools/QtTestBrowser/mainwindow.cpp:120 > > > > > +QString MainWindow::addressUrl() const > > > > > +{ > > > > > + return urlEdit->text(); > > > > > +} > > > > > > > > This is what I mean! > > > > > > load is an overloaded function. I want the one that takes in a string so that the appropriate scheme is added which is done by the version that takes in a string. I convert it into QUrl to check whether it is valid before actually loading it. What can I do differently? > > > > We have a method that handles this QUrl::fromUserInput(). I'm pretty sure we are already using this in the test browser. At the end, WebKit expects a QUrl. > > Yes, that is what MainWindow::load(const QString& url) is using too but in addition to that it it also converts relative file path to absolute file path and I am just continuing to use that. So to use the overloaded load method that takes in a QString and to check whether the url is valid before calling load, I need the conversion from Url to String again. 301896 14 72352 dinu.jacob 2010-10-29 11:22:13 -0700 Created attachment 72352 Patch with review comment changes Changed logic to avoid converting to QString->QUrl->QString. Also, caling MainWindow::load instead of page()->mainFrame()->load to set the input field value that would otherwise be removed when toggling view (and set only later) 301900 15 webkit.review.bot 2010-10-29 11:25:53 -0700 Attachment 72352 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/QtTestBrowser/launcherwindow.cpp:98: Extra space before ) in if [whitespace/parens] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 301925 16 72359 dinu.jacob 2010-10-29 11:58:57 -0700 Created attachment 72359 With style fix 301929 17 tonikitoo 2010-10-29 12:02:22 -0700 I am on trunk link, running qt 4.7 and am not able to run into this bug. Could you please help me to reproduce it then I can help reviewing and testing. 301931 18 tonikitoo 2010-10-29 12:03:09 -0700 (In reply to comment #17) > I am on trunk link, link = linux 302727 19 dinu.jacob 2010-11-01 08:55:23 -0700 (In reply to comment #17) > I am on trunk link, running qt 4.7 and am not able to run into this bug. > > Could you please help me to reproduce it then I can help reviewing and testing. Provided clarification to Antonio on IRC 303228 20 72359 tonikitoo 2010-11-01 22:53:08 -0700 Comment on attachment 72359 With style fix Before reviewing, with this patch we would end up with the following behavior: 1) load qttestbrowser 2) type 'google.com' in the urlbar (do NOT press ENTER or any other action that triggers loading) 3) switch to graphicsview mode. result: google.com is loaded. do we want this, or we want to keep the loaded current URL (about:blank in this case) and keep the current entered content in the urlbar ('google.com' in this case)? 303353 21 dinu.jacob 2010-11-02 07:47:19 -0700 (In reply to comment #20) > (From update of attachment 72359 [details]) > Before reviewing, with this patch we would end up with the following behavior: > > 1) load qttestbrowser > 2) type 'google.com' in the urlbar > (do NOT press ENTER or any other action that triggers loading) > 3) switch to graphicsview mode. > result: google.com is loaded. > > do we want this, or we want to keep the loaded current URL (about:blank in this case) and keep the current entered content in the urlbar ('google.com' in this case)? I used the entered url to avoid doing another load (if a page has already been loaded, it will re-load the page and then the user has to press ENTER key to load the new page again). Also, the url displayed will not be consistent with the page loaded. 304125 22 tonikitoo 2010-11-03 10:50:55 -0700 (In reply to comment #21) > (In reply to comment #20) > > (From update of attachment 72359 [details] [details]) > > Before reviewing, with this patch we would end up with the following behavior: > > > > 1) load qttestbrowser > > 2) type 'google.com' in the urlbar > > (do NOT press ENTER or any other action that triggers loading) > > 3) switch to graphicsview mode. > > result: google.com is loaded. > > > > do we want this, or we want to keep the loaded current URL (about:blank in this case) and keep the current entered content in the urlbar ('google.com' in this case)? > > I used the entered url to avoid doing another load (if a page has already been loaded, it will re-load the page and then the user has to press ENTER key to load the new page again). Also, the url displayed will not be consistent with the page loaded. Kenneth, KLing? 335371 23 79184 dinu.jacob 2011-01-17 10:14:19 -0800 Created attachment 79184 Preserve user input 335373 24 webkit.review.bot 2011-01-17 10:16:00 -0800 Attachment 79184 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/QtTestBrowser/la..." exit_code: 1 Tools/QtTestBrowser/launcherwindow.cpp:143: One line control clauses should not use braces. [whitespace/braces] [4] Tools/QtTestBrowser/launcherwindow.cpp:144: An else should appear on the same line as the preceding } [whitespace/newline] [4] Tools/QtTestBrowser/launcherwindow.cpp:536: Extra space before ) in if [whitespace/parens] [5] Tools/QtTestBrowser/launcherwindow.cpp:538: One line control clauses should not use braces. [whitespace/braces] [4] Tools/QtTestBrowser/launcherwindow.cpp:539: An else should appear on the same line as the preceding } [whitespace/newline] [4] Total errors found: 5 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 335375 25 dinu.jacob 2011-01-17 10:17:27 -0800 New changes made where the current page is loaded but preserve the user input, based on comments received. 335382 26 79186 dinu.jacob 2011-01-17 10:23:26 -0800 Created attachment 79186 With style fix 335384 27 79186 tonikitoo 2011-01-17 10:27:02 -0800 Comment on attachment 79186 With style fix View in context: https://bugs.webkit.org/attachment.cgi?id=79186&action=review > Tools/QtTestBrowser/launcherwindow.h:210 > + QString inputUrl; m_inputUrl as the other? 335389 28 79187 dinu.jacob 2011-01-17 10:32:47 -0800 Created attachment 79187 Updated with review comment 340557 29 79187 kling 2011-01-26 16:20:44 -0800 Comment on attachment 79187 Updated with review comment r=me 341117 30 79187 commit-queue 2011-01-27 16:22:03 -0800 Comment on attachment 79187 Updated with review comment Clearing flags on attachment: 79187 Committed r76860: <http://trac.webkit.org/changeset/76860> 341118 31 commit-queue 2011-01-27 16:22:08 -0800 All reviewed patches have been landed. Closing bug. 72182 2010-10-28 06:45:23 -0700 2010-10-29 11:22:13 -0700 Patch 48440.patch text/plain 2591 dinu.jacob SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwNzcyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTAtMjggIEphY29iIERpbnUgIDxkaW51 LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFF0VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2ds aW5nIHVzZSBvZiBRR3JhcGhpY3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODQ0MAorCisgICAgICAgIFVzZSB1cmwgaW4gdGhlIGVkaXRvciBp bnN0ZWFkIG9mIHRoZSBmcmFtZSB1cmwgdG8gbG9hZCBwYWdlIGFmdGVyIHRvZ2dsaW5nLgorCisg ICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHA6CisgICAgICAgIChMYXVu Y2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFp bndpbmRvdy5jcHA6CisgICAgICAgIChNYWluV2luZG93OjpnZXRBZGRyZXNzVXJsKToKKyAgICAg ICAgKiBRdFRlc3RCcm93c2VyL21haW53aW5kb3cuaDoKKwogMjAxMC0xMC0yOCAgS2ltbW8gS2lu bnVuZW4gIDxraW1tb2tAaWtpLmZpPgogCiAgICAgICAgIEFkZGluZyBteXNlbGYgYXMgYSBjb21t aXR0ZXIuCkluZGV4OiBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93 LmNwcAkocmV2aXNpb24gNzA3NjgpCisrKyBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL2xhdW5j aGVyd2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTQsNyArOTQsNyBAQCB2b2lkIExhdW5j aGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiB7CiAgICAgZGVsZXRlIG1fdmlldzsKIAotICAg IFFVcmwgdXJsID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+dXJsKCk7CisgICAgUVVybCB1cmwgPSAg Z2V0QWRkcmVzc1VybCgpOwogICAgIHNldFBhZ2UobmV3IFdlYlBhZ2UodGhpcykpOwogCiAgICAg UVNwbGl0dGVyKiBzcGxpdHRlciA9IHN0YXRpY19jYXN0PFFTcGxpdHRlcio+KGNlbnRyYWxXaWRn ZXQoKSk7CkBAIC0xMzcsNyArMTM3LDcgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6 ZVZpZXcoKQogICAgICAgICBwYWdlKCktPnNldFByb3BlcnR5KCJfcV93ZWJJbnNwZWN0b3JTZXJ2 ZXJQb3J0IiwgbV93aW5kb3dPcHRpb25zLnJlbW90ZUluc3BlY3RvclBvcnQpOwogCiAgICAgaWYg KHVybC5pc1ZhbGlkKCkpCi0gICAgICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsK KyAgICAgICAgbG9hZCh1cmwudG9TdHJpbmcoKSk7CiB9CiAKIHZvaWQgTGF1bmNoZXJXaW5kb3c6 OmFwcGx5UHJlZnMoKQpJbmRleDogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cu Y3BwCShyZXZpc2lvbiA3MDc2OCkKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbndp bmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw2ICsxMTQsMTEgQEAgV2ViUGFnZSogTWFp bldpbmRvdzo6cGFnZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fcGFnZTsKIH0KIAorUVN0cmluZyBN YWluV2luZG93OjpnZXRBZGRyZXNzVXJsKCkgY29uc3QKK3sKKyAgICByZXR1cm4gdXJsRWRpdC0+ dGV4dCgpOworfQorCiB2b2lkIE1haW5XaW5kb3c6OnNldEFkZHJlc3NVcmwoY29uc3QgUVVybCYg dXJsKQogewogICAgIHVybEVkaXQtPnNldFRleHQodXJsLnRvU3RyaW5nKFFVcmw6OlJlbW92ZVVz ZXJJbmZvKSk7CkluZGV4OiBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAkocmV2 aXNpb24gNzA3NjgpCisrKyBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAko d29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsOSBAQCBwdWJsaWM6CiAgICAgV2ViUGFnZSogcGFn ZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0UGFnZShXZWJQYWdlKik7CiAKK3Byb3RlY3RlZDoKKyAg ICBRU3RyaW5nIGdldEFkZHJlc3NVcmwoKSBjb25zdDsKKwogcHJvdGVjdGVkIHNsb3RzOgogICAg IHZvaWQgc2V0QWRkcmVzc1VybChjb25zdCBRU3RyaW5nJiB1cmwpOwogICAgIHZvaWQgc2V0QWRk cmVzc1VybChjb25zdCBRVXJsJiB1cmwpOwo= 72196 2010-10-28 09:33:38 -0700 2010-10-28 09:38:35 -0700 Patch with review comment changes 48440.patch text/plain 2722 dinu.jacob SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwNzgxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMjggIEphY29iIERpbnUgIDxkaW51 LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFF0VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2ds aW5nIHVzZSBvZiBRR3JhcGhpY3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODQ0MAorCisgICAgICAgIFVzZSBmcmFtZSB1cmwgb25seSBpZiBh ZGRyZXNzIHVybCBpcyBlbXB0eSB0byBsb2FkIHBhZ2UgYWZ0ZXIgdG9nZ2xpbmcgCisgICAgICAg IHVzZSBvZiBHcmFwaGljc1ZpZXcKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3 aW5kb3cuY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KToKKyAg ICAgICAgKiBRdFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRv dzo6YWRkcmVzc1VybCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci9tYWlud2luZG93Lmg6CisK IDIwMTAtMTAtMjggIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIERv bid0IGFwcGVuZCBhIG5ld2xpbmUgdG8gdGhlIHRlc3Qgb3V0cHV0IGlmIHRoZSBmcmFtZSBoYXMg bm8gZG9jdW1lbnQKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5k b3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3 aW5kb3cuY3BwCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCwxMSBAQCB2b2lk IExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiB7CiAgICAgZGVsZXRlIG1fdmlldzsK IAotICAgIFFVcmwgdXJsID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+dXJsKCk7CisgICAgUVVybCB1 cmwgPSBhZGRyZXNzVXJsKCk7CisgICAgaWYgKHVybC5pc0VtcHR5KCkpIHsKKyAgICAgICAgdXJs ID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+dXJsKCk7CisgICAgfQorCiAgICAgc2V0UGFnZShuZXcg V2ViUGFnZSh0aGlzKSk7CiAKICAgICBRU3BsaXR0ZXIqIHNwbGl0dGVyID0gc3RhdGljX2Nhc3Q8 UVNwbGl0dGVyKj4oY2VudHJhbFdpZGdldCgpKTsKQEAgLTEzNyw3ICsxNDEsNyBAQCB2b2lkIExh dW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiAgICAgICAgIHBhZ2UoKS0+c2V0UHJvcGVy dHkoIl9xX3dlYkluc3BlY3RvclNlcnZlclBvcnQiLCBtX3dpbmRvd09wdGlvbnMucmVtb3RlSW5z cGVjdG9yUG9ydCk7CiAKICAgICBpZiAodXJsLmlzVmFsaWQoKSkKLSAgICAgICAgcGFnZSgpLT5t YWluRnJhbWUoKS0+bG9hZCh1cmwpOworICAgICAgICBsb2FkKHVybC50b1N0cmluZygpKTsKIH0K IAogdm9pZCBMYXVuY2hlcldpbmRvdzo6YXBwbHlQcmVmcygpCkluZGV4OiBXZWJLaXRUb29scy9R dFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0 VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHJldmlzaW9uIDcwNzc2KQorKysgV2ViS2l0VG9v bHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYg KzExNCwxMSBAQCBXZWJQYWdlKiBNYWluV2luZG93OjpwYWdlKCkgY29uc3QKICAgICByZXR1cm4g bV9wYWdlOwogfQogCitRU3RyaW5nIE1haW5XaW5kb3c6OmFkZHJlc3NVcmwoKSBjb25zdAorewor ICAgIHJldHVybiB1cmxFZGl0LT50ZXh0KCk7Cit9CisKIHZvaWQgTWFpbldpbmRvdzo6c2V0QWRk cmVzc1VybChjb25zdCBRVXJsJiB1cmwpCiB7CiAgICAgdXJsRWRpdC0+c2V0VGV4dCh1cmwudG9T dHJpbmcoUVVybDo6UmVtb3ZlVXNlckluZm8pKTsKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJy b3dzZXIvbWFpbndpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dz ZXIvbWFpbndpbmRvdy5oCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJy b3dzZXIvbWFpbndpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1Miw5IEBAIHB1Ymxp YzoKICAgICBXZWJQYWdlKiBwYWdlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRQYWdlKFdlYlBhZ2Uq KTsKIAorcHJvdGVjdGVkOgorICAgIFFTdHJpbmcgYWRkcmVzc1VybCgpIGNvbnN0OworCiBwcm90 ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzZXRBZGRyZXNzVXJsKGNvbnN0IFFTdHJpbmcmIHVybCk7 CiAgICAgdm9pZCBzZXRBZGRyZXNzVXJsKGNvbnN0IFFVcmwmIHVybCk7Cg== 72198 2010-10-28 09:39:08 -0700 2010-10-29 11:22:13 -0700 Style fixed 48440.patch text/plain 2714 dinu.jacob SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwNzgxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMjggIEphY29iIERpbnUgIDxkaW51 LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFF0VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2ds aW5nIHVzZSBvZiBRR3JhcGhpY3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODQ0MAorCisgICAgICAgIFVzZSBmcmFtZSB1cmwgb25seSBpZiBh ZGRyZXNzIHVybCBpcyBlbXB0eSB0byBsb2FkIHBhZ2UgYWZ0ZXIgdG9nZ2xpbmcgCisgICAgICAg IHVzZSBvZiBHcmFwaGljc1ZpZXcKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3 aW5kb3cuY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KToKKyAg ICAgICAgKiBRdFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRv dzo6YWRkcmVzc1VybCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci9tYWlud2luZG93Lmg6CisK IDIwMTAtMTAtMjggIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIERv bid0IGFwcGVuZCBhIG5ld2xpbmUgdG8gdGhlIHRlc3Qgb3V0cHV0IGlmIHRoZSBmcmFtZSBoYXMg bm8gZG9jdW1lbnQKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5k b3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3 aW5kb3cuY3BwCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCwxMCBAQCB2b2lk IExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiB7CiAgICAgZGVsZXRlIG1fdmlldzsK IAotICAgIFFVcmwgdXJsID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+dXJsKCk7CisgICAgUVVybCB1 cmwgPSBhZGRyZXNzVXJsKCk7CisgICAgaWYgKHVybC5pc0VtcHR5KCkpIAorICAgICAgICB1cmwg PSBwYWdlKCktPm1haW5GcmFtZSgpLT51cmwoKTsKKwogICAgIHNldFBhZ2UobmV3IFdlYlBhZ2Uo dGhpcykpOwogCiAgICAgUVNwbGl0dGVyKiBzcGxpdHRlciA9IHN0YXRpY19jYXN0PFFTcGxpdHRl cio+KGNlbnRyYWxXaWRnZXQoKSk7CkBAIC0xMzcsNyArMTQwLDcgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6aW5pdGlhbGl6ZVZpZXcoKQogICAgICAgICBwYWdlKCktPnNldFByb3BlcnR5KCJfcV93 ZWJJbnNwZWN0b3JTZXJ2ZXJQb3J0IiwgbV93aW5kb3dPcHRpb25zLnJlbW90ZUluc3BlY3RvclBv cnQpOwogCiAgICAgaWYgKHVybC5pc1ZhbGlkKCkpCi0gICAgICAgIHBhZ2UoKS0+bWFpbkZyYW1l KCktPmxvYWQodXJsKTsKKyAgICAgICAgbG9hZCh1cmwudG9TdHJpbmcoKSk7CiB9CiAKIHZvaWQg TGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoKQpJbmRleDogV2ViS2l0VG9vbHMvUXRUZXN0QnJv d3Nlci9tYWlud2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93 c2VyL21haW53aW5kb3cuY3BwCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw2ICsxMTQsMTEg QEAgV2ViUGFnZSogTWFpbldpbmRvdzo6cGFnZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fcGFnZTsK IH0KIAorUVN0cmluZyBNYWluV2luZG93OjphZGRyZXNzVXJsKCkgY29uc3QKK3sKKyAgICByZXR1 cm4gdXJsRWRpdC0+dGV4dCgpOworfQorCiB2b2lkIE1haW5XaW5kb3c6OnNldEFkZHJlc3NVcmwo Y29uc3QgUVVybCYgdXJsKQogewogICAgIHVybEVkaXQtPnNldFRleHQodXJsLnRvU3RyaW5nKFFV cmw6OlJlbW92ZVVzZXJJbmZvKSk7CkluZGV4OiBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21h aW53aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53 aW5kb3cuaAkocmV2aXNpb24gNzA3NzYpCisrKyBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21h aW53aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsOSBAQCBwdWJsaWM6CiAgICAg V2ViUGFnZSogcGFnZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0UGFnZShXZWJQYWdlKik7CiAKK3By b3RlY3RlZDoKKyAgICBRU3RyaW5nIGFkZHJlc3NVcmwoKSBjb25zdDsKKwogcHJvdGVjdGVkIHNs b3RzOgogICAgIHZvaWQgc2V0QWRkcmVzc1VybChjb25zdCBRU3RyaW5nJiB1cmwpOwogICAgIHZv aWQgc2V0QWRkcmVzc1VybChjb25zdCBRVXJsJiB1cmwpOwo= 72352 2010-10-29 11:22:13 -0700 2010-10-29 11:58:57 -0700 Patch with review comment changes 48440_1029.patch text/plain 2780 dinu.jacob SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwNzgxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMjggIEphY29iIERpbnUgIDxkaW51 LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFF0VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2ds aW5nIHVzZSBvZiBRR3JhcGhpY3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODQ0MAorCisgICAgICAgIFVzZSBmcmFtZSB1cmwgdG8gbG9hZCBw YWdlIGFmdGVyIHRvZ2dsaW5nIHVzZSBvZiBHcmFwaGljc1ZpZXcgb25seSBpZiB1cmwKKyAgICAg ICAgaW4gdGhlIGlucHV0IGZpZWxkIGlzIG5vdCB2YWxpZAorCisgICAgICAgICogUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6aW5pdGlh bGl6ZVZpZXcpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHA6CisgICAg ICAgIChNYWluV2luZG93OjphZGRyZXNzVXJsKToKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21h aW53aW5kb3cuaDoKKwogMjAxMC0xMC0yOCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+ CiAKICAgICAgICAgRG9uJ3QgYXBwZW5kIGEgbmV3bGluZSB0byB0aGUgdGVzdCBvdXRwdXQgaWYg dGhlIGZyYW1lIGhhcyBubyBkb2N1bWVudApJbmRleDogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJKHJldmlzaW9uIDcwNzc2KQorKysgV2ViS2l0VG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0LDcg Kzk0LDEwIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkKIHsKICAgICBk ZWxldGUgbV92aWV3OwogCi0gICAgUVVybCB1cmwgPSBwYWdlKCktPm1haW5GcmFtZSgpLT51cmwo KTsKKyAgICBRVXJsIHVybCA9IHVybEZyb21Vc2VySW5wdXQoYWRkcmVzc1VybCgpKTsKKyAgICBp ZiAoIXVybC5pc1ZhbGlkKCkgKQorICAgICAgICB1cmwgPSBwYWdlKCktPm1haW5GcmFtZSgpLT51 cmwoKTsKKyAgCiAgICAgc2V0UGFnZShuZXcgV2ViUGFnZSh0aGlzKSk7CiAKICAgICBRU3BsaXR0 ZXIqIHNwbGl0dGVyID0gc3RhdGljX2Nhc3Q8UVNwbGl0dGVyKj4oY2VudHJhbFdpZGdldCgpKTsK QEAgLTEzNiw4ICsxMzksNyBAQCB2b2lkIExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldygp CiAgICAgaWYgKG1fd2luZG93T3B0aW9ucy5yZW1vdGVJbnNwZWN0b3JQb3J0KQogICAgICAgICBw YWdlKCktPnNldFByb3BlcnR5KCJfcV93ZWJJbnNwZWN0b3JTZXJ2ZXJQb3J0IiwgbV93aW5kb3dP cHRpb25zLnJlbW90ZUluc3BlY3RvclBvcnQpOwogCi0gICAgaWYgKHVybC5pc1ZhbGlkKCkpCi0g ICAgICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsKKyAgICBsb2FkKHVybCk7CiB9 CiAKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoKQpJbmRleDogV2ViS2l0VG9vbHMv UXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9R dFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRv b2xzL1F0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw2 ICsxMTQsMTEgQEAgV2ViUGFnZSogTWFpbldpbmRvdzo6cGFnZSgpIGNvbnN0CiAgICAgcmV0dXJu IG1fcGFnZTsKIH0KIAorUVN0cmluZyBNYWluV2luZG93OjphZGRyZXNzVXJsKCkgY29uc3QKK3sK KyAgICByZXR1cm4gdXJsRWRpdC0+dGV4dCgpOworfQorCiB2b2lkIE1haW5XaW5kb3c6OnNldEFk ZHJlc3NVcmwoY29uc3QgUVVybCYgdXJsKQogewogICAgIHVybEVkaXQtPnNldFRleHQodXJsLnRv U3RyaW5nKFFVcmw6OlJlbW92ZVVzZXJJbmZvKSk7CkluZGV4OiBXZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL21haW53aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9RdFRlc3RCcm93 c2VyL21haW53aW5kb3cuaAkocmV2aXNpb24gNzA3NzYpCisrKyBXZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL21haW53aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsOSBAQCBwdWJs aWM6CiAgICAgV2ViUGFnZSogcGFnZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0UGFnZShXZWJQYWdl Kik7CiAKK3Byb3RlY3RlZDoKKyAgICBRU3RyaW5nIGFkZHJlc3NVcmwoKSBjb25zdDsKKwogcHJv dGVjdGVkIHNsb3RzOgogICAgIHZvaWQgc2V0QWRkcmVzc1VybChjb25zdCBRU3RyaW5nJiB1cmwp OwogICAgIHZvaWQgc2V0QWRkcmVzc1VybChjb25zdCBRVXJsJiB1cmwpOwo= 72359 2010-10-29 11:58:57 -0700 2011-01-17 10:14:19 -0800 With style fix 48440_1029.patch text/plain 2779 dinu.jacob SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwNzgxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMjggIEphY29iIERpbnUgIDxkaW51 LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFF0VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2ds aW5nIHVzZSBvZiBRR3JhcGhpY3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00ODQ0MAorCisgICAgICAgIFVzZSBmcmFtZSB1cmwgdG8gbG9hZCBw YWdlIGFmdGVyIHRvZ2dsaW5nIHVzZSBvZiBHcmFwaGljc1ZpZXcgb25seSBpZiB1cmwKKyAgICAg ICAgaW4gdGhlIGlucHV0IGZpZWxkIGlzIG5vdCB2YWxpZAorCisgICAgICAgICogUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6aW5pdGlh bGl6ZVZpZXcpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHA6CisgICAg ICAgIChNYWluV2luZG93OjphZGRyZXNzVXJsKToKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21h aW53aW5kb3cuaDoKKwogMjAxMC0xMC0yOCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+ CiAKICAgICAgICAgRG9uJ3QgYXBwZW5kIGEgbmV3bGluZSB0byB0aGUgdGVzdCBvdXRwdXQgaWYg dGhlIGZyYW1lIGhhcyBubyBkb2N1bWVudApJbmRleDogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJKHJldmlzaW9uIDcwNzc2KQorKysgV2ViS2l0VG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0LDcg Kzk0LDEwIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkKIHsKICAgICBk ZWxldGUgbV92aWV3OwogCi0gICAgUVVybCB1cmwgPSBwYWdlKCktPm1haW5GcmFtZSgpLT51cmwo KTsKKyAgICBRVXJsIHVybCA9IHVybEZyb21Vc2VySW5wdXQoYWRkcmVzc1VybCgpKTsKKyAgICBp ZiAoIXVybC5pc1ZhbGlkKCkpCisgICAgICAgIHVybCA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnVy bCgpOworICAKICAgICBzZXRQYWdlKG5ldyBXZWJQYWdlKHRoaXMpKTsKIAogICAgIFFTcGxpdHRl ciogc3BsaXR0ZXIgPSBzdGF0aWNfY2FzdDxRU3BsaXR0ZXIqPihjZW50cmFsV2lkZ2V0KCkpOwpA QCAtMTM2LDggKzEzOSw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkK ICAgICBpZiAobV93aW5kb3dPcHRpb25zLnJlbW90ZUluc3BlY3RvclBvcnQpCiAgICAgICAgIHBh Z2UoKS0+c2V0UHJvcGVydHkoIl9xX3dlYkluc3BlY3RvclNlcnZlclBvcnQiLCBtX3dpbmRvd09w dGlvbnMucmVtb3RlSW5zcGVjdG9yUG9ydCk7CiAKLSAgICBpZiAodXJsLmlzVmFsaWQoKSkKLSAg ICAgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+bG9hZCh1cmwpOworICAgIGxvYWQodXJsKTsKIH0K IAogdm9pZCBMYXVuY2hlcldpbmRvdzo6YXBwbHlQcmVmcygpCkluZGV4OiBXZWJLaXRUb29scy9R dFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0 VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHJldmlzaW9uIDcwNzc2KQorKysgV2ViS2l0VG9v bHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYg KzExNCwxMSBAQCBXZWJQYWdlKiBNYWluV2luZG93OjpwYWdlKCkgY29uc3QKICAgICByZXR1cm4g bV9wYWdlOwogfQogCitRU3RyaW5nIE1haW5XaW5kb3c6OmFkZHJlc3NVcmwoKSBjb25zdAorewor ICAgIHJldHVybiB1cmxFZGl0LT50ZXh0KCk7Cit9CisKIHZvaWQgTWFpbldpbmRvdzo6c2V0QWRk cmVzc1VybChjb25zdCBRVXJsJiB1cmwpCiB7CiAgICAgdXJsRWRpdC0+c2V0VGV4dCh1cmwudG9T dHJpbmcoUVVybDo6UmVtb3ZlVXNlckluZm8pKTsKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJy b3dzZXIvbWFpbndpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dz ZXIvbWFpbndpbmRvdy5oCShyZXZpc2lvbiA3MDc3NikKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJy b3dzZXIvbWFpbndpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1Miw5IEBAIHB1Ymxp YzoKICAgICBXZWJQYWdlKiBwYWdlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRQYWdlKFdlYlBhZ2Uq KTsKIAorcHJvdGVjdGVkOgorICAgIFFTdHJpbmcgYWRkcmVzc1VybCgpIGNvbnN0OworCiBwcm90 ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzZXRBZGRyZXNzVXJsKGNvbnN0IFFTdHJpbmcmIHVybCk7 CiAgICAgdm9pZCBzZXRBZGRyZXNzVXJsKGNvbnN0IFFVcmwmIHVybCk7Cg== 79184 2011-01-17 10:14:19 -0800 2011-01-17 10:23:26 -0800 Preserve user input 48440.patch text/plain 3575 dinu.jacob SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1OTUyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0 VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2dsaW5nIHVzZSBvZiBRR3JhcGhp Y3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 ODQ0MAorCisgICAgICAgIFByZXNlcnZlIHVzZXIgaW5wdXQgd2hlbiB0b2dnbGluZyB1c2Ugb2Yg UUdyYXBoaWNzVmlldworCisgICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcpOgorICAgICAgICAo TGF1bmNoZXJXaW5kb3c6OmxvYWRGaW5pc2hlZCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci9s YXVuY2hlcndpbmRvdy5oOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHA6 CisgICAgICAgIChNYWluV2luZG93OjphZGRyZXNzVXJsKToKKyAgICAgICAgKiBRdFRlc3RCcm93 c2VyL21haW53aW5kb3cuaDoKKwogMjAxMS0wMS0xNyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZml4IGFmdGVyIHI3NTkwOC4KSW5k ZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA3NTg3OCkK KysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05Myw2ICs5Myw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkK IHsKICAgICBkZWxldGUgbV92aWV3OwogCisgICAgaW5wdXRVcmwgPSBhZGRyZXNzVXJsKCk7CiAg ICAgUVVybCB1cmwgPSBwYWdlKCktPm1haW5GcmFtZSgpLT51cmwoKTsKICAgICBzZXRQYWdlKG5l dyBXZWJQYWdlKHRoaXMpKTsKICAgICBwYWdlKCktPnNldFFuYW1UaHJlYWRlZChtX3dpbmRvd09w dGlvbnMudXNlVGhyZWFkZWRRbmFtKTsKQEAgLTEzNyw4ICsxMzgsMTMgQEAgdm9pZCBMYXVuY2hl cldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcoKQogICAgIGlmIChtX3dpbmRvd09wdGlvbnMucmVtb3Rl SW5zcGVjdG9yUG9ydCkKICAgICAgICAgcGFnZSgpLT5zZXRQcm9wZXJ0eSgiX3Ffd2ViSW5zcGVj dG9yU2VydmVyUG9ydCIsIG1fd2luZG93T3B0aW9ucy5yZW1vdGVJbnNwZWN0b3JQb3J0KTsKIAot ICAgIGlmICh1cmwuaXNWYWxpZCgpKQorICAgIGlmICh1cmwuaXNWYWxpZCgpKSB7CiAgICAgICAg IHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsKKyAgICB9CisgICAgZWxzZSAgeworICAg ICAgICBzZXRBZGRyZXNzVXJsKGlucHV0VXJsKTsKKyAgICAgICAgaW5wdXRVcmwgPSBRU3RyaW5n KCk7CisgICAgfQogfQogCiB2b2lkIExhdW5jaGVyV2luZG93OjphcHBseVByZWZzKCkKQEAgLTUy Niw4ICs1MzIsMTQgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6bG9hZFN0YXJ0ZWQoKQogdm9pZCBM YXVuY2hlcldpbmRvdzo6bG9hZEZpbmlzaGVkKCkKIHsKICAgICBRVXJsIHVybCA9IHBhZ2UoKS0+ bWFpbkZyYW1lKCktPnVybCgpOwotICAgIHNldEFkZHJlc3NVcmwodXJsLnRvU3RyaW5nKFFVcmw6 OlJlbW92ZVVzZXJJbmZvKSk7CiAgICAgYWRkQ29tcGxldGVyRW50cnkodXJsKTsKKyAgICBpZiAo aW5wdXRVcmwuaXNFbXB0eSgpICkgeworICAgICAgICBzZXRBZGRyZXNzVXJsKHVybC50b1N0cmlu ZyhRVXJsOjpSZW1vdmVVc2VySW5mbykpOworICAgIH0KKyAgICBlbHNlIHsKKyAgICAgICAgc2V0 QWRkcmVzc1VybChpbnB1dFVybCk7CisgICAgICAgIGlucHV0VXJsID0gUVN0cmluZygpOworICAg IH0KIH0KIAogdm9pZCBMYXVuY2hlcldpbmRvdzo6c2hvd0xpbmtIb3Zlcihjb25zdCBRU3RyaW5n ICZsaW5rLCBjb25zdCBRU3RyaW5nICZ0b29sVGlwKQpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuaAkocmV2aXNpb24gNzU4NzgpCisrKyBUb29scy9RdFRlc3RCcm93c2VyL2xh dW5jaGVyd2luZG93LmgJKHdvcmtpbmcgY29weSkKQEAgLTIwNiw2ICsyMDYsOCBAQCBwcml2YXRl OgogICAgIFFQcm9wZXJ0eUFuaW1hdGlvbiogbV96b29tQW5pbWF0aW9uOwogICAgIFFMaXN0PFFU b3VjaEV2ZW50OjpUb3VjaFBvaW50PiBtX3RvdWNoUG9pbnRzOwogICAgIGJvb2wgbV90b3VjaE1v Y2tpbmc7CisKKyAgICBRU3RyaW5nIGlucHV0VXJsOwogfTsKIAogI2VuZGlmCkluZGV4OiBUb29s cy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVz dEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHJldmlzaW9uIDc1ODc4KQorKysgVG9vbHMvUXRUZXN0 QnJvd3Nlci9tYWlud2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDYgKzE3MSwxNCBA QCB2b2lkIE1haW5XaW5kb3c6OmxvYWQoY29uc3QgUVVybCYgdXJsKQogICAgIHBhZ2UoKS0+bWFp bkZyYW1lKCktPmxvYWQodXJsKTsKIH0KIAorUVN0cmluZyBNYWluV2luZG93OjphZGRyZXNzVXJs KCkgY29uc3QKK3sKKyNpZm5kZWYgUVRfTk9fSU5QVVRESUFMT0cKKyAgICByZXR1cm4gdXJsRWRp dC0+dGV4dCgpOworI2VuZGlmCisgICAgcmV0dXJuIFFTdHJpbmcoKTsKK30KKwogdm9pZCBNYWlu V2luZG93OjpjaGFuZ2VMb2NhdGlvbigpCiB7CiAjaWZuZGVmIFFUX05PX0lOUFVURElBTE9HCklu ZGV4OiBUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAkocmV2aXNpb24gNzU4NzgpCisrKyBUb29scy9R dFRlc3RCcm93c2VyL21haW53aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksOSBA QCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBvcGVuTG9jYXRpb24oKTsKICAgICB2b2lkIGNo YW5nZUxvY2F0aW9uKCk7CiAKK3Byb3RlY3RlZDoKKyAgICBRU3RyaW5nIGFkZHJlc3NVcmwoKSBj b25zdDsKKwogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkVUkoKTsKIAo= 79186 2011-01-17 10:23:26 -0800 2011-01-17 10:32:47 -0800 With style fix 48440.patch text/plain 3390 dinu.jacob SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1OTUyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0 VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2dsaW5nIHVzZSBvZiBRR3JhcGhp Y3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 ODQ0MAorCisgICAgICAgIFByZXNlcnZlIHVzZXIgaW5wdXQgd2hlbiB0b2dnbGluZyB1c2Ugb2Yg UUdyYXBoaWNzVmlldworCisgICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcpOgorICAgICAgICAo TGF1bmNoZXJXaW5kb3c6OmxvYWRGaW5pc2hlZCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci9s YXVuY2hlcndpbmRvdy5oOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHA6 CisgICAgICAgIChNYWluV2luZG93OjphZGRyZXNzVXJsKToKKyAgICAgICAgKiBRdFRlc3RCcm93 c2VyL21haW53aW5kb3cuaDoKKwogMjAxMS0wMS0xNyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZml4IGFmdGVyIHI3NTkwOC4KSW5k ZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA3NTg3OCkK KysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05Myw2ICs5Myw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkK IHsKICAgICBkZWxldGUgbV92aWV3OwogCisgICAgaW5wdXRVcmwgPSBhZGRyZXNzVXJsKCk7CiAg ICAgUVVybCB1cmwgPSBwYWdlKCktPm1haW5GcmFtZSgpLT51cmwoKTsKICAgICBzZXRQYWdlKG5l dyBXZWJQYWdlKHRoaXMpKTsKICAgICBwYWdlKCktPnNldFFuYW1UaHJlYWRlZChtX3dpbmRvd09w dGlvbnMudXNlVGhyZWFkZWRRbmFtKTsKQEAgLTEzOSw2ICsxNDAsMTAgQEAgdm9pZCBMYXVuY2hl cldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcoKQogCiAgICAgaWYgKHVybC5pc1ZhbGlkKCkpCiAgICAg ICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsKKyAgICBlbHNlICB7CisgICAgICAg IHNldEFkZHJlc3NVcmwoaW5wdXRVcmwpOworICAgICAgICBpbnB1dFVybCA9IFFTdHJpbmcoKTsK KyAgICB9CiB9CiAKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoKQpAQCAtNTI2LDgg KzUzMSwxMyBAQCB2b2lkIExhdW5jaGVyV2luZG93Ojpsb2FkU3RhcnRlZCgpCiB2b2lkIExhdW5j aGVyV2luZG93Ojpsb2FkRmluaXNoZWQoKQogewogICAgIFFVcmwgdXJsID0gcGFnZSgpLT5tYWlu RnJhbWUoKS0+dXJsKCk7Ci0gICAgc2V0QWRkcmVzc1VybCh1cmwudG9TdHJpbmcoUVVybDo6UmVt b3ZlVXNlckluZm8pKTsKICAgICBhZGRDb21wbGV0ZXJFbnRyeSh1cmwpOworICAgIGlmIChpbnB1 dFVybC5pc0VtcHR5KCkpCisgICAgICAgIHNldEFkZHJlc3NVcmwodXJsLnRvU3RyaW5nKFFVcmw6 OlJlbW92ZVVzZXJJbmZvKSk7CisgICAgZWxzZSB7CisgICAgICAgIHNldEFkZHJlc3NVcmwoaW5w dXRVcmwpOworICAgICAgICBpbnB1dFVybCA9IFFTdHJpbmcoKTsKKyAgICB9CiB9CiAKIHZvaWQg TGF1bmNoZXJXaW5kb3c6OnNob3dMaW5rSG92ZXIoY29uc3QgUVN0cmluZyAmbGluaywgY29uc3Qg UVN0cmluZyAmdG9vbFRpcCkKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5k b3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgJ KHJldmlzaW9uIDc1ODc4KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMDYsNiArMjA2LDggQEAgcHJpdmF0ZToKICAgICBRUHJvcGVy dHlBbmltYXRpb24qIG1fem9vbUFuaW1hdGlvbjsKICAgICBRTGlzdDxRVG91Y2hFdmVudDo6VG91 Y2hQb2ludD4gbV90b3VjaFBvaW50czsKICAgICBib29sIG1fdG91Y2hNb2NraW5nOworCisgICAg UVN0cmluZyBpbnB1dFVybDsKIH07CiAKICNlbmRpZgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nl ci9tYWlud2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RCcm93c2VyL21haW53 aW5kb3cuY3BwCShyZXZpc2lvbiA3NTg3OCkKKysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbndp bmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MSw2ICsxNzEsMTQgQEAgdm9pZCBNYWluV2lu ZG93Ojpsb2FkKGNvbnN0IFFVcmwmIHVybCkKICAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5sb2Fk KHVybCk7CiB9CiAKK1FTdHJpbmcgTWFpbldpbmRvdzo6YWRkcmVzc1VybCgpIGNvbnN0Cit7Cisj aWZuZGVmIFFUX05PX0lOUFVURElBTE9HCisgICAgcmV0dXJuIHVybEVkaXQtPnRleHQoKTsKKyNl bmRpZgorICAgIHJldHVybiBRU3RyaW5nKCk7Cit9CisKIHZvaWQgTWFpbldpbmRvdzo6Y2hhbmdl TG9jYXRpb24oKQogewogI2lmbmRlZiBRVF9OT19JTlBVVERJQUxPRwpJbmRleDogVG9vbHMvUXRU ZXN0QnJvd3Nlci9tYWlud2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nl ci9tYWlud2luZG93LmgJKHJldmlzaW9uIDc1ODc4KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9t YWlud2luZG93LmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDkgQEAgcHJvdGVjdGVkIHNs b3RzOgogICAgIHZvaWQgb3BlbkxvY2F0aW9uKCk7CiAgICAgdm9pZCBjaGFuZ2VMb2NhdGlvbigp OwogCitwcm90ZWN0ZWQ6CisgICAgUVN0cmluZyBhZGRyZXNzVXJsKCkgY29uc3Q7CisKIHByaXZh dGU6CiAgICAgdm9pZCBidWlsZFVJKCk7CiAK 79187 2011-01-17 10:32:47 -0800 2011-01-27 16:22:02 -0800 Updated with review comment 48440.patch text/plain 3404 dinu.jacob SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1OTUyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0 VGVzdEJyb3dzZXI6IFVzZXIgaW5wdXQgbG9zdCB3aGVuIHRvZ2dsaW5nIHVzZSBvZiBRR3JhcGhp Y3NWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 ODQ0MAorCisgICAgICAgIFByZXNlcnZlIHVzZXIgaW5wdXQgd2hlbiB0b2dnbGluZyB1c2Ugb2Yg UUdyYXBoaWNzVmlldworCisgICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcpOgorICAgICAgICAo TGF1bmNoZXJXaW5kb3c6OmxvYWRGaW5pc2hlZCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci9s YXVuY2hlcndpbmRvdy5oOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHA6 CisgICAgICAgIChNYWluV2luZG93OjphZGRyZXNzVXJsKToKKyAgICAgICAgKiBRdFRlc3RCcm93 c2VyL21haW53aW5kb3cuaDoKKwogMjAxMS0wMS0xNyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZml4IGFmdGVyIHI3NTkwOC4KSW5k ZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA3NTg3OCkK KysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05Myw2ICs5Myw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KCkK IHsKICAgICBkZWxldGUgbV92aWV3OwogCisgICAgbV9pbnB1dFVybCA9IGFkZHJlc3NVcmwoKTsK ICAgICBRVXJsIHVybCA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnVybCgpOwogICAgIHNldFBhZ2Uo bmV3IFdlYlBhZ2UodGhpcykpOwogICAgIHBhZ2UoKS0+c2V0UW5hbVRocmVhZGVkKG1fd2luZG93 T3B0aW9ucy51c2VUaHJlYWRlZFFuYW0pOwpAQCAtMTM5LDYgKzE0MCwxMCBAQCB2b2lkIExhdW5j aGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiAKICAgICBpZiAodXJsLmlzVmFsaWQoKSkKICAg ICAgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+bG9hZCh1cmwpOworICAgIGVsc2UgIHsKKyAgICAg ICAgc2V0QWRkcmVzc1VybChtX2lucHV0VXJsKTsKKyAgICAgICAgbV9pbnB1dFVybCA9IFFTdHJp bmcoKTsKKyAgICB9CiB9CiAKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoKQpAQCAt NTI2LDggKzUzMSwxMyBAQCB2b2lkIExhdW5jaGVyV2luZG93Ojpsb2FkU3RhcnRlZCgpCiB2b2lk IExhdW5jaGVyV2luZG93Ojpsb2FkRmluaXNoZWQoKQogewogICAgIFFVcmwgdXJsID0gcGFnZSgp LT5tYWluRnJhbWUoKS0+dXJsKCk7Ci0gICAgc2V0QWRkcmVzc1VybCh1cmwudG9TdHJpbmcoUVVy bDo6UmVtb3ZlVXNlckluZm8pKTsKICAgICBhZGRDb21wbGV0ZXJFbnRyeSh1cmwpOworICAgIGlm IChtX2lucHV0VXJsLmlzRW1wdHkoKSkKKyAgICAgICAgc2V0QWRkcmVzc1VybCh1cmwudG9TdHJp bmcoUVVybDo6UmVtb3ZlVXNlckluZm8pKTsKKyAgICBlbHNlIHsKKyAgICAgICAgc2V0QWRkcmVz c1VybChtX2lucHV0VXJsKTsKKyAgICAgICAgbV9pbnB1dFVybCA9IFFTdHJpbmcoKTsKKyAgICB9 CiB9CiAKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNob3dMaW5rSG92ZXIoY29uc3QgUVN0cmluZyAm bGluaywgY29uc3QgUVN0cmluZyAmdG9vbFRpcCkKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5j aGVyd2luZG93LmgJKHJldmlzaW9uIDc1ODc4KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMDYsNiArMjA2LDggQEAgcHJpdmF0ZToK ICAgICBRUHJvcGVydHlBbmltYXRpb24qIG1fem9vbUFuaW1hdGlvbjsKICAgICBRTGlzdDxRVG91 Y2hFdmVudDo6VG91Y2hQb2ludD4gbV90b3VjaFBvaW50czsKICAgICBib29sIG1fdG91Y2hNb2Nr aW5nOworCisgICAgUVN0cmluZyBtX2lucHV0VXJsOwogfTsKIAogI2VuZGlmCkluZGV4OiBUb29s cy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVz dEJyb3dzZXIvbWFpbndpbmRvdy5jcHAJKHJldmlzaW9uIDc1ODc4KQorKysgVG9vbHMvUXRUZXN0 QnJvd3Nlci9tYWlud2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDYgKzE3MSwxNCBA QCB2b2lkIE1haW5XaW5kb3c6OmxvYWQoY29uc3QgUVVybCYgdXJsKQogICAgIHBhZ2UoKS0+bWFp bkZyYW1lKCktPmxvYWQodXJsKTsKIH0KIAorUVN0cmluZyBNYWluV2luZG93OjphZGRyZXNzVXJs KCkgY29uc3QKK3sKKyNpZm5kZWYgUVRfTk9fSU5QVVRESUFMT0cKKyAgICByZXR1cm4gdXJsRWRp dC0+dGV4dCgpOworI2VuZGlmCisgICAgcmV0dXJuIFFTdHJpbmcoKTsKK30KKwogdm9pZCBNYWlu V2luZG93OjpjaGFuZ2VMb2NhdGlvbigpCiB7CiAjaWZuZGVmIFFUX05PX0lOUFVURElBTE9HCklu ZGV4OiBUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuaAkocmV2aXNpb24gNzU4NzgpCisrKyBUb29scy9R dFRlc3RCcm93c2VyL21haW53aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksOSBA QCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBvcGVuTG9jYXRpb24oKTsKICAgICB2b2lkIGNo YW5nZUxvY2F0aW9uKCk7CiAKK3Byb3RlY3RlZDoKKyAgICBRU3RyaW5nIGFkZHJlc3NVcmwoKSBj b25zdDsKKwogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkVUkoKTsKIAo=