53973 2011-02-07 20:41:06 -0800 [Qt] Can't play HTML5 Video because of the URL is percent encoded twice 2011-02-17 13:06:59 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED http://youtube.com/html5 Qt, QtTriaged P2 Normal --- 1 hui_huang webkit-unassigned ademar benjamin commit-queue eric hausmann hui_huang laszlo.gombos max.hong.shen nancy.piedra nanjundiah.harsha yael oldest_to_newest 347051 0 hui_huang 2011-02-07 20:41:06 -0800 1. Build Webkit trunk on Ubuntu with Qt 4.7.2 and QtMobility 1.1. 2. Start QtTestBrowser. 3. Change User Agent to that of iPad. 4. Go to http://youtube.com/html5. 5. Go to the bottom of the page and select the link "Join the HTML5 Video trial". 6. Go to the top of the page and select the link "Browse". 7. Start wireshark or tcpdump to capture network traffic. 8. Select any video. Video is not playing. In the PCAP trace generated by wireshark or tcpdump, HTTP 403 error is sent by the web server on the HTTP GET request for the video. The error can also be reproduced with other user agents such as the default user agent and Android 2.2. 347057 1 81577 hui_huang 2011-02-07 21:10:33 -0800 Created attachment 81577 Proposed patch 347066 2 hui_huang 2011-02-07 21:24:14 -0800 The URL of the HTML5 Video has already been percent encoded by youtube. It is percent encoded again in MediaPlayerPrivateQt::commitLoad by the constructor QUrl::QUrl(QString). According QUrl class reference (http://doc.qt.nokia.com/latest/qurl.html#QUrl-2), this constructor assumes that the URL is not percent encoded. Since the URL is double percent encoded, the HTTP GET Request for the video is rejected by youtube. The bug can be fixed by using QUrl::fromEncoded to construct QUrl with an encoded URL. Attached proposed patch. 347220 3 81577 benjamin 2011-02-08 00:51:26 -0800 Comment on attachment 81577 Proposed patch Setting review flag. 347223 4 benjamin 2011-02-08 00:57:29 -0800 When you add a patch, you should set the review flag and the commit-queue flag, otherwise, reviewers do not see your patch (because it is not in the review queue). Here is some more info: http://trac.webkit.org/wiki/QtWebKitContrib I think a test is needed for this case. 347340 5 81577 kling 2011-02-08 07:06:51 -0800 Comment on attachment 81577 Proposed patch Needs a regression test. 347391 6 hui_huang 2011-02-08 08:04:52 -0800 Sorry, my mistake. Will add a test as recommended by you and Andreas. (In reply to comment #4) > When you add a patch, you should set the review flag and the commit-queue flag, otherwise, reviewers do not see your patch (because it is not in the review queue). Here is some more info: http://trac.webkit.org/wiki/QtWebKitContrib > > I think a test is needed for this case. 348168 7 hausmann 2011-02-09 05:33:55 -0800 I think calling ascii() is scary and IMHO we should avoid it. Wouldn't it be safer to convert the String into a KURL first, and then convert that to a QURL? These conversions we know are safe: KUrl kurl(ParsedURLString, url); QUrl qurl = kurl; But maybe I'm just to afraid of these encoding issues :) 348236 8 hui_huang 2011-02-09 07:48:44 -0800 Thanks a lot for the advice. I tried your solution. It works. I think it is better than my original code. I will use it in the new patch I am working on. (In reply to comment #7) > I think calling ascii() is scary and IMHO we should avoid it. > > Wouldn't it be safer to convert the String into a KURL first, and then convert that to a QURL? These conversions we know are safe: > > KUrl kurl(ParsedURLString, url); > QUrl qurl = kurl; > > But maybe I'm just to afraid of these encoding issues :) 349338 9 82039 hui_huang 2011-02-10 13:41:19 -0800 Created attachment 82039 New patch with regression test 349363 10 hui_huang 2011-02-10 14:06:10 -0800 I attached a new patch with regression test and Simon's improvement. I spent quite some time trying to find out a way to create a test using HTML and JS only, but I can't find a good solution without the involvement of an external web server. Therefore, I added a test function in tst_qwebpage. Since the HTTP request is sent by QtMobility, QNetworkAccessManager can not be used to check the request URL. I used DumpRenderTreeSupportQt to access media content URL from the Media Player via video element in DOM. I tested the patch and the test function worked. Suggestions on improvements are appreciated. 349383 11 82049 hui_huang 2011-02-10 14:30:57 -0800 Created attachment 82049 New patch after resolving conflicts 351188 12 nanjundiah.harsha 2011-02-15 04:19:17 -0800 I was also working on this issue. I had a similar fix for the issue. :-). I have tested the above patch on ubuntu and youtube html5 video playback works well. Note: Similar fix is needed in the phonon path i.e in MediaPlayerPrivatePhonon.cpp 351250 13 82049 hausmann 2011-02-15 07:31:44 -0800 Comment on attachment 82049 New patch after resolving conflicts I like it, but I think the test will fail on platforms that don't have QtMobility installed. 351265 14 hui_huang 2011-02-15 07:55:51 -0800 Thanks for the suggestion. I will make a new patch to check QtMobility availability when building qwebview test. (In reply to comment #13) > (From update of attachment 82049 [details]) > I like it, but I think the test will fail on platforms that don't have QtMobility installed. 351561 15 hui_huang 2011-02-15 14:02:13 -0800 Thanks for the info. I think a new bug report with test steps is probably needed for Phonon, so that we can reproduce the problem and test the solution. (In reply to comment #12) > I was also working on this issue. I had a similar fix for the issue. :-). > I have tested the above patch on ubuntu and youtube html5 video playback works well. > > Note: Similar fix is needed in the phonon path i.e in MediaPlayerPrivatePhonon.cpp 351673 16 82540 hui_huang 2011-02-15 15:47:29 -0800 Created attachment 82540 New patch after fixing build problem without Qt Multimedia. Skipping test if Qt Multimedia is not available. 351834 17 82575 hui_huang 2011-02-15 19:46:35 -0800 Created attachment 82575 New patch to resolve conflicts 351984 18 82575 laszlo.gombos 2011-02-16 04:35:45 -0800 Comment on attachment 82575 New patch to resolve conflicts View in context: https://bugs.webkit.org/attachment.cgi?id=82575&action=review > Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp:83 > +#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA) Can we just use ENABLE(VIDEO) guard here - that is less code and the function could be perhaps reused for the phonon case as well ? > Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp:969 > +#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA) Ditto. 352046 19 hui_huang 2011-02-16 07:11:32 -0800 Thanks for the advice. The reason to use ENABLE(QT_MULTIMEDIA) is that MediaPlayerPrivateQt.h can only be compiled with Qt Multimedia because of the dependency on QMediaPlayer. If only ENABLE(VIDEO) is used and Qt Multimedia is not available, there may be build problems. (In reply to comment #18) > (From update of attachment 82575 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=82575&action=review > > > Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp:83 > > +#if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA) > > Can we just use ENABLE(VIDEO) guard here - that is less code and the function could be perhaps reused for the phonon case as well ? 352224 20 82575 laszlo.gombos 2011-02-16 11:31:29 -0800 Comment on attachment 82575 New patch to resolve conflicts r=me. 352254 21 hui_huang 2011-02-16 12:20:44 -0800 Thanks a lot. (In reply to comment #20) > (From update of attachment 82575 [details]) > r=me. 352455 22 82575 commit-queue 2011-02-16 16:47:19 -0800 Comment on attachment 82575 New patch to resolve conflicts Rejecting attachment 82575 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 1 Last 500 characters of output: ommit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run step(tool, options).run(state) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 57, in run if self._has_valid_reviewer(changelog_entry): File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 42, in _has_valid_reviewer if changelog_entry.reviewer(): AttributeError: 'NoneType' object has no attribute 'reviewer' Full output: http://queues.webkit.org/results/7927410 352754 23 ademar 2011-02-17 04:26:28 -0800 (In reply to comment #22) > (From update of attachment 82575 [details]) > Rejecting attachment 82575 [details] from commit-queue. > > Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 1 > > Last 500 characters of output: > ommit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run > step(tool, options).run(state) > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 57, in run > if self._has_valid_reviewer(changelog_entry): > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 42, in _has_valid_reviewer > if changelog_entry.reviewer(): > AttributeError: 'NoneType' object has no attribute 'reviewer' > > Full output: http://queues.webkit.org/results/7927410 A bug in commit-queue perhaps? Laszlo: can you please land it manually? 352765 24 82575 laszlo.gombos 2011-02-17 05:16:39 -0800 Comment on attachment 82575 New patch to resolve conflicts Try again. 352774 25 yael 2011-02-17 05:36:47 -0800 (In reply to comment #24) > (From update of attachment 82575 [details]) > Try again. happened to me too. It worked on second try :-) 352778 26 82575 commit-queue 2011-02-17 05:40:01 -0800 Comment on attachment 82575 New patch to resolve conflicts Clearing flags on attachment: 82575 Committed r78817: <http://trac.webkit.org/changeset/78817> 352779 27 commit-queue 2011-02-17 05:40:07 -0800 All reviewed patches have been landed. Closing bug. 353107 28 ademar 2011-02-17 12:43:48 -0800 Revision r78817 cherry-picked into qtwebkit-2.1.x with commit 10a21c6 <http://gitorious.org/webkit/qtwebkit/commit/10a21c6> 353132 29 eric 2011-02-17 13:06:59 -0800 (In reply to comment #23) > (In reply to comment #22) > > (From update of attachment 82575 [details] [details]) > > Rejecting attachment 82575 [details] [details] from commit-queue. > > > > Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 1 > > > > Last 500 characters of output: > > ommit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run > > step(tool, options).run(state) > > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 57, in run > > if self._has_valid_reviewer(changelog_entry): > > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 42, in _has_valid_reviewer > > if changelog_entry.reviewer(): > > AttributeError: 'NoneType' object has no attribute 'reviewer' > > > > Full output: http://queues.webkit.org/results/7927410 > > A bug in commit-queue perhaps? Laszlo: can you please land it manually? This generally happens when missing a ChangeLog (or ChangeLog entry). Clearly we need to print a better message. 81577 2011-02-07 21:10:33 -0800 2011-02-10 13:41:19 -0800 Proposed patch bug53973.patch text/plain 1567 hui_huang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3ODg1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMDcgIEh1aSBIdWFu ZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgVVJMIG9mIEhUTUw1IFZpZGVvIEVsZW1lbnQgaXMgZW5j b2RlZCBhdCB3ZWJzaXRlcyBzdWNoIGFzIHlvdXR1YmUuIEl0IAorICAgICAgICBpcyBlbmNvZGVk IGFnYWluIGJ5IFFVcmwgY29uc3RydWN0b3IgUVVybDo6UVVybChRU3RyaW5nKS4gVGhpcyBjYXVz ZXMgdGhlIAorICAgICAgICBIVFRQIEdFVCByZXF1ZXN0IGZvciB0aGUgdmlkZW8gdG8gYmUgcmVq ZWN0ZWQgYnkgdGhlIHNlcnZpY2UgcHJvdmlkZXIuIAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM5NzMuCisKKyAgICAgICAgVGhlIGJ1ZyBpcyBmaXhl ZCBieSB1c2luZyBRVXJsOjpmcm9tRW5jb2RlZChRQnl0ZUFycmF5KSB0byBjb25zdHJ1Y3QgUVVy bAorICAgICAgICBmcm9tIHRoZSBlbmNvZGVkIFVSTC4KKworICAgICAgICBObyBuZXcgdGVzdHMg cmVxdWlyZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVRdDo6Y29t bWl0TG9hZCk6CisKIDIwMTEtMDItMDcgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJp dmF0ZVF0LmNwcAkocmV2aXNpb24gNzc4ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4 Nyw3ICsxODcsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRMb2FkKGNvCiAg ICAgICAgIG1fd2ViQ29yZVBsYXllci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKICAgICB9CiAKLSAg ICBjb25zdCBRVXJsIHJVcmwgPSBRVXJsKFFTdHJpbmcodXJsKSk7CisgICAgY29uc3QgUVVybCBy VXJsID0gUVVybDo6ZnJvbUVuY29kZWQoUVN0cmluZyh1cmwpLnRvQXNjaWkoKSk7CiAgICAgY29u c3QgUVN0cmluZyBzY2hlbWUgPSByVXJsLnNjaGVtZSgpLnRvTG93ZXIoKTsKIAogICAgIC8vIEdy YWIgdGhlIGNsaWVudCBtZWRpYSBlbGVtZW50Cg== 82039 2011-02-10 13:41:19 -0800 2011-02-10 14:30:57 -0800 New patch with regression test bug53973.patch text/plain 6798 hui_huang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MjYxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMTAgIEh1aSBIdWFu ZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgVVJMIG9mIEhUTUw1IFZpZGVvIEVsZW1lbnQgaXMgcGVy Y2VudCBlbmNvZGVkIGF0IHdlYnNpdGVzIHN1Y2ggYXMgeW91dHViZS4KKyAgICAgICAgSXQgaXMg cGVyY2VudCBlbmNvZGVkIGFnYWluIGJ5IFFVcmwgY29uc3RydWN0b3IgUVVybDo6UVVybChRU3Ry aW5nKS4gVGhpcyBjYXVzZXMKKyAgICAgICAgdGhlIEhUVFAgR0VUIHJlcXVlc3QgZm9yIHRoZSB2 aWRlbyB0byBiZSByZWplY3RlZCBieSB0aGUgc2VydmljZSBwcm92aWRlci4gCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzk3My4KKworICAgICAgICBU aGUgYnVnIGlzIGZpeGVkIGJ5IGNvbnN0cnVjdGluZyBRVXJsIGZyb20gdGhlIGVuY29kZWQgVVJM LgorCisgICAgICAgIE5ldyB0ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1Vmlk ZW8oKSBpcyBhZGRlZCBpbiAKKyAgICAgICAgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVRdDo6Y29tbWl0TG9hZCk6CisKIDIwMTEtMDItMTAgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlh UGxheWVyUHJpdmF0ZVF0LmNwcAkocmV2aXNpb24gNzgyNTIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE4Nyw3ICsxODcsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRM b2FkKGNvCiAgICAgICAgIG1fd2ViQ29yZVBsYXllci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKICAg ICB9CiAKLSAgICBjb25zdCBRVXJsIHJVcmwgPSBRVXJsKFFTdHJpbmcodXJsKSk7CisgICAgS1VS TCBrVXJsKFBhcnNlZFVSTFN0cmluZywgdXJsKTsKKyAgICBjb25zdCBRVXJsIHJVcmwgPSBrVXJs OwogICAgIGNvbnN0IFFTdHJpbmcgc2NoZW1lID0gclVybC5zY2hlbWUoKS50b0xvd2VyKCk7CiAK ICAgICAvLyBHcmFiIHRoZSBjbGllbnQgbWVkaWEgZWxlbWVudApJbmRleDogU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDc4MjYxKQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wMi0xMCAgSHVpIEh1YW5nICA8aHVpLjIuaHVh bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBVUkwgb2YgSFRNTDUgVmlkZW8gRWxlbWVudCBpcyBwZXJjZW50IGVuY29kZWQg YXQgd2Vic2l0ZXMgc3VjaCBhcyB5b3V0dWJlLgorICAgICAgICBJdCBpcyBwZXJjZW50IGVuY29k ZWQgYWdhaW4gYnkgUVVybCBjb25zdHJ1Y3RvciBRVXJsOjpRVXJsKFFTdHJpbmcpLiBUaGlzIGNh dXNlcworICAgICAgICB0aGUgSFRUUCBHRVQgcmVxdWVzdCBmb3IgdGhlIHZpZGVvIHRvIGJlIHJl amVjdGVkIGJ5IHRoZSBzZXJ2aWNlIHByb3ZpZGVyLiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzOTczLgorCisgICAgICAgIFRoZSBidWcgaXMgZml4 ZWQgYnkgY29uc3RydWN0aW5nIFFVcmwgZnJvbSB0aGUgZW5jb2RlZCBVUkwgaW4gCisgICAgICAg IE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRMb2FkLiAKKworICAgICAgICBOZXcgdGVzdCBm dW5jdGlvbiB0c3RfUVdlYlBhZ2U6OmxvYWRIdG1sNVZpZGVvKCkgaXMgYWRkZWQgdG8gbG9hZCBI VE1MIGNvbnRlbnQgd2l0aAorICAgICAgICBIVE1MNSBWaWRlbyBlbGVtZW50LiBBIG5ldyBwdWJs aWMgbWV0aG9kIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1l bnRJZAorICAgICAgICBpcyBhZGRlZCB0byByZXRyaWV2ZSB0aGUgVVJMIG9mIHRoZSBtZWRpYSBj b250ZW50IGZyb20gV2ViQ29yZSBNZWRpYVBsYXllclByaXZhdGVRdC4KKworICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcDoKKyAgICAgICAgKER1bXBS ZW5kZXJUcmVlU3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZCk6CisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaDoKKyAgICAgICAgKiB0 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjps b2FkSHRtbDVWaWRlbyk6CisKIDIwMTEtMDItMTAgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBHb21ib3MuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydFF0LmNwcAkocmV2aXNpb24gNzgyNTIpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtODAsNiArODAsMTEgQEAKICNpbmNsdWRlICJxd2VicGFnZV9wLmgiCiAjaW5jbHVkZSAicXdl YnNjcmlwdHdvcmxkLmgiCiAKKyNpZiBFTkFCTEUoVklERU8pICYmIEVOQUJMRShRVF9NVUxUSU1F RElBKQorI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXll clByaXZhdGVRdC5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBRTWFw PGludCwgUVdlYlNjcmlwdFdvcmxkKj4gbV93b3JsZE1hcDsKQEAgLTkxNiw2ICs5MjEsMzYgQEAg dm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6YWRkVVJMVG9SZQogICAgIEZyYW1lTG9hZGVy Q2xpZW50UXQ6OlVSTHNUb1JlZGlyZWN0W29yaWdpbl0gPSBkZXN0aW5hdGlvbjsKIH0KIAorUVVy bCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6bWVkaWFDb250ZW50VXJsQnlFbGVtZW50SWQoUVdl YkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0cmluZyYgZWxlbWVudElkKQoreworICAgIFFVcmwgcmVz OworCisjaWYgRU5BQkxFKFZJREVPKSAmJiBFTkFCTEUoUVRfTVVMVElNRURJQSkKKyAgICBGcmFt ZSogY29yZUZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShmcmFtZSk7CisgICAgaWYgKCFj b3JlRnJhbWUpCisgICAgICAgIHJldHVybiByZXM7CisKKyAgICBEb2N1bWVudCogZG9jID0gY29y ZUZyYW1lLT5kb2N1bWVudCgpOworICAgIGlmICghZG9jKQorICAgICAgICByZXR1cm4gcmVzOwor CisgICAgTm9kZSogY29yZU5vZGUgPSBkb2MtPmdldEVsZW1lbnRCeUlkKGVsZW1lbnRJZCk7Cisg ICAgaWYgKCFjb3JlTm9kZSkKKyAgICAgICAgcmV0dXJuIHJlczsKKworICAgIEhUTUxWaWRlb0Vs ZW1lbnQqIHZpZGVvRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxWaWRlb0VsZW1lbnQqPihjb3Jl Tm9kZSk7CisgICAgUGxhdGZvcm1NZWRpYSBwbGF0Zm9ybU1lZGlhID0gdmlkZW9FbGVtZW50LT5w bGF0Zm9ybU1lZGlhKCk7CisgICAgaWYgKHBsYXRmb3JtTWVkaWEudHlwZSAhPSBQbGF0Zm9ybU1l ZGlhOjpRdE1lZGlhUGxheWVyVHlwZSkKKyAgICAgICAgcmV0dXJuIHJlczsKKworICAgIE1lZGlh UGxheWVyUHJpdmF0ZVF0KiBtZWRpYVBsYXllclF0ID0gc3RhdGljX2Nhc3Q8TWVkaWFQbGF5ZXJQ cml2YXRlUXQqPihwbGF0Zm9ybU1lZGlhLm1lZGlhLnF0TWVkaWFQbGF5ZXIpOworICAgIGlmICht ZWRpYVBsYXllclF0ICYmIG1lZGlhUGxheWVyUXQtPm1lZGlhUGxheWVyKCkpCisgICAgICAgIHJl cyA9IG1lZGlhUGxheWVyUXQtPm1lZGlhUGxheWVyKCktPm1lZGlhKCkuY2Fub25pY2FsVXJsKCk7 CisjZW5kaWYKKworICAgIHJldHVybiByZXM7Cit9CisKIC8vIFByb3ZpZGUgYSBiYWNrd2FyZCBj b21wYXRpYmlsaXR5IHdpdGggcHJldmlvdXNseSBleHBvcnRlZCBwcml2YXRlIHN5bWJvbHMgYXMg b2YgUXRXZWJLaXQgNC42IHJlbGVhc2UKIAogdm9pZCBRV0VCS0lUX0VYUE9SVCBxdF9yZXN1bWVB Y3RpdmVET01PYmplY3RzKFFXZWJGcmFtZSogZnJhbWUpCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5o CShyZXZpc2lvbiA3ODI1MikKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVt cFJlbmRlclRyZWVTdXBwb3J0UXQuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsNiArNTEsNyBAQCBj bGFzcyBRV2ViRnJhbWU7CiBjbGFzcyBRV2ViUGFnZTsKIGNsYXNzIFFXZWJIaXN0b3J5SXRlbTsK IGNsYXNzIFFXZWJTY3JpcHRXb3JsZDsKK2NsYXNzIFFVcmw7CiAKIGV4dGVybiBRTWFwPGludCwg UVdlYlNjcmlwdFdvcmxkKj4gbV93b3JsZE1hcDsKIApAQCAtMTg4LDYgKzE4OSw3IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgUVZhcmlhbnRMaXN0IG5vZGVzRnJvbVJlY3QoY29uc3QgUVdlYkVsZW1l bnQmIGRvY3VtZW50LCBpbnQgeCwgaW50IHksIHVuc2lnbmVkIHRvcCwgdW5zaWduZWQgcmlnaHQs IHVuc2lnbmVkIGJvdHRvbSwgdW5zaWduZWQgbGVmdCwgYm9vbCBpZ25vcmVDbGlwcGluZyk7CiAg ICAgc3RhdGljIFFTdHJpbmcgcmVzcG9uc2VNaW1lVHlwZShRV2ViRnJhbWUqKTsKICAgICBzdGF0 aWMgdm9pZCBhZGRVUkxUb1JlZGlyZWN0KGNvbnN0IFFTdHJpbmcmIG9yaWdpbiwgY29uc3QgUVN0 cmluZyYgZGVzdGluYXRpb24pOworICAgIHN0YXRpYyBRVXJsIG1lZGlhQ29udGVudFVybEJ5RWxl bWVudElkKFFXZWJGcmFtZSosIGNvbnN0IFFTdHJpbmcmIGVsZW1lbnRJZCk7CiB9OwogCiAjZW5k aWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAJKHJldmlzaW9uIDc4MjUyKQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw2ICs4NCw3IEBAIHBy aXZhdGUgc2xvdHM6CiAgICAgdm9pZCBsb2FkRmluaXNoZWQoKTsKICAgICB2b2lkIGFjY2VwdE5h dmlnYXRpb25SZXF1ZXN0V2l0aE5ld1dpbmRvdygpOwogICAgIHZvaWQgdXNlclN0eWxlU2hlZXQo KTsKKyAgICB2b2lkIGxvYWRIdG1sNVZpZGVvKCk7CiAgICAgdm9pZCBtb2RpZmllZCgpOwogICAg IHZvaWQgY29udGV4dE1lbnVDcmFzaCgpOwogICAgIHZvaWQgdXBkYXRlUG9zaXRpb25EZXBlbmRl bnRBY3Rpb25zQ3Jhc2goKTsKQEAgLTQyNyw2ICs0MjgsMTUgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6 OnVzZXJTdHlsZVNoZWV0KCkKICAgICBRQ09NUEFSRShuZXR3b3JrTWFuYWdlci0+cmVxdWVzdGVk VXJscy5hdCgwKSwgUVVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0LnBuZyIpKTsKIH0KIAordm9p ZCB0c3RfUVdlYlBhZ2U6OmxvYWRIdG1sNVZpZGVvKCkKK3sKKyAgICBRQnl0ZUFycmF5IHVybCgi aHR0cDovL2RvZXMubm90L2V4aXN0P2E9MSUyQ2I9MiIpOworICAgIG1fdmlldy0+c2V0SHRtbCgi PHA+PHZpZGVvIGlkID0ndmlkZW8nIHNyYz0nIiArIHVybCArICInIGF1dG9wbGF5Lz48L3A+Iik7 CisgICAgUVRlc3Q6OnFXYWl0KDIwMDApOworICAgIFFVcmwgbVVybCA9IER1bXBSZW5kZXJUcmVl U3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZChtX3BhZ2UtPm1haW5GcmFtZSgp LCAidmlkZW8iKTsKKyAgICBRQ09NUEFSRShtVXJsLnRvRW5jb2RlZCgpLCB1cmwpOworfQorCiB2 b2lkIHRzdF9RV2ViUGFnZTo6dmlld01vZGVzKCkKIHsKICAgICBtX3ZpZXctPnNldEh0bWwoIjxi b2R5PjwvYm9keT4iKTsK 82049 2011-02-10 14:30:57 -0800 2011-02-15 15:49:29 -0800 New patch after resolving conflicts bug53973.patch text/plain 6649 hui_huang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MjYxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMTAgIEh1aSBIdWFu ZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgVVJMIG9mIEhUTUw1IFZpZGVvIEVsZW1lbnQgaXMgcGVy Y2VudCBlbmNvZGVkIGF0IHdlYnNpdGVzIHN1Y2ggYXMgeW91dHViZS4KKyAgICAgICAgSXQgaXMg cGVyY2VudCBlbmNvZGVkIGFnYWluIGJ5IFFVcmwgY29uc3RydWN0b3IgUVVybDo6UVVybChRU3Ry aW5nKS4gVGhpcyBjYXVzZXMKKyAgICAgICAgdGhlIEhUVFAgR0VUIHJlcXVlc3QgZm9yIHRoZSB2 aWRlbyB0byBiZSByZWplY3RlZCBieSB0aGUgc2VydmljZSBwcm92aWRlci4gCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzk3My4KKworICAgICAgICBU aGUgYnVnIGlzIGZpeGVkIGJ5IGNvbnN0cnVjdGluZyBRVXJsIGZyb20gdGhlIGVuY29kZWQgVVJM LgorCisgICAgICAgIE5ldyB0ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1Vmlk ZW8oKSBpcyBhZGRlZCBpbiAKKyAgICAgICAgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVRdDo6Y29tbWl0TG9hZCk6CisKIDIwMTEtMDItMTAgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlh UGxheWVyUHJpdmF0ZVF0LmNwcAkocmV2aXNpb24gNzgyNTIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE4Nyw3ICsxODcsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRM b2FkKGNvCiAgICAgICAgIG1fd2ViQ29yZVBsYXllci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKICAg ICB9CiAKLSAgICBjb25zdCBRVXJsIHJVcmwgPSBRVXJsKFFTdHJpbmcodXJsKSk7CisgICAgS1VS TCBrVXJsKFBhcnNlZFVSTFN0cmluZywgdXJsKTsKKyAgICBjb25zdCBRVXJsIHJVcmwgPSBrVXJs OwogICAgIGNvbnN0IFFTdHJpbmcgc2NoZW1lID0gclVybC5zY2hlbWUoKS50b0xvd2VyKCk7CiAK ICAgICAvLyBHcmFiIHRoZSBjbGllbnQgbWVkaWEgZWxlbWVudApJbmRleDogU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDc4MjYxKQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wMi0xMCAgSHVpIEh1YW5nICA8aHVpLjIuaHVh bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBVUkwgb2YgSFRNTDUgVmlkZW8gRWxlbWVudCBpcyBwZXJjZW50IGVuY29kZWQg YXQgd2Vic2l0ZXMgc3VjaCBhcyB5b3V0dWJlLgorICAgICAgICBJdCBpcyBwZXJjZW50IGVuY29k ZWQgYWdhaW4gYnkgUVVybCBjb25zdHJ1Y3RvciBRVXJsOjpRVXJsKFFTdHJpbmcpLiBUaGlzIGNh dXNlcworICAgICAgICB0aGUgSFRUUCBHRVQgcmVxdWVzdCBmb3IgdGhlIHZpZGVvIHRvIGJlIHJl amVjdGVkIGJ5IHRoZSBzZXJ2aWNlIHByb3ZpZGVyLiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzOTczLgorCisgICAgICAgIFRoZSBidWcgaXMgZml4 ZWQgYnkgY29uc3RydWN0aW5nIFFVcmwgZnJvbSB0aGUgZW5jb2RlZCBVUkwgaW4gCisgICAgICAg IE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRMb2FkLiAKKworICAgICAgICBOZXcgdGVzdCBm dW5jdGlvbiB0c3RfUVdlYlBhZ2U6OmxvYWRIdG1sNVZpZGVvKCkgaXMgYWRkZWQgdG8gbG9hZCBI VE1MIGNvbnRlbnQgd2l0aAorICAgICAgICBIVE1MNSBWaWRlbyBlbGVtZW50LiBBIG5ldyBwdWJs aWMgbWV0aG9kIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1l bnRJZAorICAgICAgICBpcyBhZGRlZCB0byByZXRyaWV2ZSB0aGUgVVJMIG9mIHRoZSBtZWRpYSBj b250ZW50IGZyb20gV2ViQ29yZSBNZWRpYVBsYXllclByaXZhdGVRdC4KKworICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcDoKKyAgICAgICAgKER1bXBS ZW5kZXJUcmVlU3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZCk6CisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaDoKKyAgICAgICAgKiB0 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjps b2FkSHRtbDVWaWRlbyk6CisKIDIwMTEtMDItMTAgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBHb21ib3MuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydFF0LmNwcAkocmV2aXNpb24gNzgyNjkpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtODAsNiArODAsMTEgQEAKICNpbmNsdWRlICJxd2VicGFnZV9wLmgiCiAjaW5jbHVkZSAicXdl YnNjcmlwdHdvcmxkLmgiCiAKKyNpZiBFTkFCTEUoVklERU8pICYmIEVOQUJMRShRVF9NVUxUSU1F RElBKQorI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXll clByaXZhdGVRdC5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBRTWFw PGludCwgUVdlYlNjcmlwdFdvcmxkKj4gbV93b3JsZE1hcDsKQEAgLTk0Miw2ICs5NDcsMzYgQEAg UVN0cmluZ0xpc3QgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OmNvbgogICAgIHJldHVybiBRU3Ry aW5nTGlzdCgpOwogI2VuZGlmCiB9CisKK1FVcmwgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6Om1l ZGlhQ29udGVudFVybEJ5RWxlbWVudElkKFFXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFFTdHJpbmcm IGVsZW1lbnRJZCkKK3sKKyAgICBRVXJsIHJlczsKKworI2lmIEVOQUJMRShWSURFTykgJiYgRU5B QkxFKFFUX01VTFRJTUVESUEpCisgICAgRnJhbWUqIGNvcmVGcmFtZSA9IFFXZWJGcmFtZVByaXZh dGU6OmNvcmUoZnJhbWUpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm4gcmVz OworCisgICAgRG9jdW1lbnQqIGRvYyA9IGNvcmVGcmFtZS0+ZG9jdW1lbnQoKTsKKyAgICBpZiAo IWRvYykKKyAgICAgICAgcmV0dXJuIHJlczsKKworICAgIE5vZGUqIGNvcmVOb2RlID0gZG9jLT5n ZXRFbGVtZW50QnlJZChlbGVtZW50SWQpOworICAgIGlmICghY29yZU5vZGUpCisgICAgICAgIHJl dHVybiByZXM7CisKKyAgICBIVE1MVmlkZW9FbGVtZW50KiB2aWRlb0VsZW1lbnQgPSBzdGF0aWNf Y2FzdDxIVE1MVmlkZW9FbGVtZW50Kj4oY29yZU5vZGUpOworICAgIFBsYXRmb3JtTWVkaWEgcGxh dGZvcm1NZWRpYSA9IHZpZGVvRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpOworICAgIGlmIChwbGF0 Zm9ybU1lZGlhLnR5cGUgIT0gUGxhdGZvcm1NZWRpYTo6UXRNZWRpYVBsYXllclR5cGUpCisgICAg ICAgIHJldHVybiByZXM7CisKKyAgICBNZWRpYVBsYXllclByaXZhdGVRdCogbWVkaWFQbGF5ZXJR dCA9IHN0YXRpY19jYXN0PE1lZGlhUGxheWVyUHJpdmF0ZVF0Kj4ocGxhdGZvcm1NZWRpYS5tZWRp YS5xdE1lZGlhUGxheWVyKTsKKyAgICBpZiAobWVkaWFQbGF5ZXJRdCAmJiBtZWRpYVBsYXllclF0 LT5tZWRpYVBsYXllcigpKQorICAgICAgICByZXMgPSBtZWRpYVBsYXllclF0LT5tZWRpYVBsYXll cigpLT5tZWRpYSgpLmNhbm9uaWNhbFVybCgpOworI2VuZGlmCisKKyAgICByZXR1cm4gcmVzOwor fQogLy8gUHJvdmlkZSBhIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkgd2l0aCBwcmV2aW91c2x5IGV4 cG9ydGVkIHByaXZhdGUgc3ltYm9scyBhcyBvZiBRdFdlYktpdCA0LjYgcmVsZWFzZQogCiB2b2lk IFFXRUJLSVRfRVhQT1JUIHF0X3Jlc3VtZUFjdGl2ZURPTU9iamVjdHMoUVdlYkZyYW1lKiBmcmFt ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVT dXBwb3J0UXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmgJKHJldmlzaW9uIDc4MjY5KQorKysgU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5oCSh3b3JraW5n IGNvcHkpCkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIFFXZWJGcmFtZTsKIGNsYXNzIFFXZWJQYWdl OwogY2xhc3MgUVdlYkhpc3RvcnlJdGVtOwogY2xhc3MgUVdlYlNjcmlwdFdvcmxkOworY2xhc3Mg UVVybDsKIAogZXh0ZXJuIFFNYXA8aW50LCBRV2ViU2NyaXB0V29ybGQqPiBtX3dvcmxkTWFwOwog CkBAIC0xODksNiArMTkwLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBRU3RyaW5nIHJlc3BvbnNl TWltZVR5cGUoUVdlYkZyYW1lKik7CiAgICAgc3RhdGljIHZvaWQgYWRkVVJMVG9SZWRpcmVjdChj b25zdCBRU3RyaW5nJiBvcmlnaW4sIGNvbnN0IFFTdHJpbmcmIGRlc3RpbmF0aW9uKTsKICAgICBz dGF0aWMgUVN0cmluZ0xpc3QgY29udGV4dE1lbnUoUVdlYlBhZ2UqKTsKKyAgICBzdGF0aWMgUVVy bCBtZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZChRV2ViRnJhbWUqLCBjb25zdCBRU3RyaW5nJiBl bGVtZW50SWQpOwogfTsKIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA3ODI1MikKKysrIFNvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODQsNiArODQsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgbG9hZEZpbmlzaGVk KCk7CiAgICAgdm9pZCBhY2NlcHROYXZpZ2F0aW9uUmVxdWVzdFdpdGhOZXdXaW5kb3coKTsKICAg ICB2b2lkIHVzZXJTdHlsZVNoZWV0KCk7CisgICAgdm9pZCBsb2FkSHRtbDVWaWRlbygpOwogICAg IHZvaWQgbW9kaWZpZWQoKTsKICAgICB2b2lkIGNvbnRleHRNZW51Q3Jhc2goKTsKICAgICB2b2lk IHVwZGF0ZVBvc2l0aW9uRGVwZW5kZW50QWN0aW9uc0NyYXNoKCk7CkBAIC00MjcsNiArNDI4LDE1 IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyU3R5bGVTaGVldCgpCiAgICAgUUNPTVBBUkUobmV0 d29ya01hbmFnZXItPnJlcXVlc3RlZFVybHMuYXQoMCksIFFVcmwoImh0dHA6Ly9kb2VzLm5vdC9l eGlzdC5wbmciKSk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbygpCit7 CisgICAgUUJ5dGVBcnJheSB1cmwoImh0dHA6Ly9kb2VzLm5vdC9leGlzdD9hPTElMkNiPTIiKTsK KyAgICBtX3ZpZXctPnNldEh0bWwoIjxwPjx2aWRlbyBpZCA9J3ZpZGVvJyBzcmM9JyIgKyB1cmwg KyAiJyBhdXRvcGxheS8+PC9wPiIpOworICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsKKyAgICBRVXJs IG1VcmwgPSBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6bWVkaWFDb250ZW50VXJsQnlFbGVtZW50 SWQobV9wYWdlLT5tYWluRnJhbWUoKSwgInZpZGVvIik7CisgICAgUUNPTVBBUkUobVVybC50b0Vu Y29kZWQoKSwgdXJsKTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OnZpZXdNb2RlcygpCiB7CiAg ICAgbV92aWV3LT5zZXRIdG1sKCI8Ym9keT48L2JvZHk+Iik7Cg== 82540 2011-02-15 15:47:29 -0800 2011-02-15 19:46:35 -0800 New patch after fixing build problem without Qt Multimedia. Skipping test if Qt Multimedia is not available. bug53973.patch text/plain 7726 hui_huang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4NjI2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMTUgIEh1aSBIdWFu ZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgVVJMIG9mIEhUTUw1IFZpZGVvIEVsZW1lbnQgaXMgcGVy Y2VudCBlbmNvZGVkIGF0IHdlYnNpdGVzIHN1Y2ggYXMgeW91dHViZS4KKyAgICAgICAgSXQgaXMg cGVyY2VudCBlbmNvZGVkIGFnYWluIGJ5IFFVcmwgY29uc3RydWN0b3IgUVVybDo6UVVybChRU3Ry aW5nKS4gVGhpcyBjYXVzZXMKKyAgICAgICAgdGhlIEhUVFAgR0VUIHJlcXVlc3QgZm9yIHRoZSB2 aWRlbyB0byBiZSByZWplY3RlZCBieSB0aGUgc2VydmljZSBwcm92aWRlci4gCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzk3My4KKworICAgICAgICBU aGUgYnVnIGlzIGZpeGVkIGJ5IGNvbnN0cnVjdGluZyBRVXJsIGZyb20gdGhlIGVuY29kZWQgVVJM LgorCisgICAgICAgIE5ldyB0ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1Vmlk ZW8oKSBpcyBhZGRlZCBpbiAKKyAgICAgICAgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVRdDo6Y29tbWl0TG9hZCk6CisKIDIwMTEtMDItMTUgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBl Y2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVR dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv TWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCShyZXZpc2lvbiA3ODYyNSkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTg3LDcgKzE4Nyw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OmNv bW1pdExvYWQoY28KICAgICAgICAgbV93ZWJDb3JlUGxheWVyLT5yZWFkeVN0YXRlQ2hhbmdlZCgp OwogICAgIH0KIAotICAgIGNvbnN0IFFVcmwgclVybCA9IFFVcmwoUVN0cmluZyh1cmwpKTsKKyAg ICBLVVJMIGtVcmwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpOworICAgIGNvbnN0IFFVcmwgclVybCA9 IGtVcmw7CiAgICAgY29uc3QgUVN0cmluZyBzY2hlbWUgPSByVXJsLnNjaGVtZSgpLnRvTG93ZXIo KTsKIAogICAgIC8vIEdyYWIgdGhlIGNsaWVudCBtZWRpYSBlbGVtZW50CkluZGV4OiBTb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNzg2MjYpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDExLTAyLTE1ICBIdWkgSHVhbmcgIDxodWku Mi5odWFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIFVSTCBvZiBIVE1MNSBWaWRlbyBFbGVtZW50IGlzIHBlcmNlbnQgZW5j b2RlZCBhdCB3ZWJzaXRlcyBzdWNoIGFzIHlvdXR1YmUuCisgICAgICAgIEl0IGlzIHBlcmNlbnQg ZW5jb2RlZCBhZ2FpbiBieSBRVXJsIGNvbnN0cnVjdG9yIFFVcmw6OlFVcmwoUVN0cmluZykuIFRo aXMgY2F1c2VzCisgICAgICAgIHRoZSBIVFRQIEdFVCByZXF1ZXN0IGZvciB0aGUgdmlkZW8gdG8g YmUgcmVqZWN0ZWQgYnkgdGhlIHNlcnZpY2UgcHJvdmlkZXIuIAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM5NzMuCisKKyAgICAgICAgVGhlIGJ1ZyBp cyBmaXhlZCBieSBjb25zdHJ1Y3RpbmcgUVVybCBmcm9tIHRoZSBlbmNvZGVkIFVSTCBpbiAKKyAg ICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OmNvbW1pdExvYWQuIAorCisgICAgICAgIE5ldyB0 ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1VmlkZW8oKSBpcyBhZGRlZCB0byBs b2FkIEhUTUwgY29udGVudCB3aXRoCisgICAgICAgIEhUTUw1IFZpZGVvIGVsZW1lbnQuIEEgbmV3 IHB1YmxpYyBtZXRob2QgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6Om1lZGlhQ29udGVudFVybEJ5 RWxlbWVudElkCisgICAgICAgIGlzIGFkZGVkIHRvIHJldHJpZXZlIHRoZSBVUkwgb2YgdGhlIG1l ZGlhIGNvbnRlbnQgZnJvbSBXZWJDb3JlIE1lZGlhUGxheWVyUHJpdmF0ZVF0LgorICAgICAgICBB IG5ldyBtYWNybyBFTkFCTEVfUVRfTVVMVElNRURJQSBpcyBpbnRyb2R1Y2VkIGluIHRlc3RzLnBy aSB0byBtYWtlIHN1cmUgcXdlYnBhZ2UKKyAgICAgICAgdGVzdHMgd2lsbCBidWlsZCBzdWNjZXNz ZnVsbHkgYW5kIHRoZSB0ZXN0IGNhc2UgaXMgc2tpcHBlZCBpZiBRdCBNdWx0aW1lZGlhIGlzIG5v dAorICAgICAgICBhdmFpbGFibGUuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRRdC5jcHA6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6 bWVkaWFDb250ZW50VXJsQnlFbGVtZW50SWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1 bXBSZW5kZXJUcmVlU3VwcG9ydFF0Lmg6CisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1VmlkZW8pOgorICAg ICAgICAqIHRlc3RzL3Rlc3RzLnByaToKKwogMjAxMS0wMi0xNSAgS2VubmV0aCBSdXNzZWxsICA8 a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRl eDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRR dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1w UmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAJKHJldmlzaW9uIDc4NjIzKQorKysgU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgwLDYgKzgwLDExIEBACiAjaW5jbHVkZSAicXdlYnBhZ2VfcC5oIgogI2luY2x1 ZGUgInF3ZWJzY3JpcHR3b3JsZC5oIgogCisjaWYgRU5BQkxFKFZJREVPKSAmJiBFTkFCTEUoUVRf TVVMVElNRURJQSkKKyNpbmNsdWRlICJIVE1MVmlkZW9FbGVtZW50LmgiCisjaW5jbHVkZSAiTWVk aWFQbGF5ZXJQcml2YXRlUXQuaCIKKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK IAogUU1hcDxpbnQsIFFXZWJTY3JpcHRXb3JsZCo+IG1fd29ybGRNYXA7CkBAIC05NTcsNiArOTYy LDM2IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnNldE1pbmltdW0KICAgICBjb3Jl UGFnZS0+c2V0dGluZ3MoKS0+c2V0TWluRE9NVGltZXJJbnRlcnZhbChpbnRlcnZhbCk7CiB9CiAK K1FVcmwgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6Om1lZGlhQ29udGVudFVybEJ5RWxlbWVudElk KFFXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFFTdHJpbmcmIGVsZW1lbnRJZCkKK3sKKyAgICBRVXJs IHJlczsKKworI2lmIEVOQUJMRShWSURFTykgJiYgRU5BQkxFKFFUX01VTFRJTUVESUEpCisgICAg RnJhbWUqIGNvcmVGcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUoZnJhbWUpOworICAgIGlm ICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm4gcmVzOworCisgICAgRG9jdW1lbnQqIGRvYyA9 IGNvcmVGcmFtZS0+ZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvYykKKyAgICAgICAgcmV0dXJuIHJl czsKKworICAgIE5vZGUqIGNvcmVOb2RlID0gZG9jLT5nZXRFbGVtZW50QnlJZChlbGVtZW50SWQp OworICAgIGlmICghY29yZU5vZGUpCisgICAgICAgIHJldHVybiByZXM7CisKKyAgICBIVE1MVmlk ZW9FbGVtZW50KiB2aWRlb0VsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MVmlkZW9FbGVtZW50Kj4o Y29yZU5vZGUpOworICAgIFBsYXRmb3JtTWVkaWEgcGxhdGZvcm1NZWRpYSA9IHZpZGVvRWxlbWVu dC0+cGxhdGZvcm1NZWRpYSgpOworICAgIGlmIChwbGF0Zm9ybU1lZGlhLnR5cGUgIT0gUGxhdGZv cm1NZWRpYTo6UXRNZWRpYVBsYXllclR5cGUpCisgICAgICAgIHJldHVybiByZXM7CisKKyAgICBN ZWRpYVBsYXllclByaXZhdGVRdCogbWVkaWFQbGF5ZXJRdCA9IHN0YXRpY19jYXN0PE1lZGlhUGxh eWVyUHJpdmF0ZVF0Kj4ocGxhdGZvcm1NZWRpYS5tZWRpYS5xdE1lZGlhUGxheWVyKTsKKyAgICBp ZiAobWVkaWFQbGF5ZXJRdCAmJiBtZWRpYVBsYXllclF0LT5tZWRpYVBsYXllcigpKQorICAgICAg ICByZXMgPSBtZWRpYVBsYXllclF0LT5tZWRpYVBsYXllcigpLT5tZWRpYSgpLmNhbm9uaWNhbFVy bCgpOworI2VuZGlmCisKKyAgICByZXR1cm4gcmVzOworfQorCiAvLyBQcm92aWRlIGEgYmFja3dh cmQgY29tcGF0aWJpbGl0eSB3aXRoIHByZXZpb3VzbHkgZXhwb3J0ZWQgcHJpdmF0ZSBzeW1ib2xz IGFzIG9mIFF0V2ViS2l0IDQuNiByZWxlYXNlCiAKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRfcmVz dW1lQWN0aXZlRE9NT2JqZWN0cyhRV2ViRnJhbWUqIGZyYW1lKQpJbmRleDogU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0 UXQuaAkocmV2aXNpb24gNzg2MjMpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcg QEAgY2xhc3MgUVdlYkZyYW1lOwogY2xhc3MgUVdlYlBhZ2U7CiBjbGFzcyBRV2ViSGlzdG9yeUl0 ZW07CiBjbGFzcyBRV2ViU2NyaXB0V29ybGQ7CitjbGFzcyBRVXJsOwogCiBleHRlcm4gUU1hcDxp bnQsIFFXZWJTY3JpcHRXb3JsZCo+IG1fd29ybGRNYXA7CiAKQEAgLTE5Miw2ICsxOTMsOCBAQCBw dWJsaWM6CiAKICAgICBzdGF0aWMgZG91YmxlIGRlZmF1bHRNaW5pbXVtVGltZXJJbnRlcnZhbCgp OyAvLyBOb3QgcmVhbGx5IHRpZWQgdG8gV2ViVmlldwogICAgIHN0YXRpYyB2b2lkIHNldE1pbmlt dW1UaW1lckludGVydmFsKFFXZWJQYWdlKiwgZG91YmxlKTsKKworICAgIHN0YXRpYyBRVXJsIG1l ZGlhQ29udGVudFVybEJ5RWxlbWVudElkKFFXZWJGcmFtZSosIGNvbnN0IFFTdHJpbmcmIGVsZW1l bnRJZCk7CiB9OwogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvdGVzdHMu cHJpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvdGVzdHMucHJpCShyZXZp c2lvbiA3ODYyMykKKysrIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvdGVzdHMucHJpCSh3b3JraW5n IGNvcHkpCkBAIC01LDYgKzUsMTUgQEAgVlBBVEggKz0gJCRfUFJPX0ZJTEVfUFdEXwogIyBBZGQg dGhlIHRzdF8gcHJlZml4LCBJbiBRVERJUl9idWlsZCBpdCdzIGRvbmUgYnkgcXR0ZXN0X3A0LnBy ZgogQ09ORklHKFFURElSX2J1aWxkKSB7IGxvYWQocXR0ZXN0X3A0KSB9CiBFTFNFIHsgVEFSR0VU ID0gdHN0XyQkVEFSR0VUIH0KKworIyBMb2FkIG1vYmlsaXR5Y29uZmlnIGlmIFF0IE1vYmlsaXR5 IGlzIGF2YWlsYWJsZQorbG9hZChtb2JpbGl0eWNvbmZpZywgdHJ1ZSkKK2NvbnRhaW5zKE1PQklM SVRZX0NPTkZJRywgbXVsdGltZWRpYSkgeworICAgICMgVGhpcyBkZWZpbmUgaXMgdXNlZCBieSB0 ZXN0cyBkZXBlbmRpbmcgb24gUXQgTXVsdGltZWRpYQorICAgIERFRklORVMgLT0gRU5BQkxFX1FU X01VTFRJTUVESUE9MAorICAgIERFRklORVMgKz0gRU5BQkxFX1FUX01VTFRJTUVESUE9MQorfQor CiBTT1VSQ0VTICs9ICQke1RBUkdFVH0uY3BwCiBJTkNMVURFUEFUSCArPSBcCiAgICAgJCRQV0Qg XApJbmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcAkocmV2aXNpb24gNzg2MjMpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1LDcgQEAgcHJp dmF0ZSBzbG90czoKICAgICB2b2lkIGxvYWRGaW5pc2hlZCgpOwogICAgIHZvaWQgYWNjZXB0TmF2 aWdhdGlvblJlcXVlc3RXaXRoTmV3V2luZG93KCk7CiAgICAgdm9pZCB1c2VyU3R5bGVTaGVldCgp OworICAgIHZvaWQgbG9hZEh0bWw1VmlkZW8oKTsKICAgICB2b2lkIG1vZGlmaWVkKCk7CiAgICAg dm9pZCBjb250ZXh0TWVudUNyYXNoKCk7CiAgICAgdm9pZCB1cGRhdGVQb3NpdGlvbkRlcGVuZGVu dEFjdGlvbnNDcmFzaCgpOwpAQCAtNDI5LDYgKzQzMCwxOSBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6 dXNlclN0eWxlU2hlZXQoKQogICAgIFFDT01QQVJFKG5ldHdvcmtNYW5hZ2VyLT5yZXF1ZXN0ZWRV cmxzLmF0KDApLCBRVXJsKCJodHRwOi8vZG9lcy5ub3QvZXhpc3QucG5nIikpOwogfQogCit2b2lk IHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1VmlkZW8oKQoreworI2lmIGRlZmluZWQoRU5BQkxFX1FU X01VTFRJTUVESUEpICYmIEVOQUJMRV9RVF9NVUxUSU1FRElBCisgICAgUUJ5dGVBcnJheSB1cmwo Imh0dHA6Ly9kb2VzLm5vdC9leGlzdD9hPTElMkNiPTIiKTsKKyAgICBtX3ZpZXctPnNldEh0bWwo IjxwPjx2aWRlbyBpZCA9J3ZpZGVvJyBzcmM9JyIgKyB1cmwgKyAiJyBhdXRvcGxheS8+PC9wPiIp OworICAgIFFUZXN0OjpxV2FpdCgyMDAwKTsKKyAgICBRVXJsIG1VcmwgPSBEdW1wUmVuZGVyVHJl ZVN1cHBvcnRRdDo6bWVkaWFDb250ZW50VXJsQnlFbGVtZW50SWQobV9wYWdlLT5tYWluRnJhbWUo KSwgInZpZGVvIik7CisgICAgUUNPTVBBUkUobVVybC50b0VuY29kZWQoKSwgdXJsKTsKKyNlbHNl CisgICAgUVNLSVAoIlRoaXMgdGVzdCByZXF1aXJlcyBRdCBNdWx0aW1lZGlhIiwgU2tpcEFsbCk7 CisjZW5kaWYKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OnZpZXdNb2RlcygpCiB7CiAgICAgbV92 aWV3LT5zZXRIdG1sKCI8Ym9keT48L2JvZHk+Iik7Cg== 82575 2011-02-15 19:46:35 -0800 2011-02-17 05:40:01 -0800 New patch to resolve conflicts bug53973.patch text/plain 7674 hui_huang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4Njc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMTUgIEh1aSBIdWFu ZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgVVJMIG9mIEhUTUw1IFZpZGVvIEVsZW1lbnQgaXMgcGVy Y2VudCBlbmNvZGVkIGF0IHdlYnNpdGVzIHN1Y2ggYXMgeW91dHViZS4KKyAgICAgICAgSXQgaXMg cGVyY2VudCBlbmNvZGVkIGFnYWluIGJ5IFFVcmwgY29uc3RydWN0b3IgUVVybDo6UVVybChRU3Ry aW5nKS4gVGhpcyBjYXVzZXMKKyAgICAgICAgdGhlIEhUVFAgR0VUIHJlcXVlc3QgZm9yIHRoZSB2 aWRlbyB0byBiZSByZWplY3RlZCBieSB0aGUgc2VydmljZSBwcm92aWRlci4gCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzk3My4KKworICAgICAgICBU aGUgYnVnIGlzIGZpeGVkIGJ5IGNvbnN0cnVjdGluZyBRVXJsIGZyb20gdGhlIGVuY29kZWQgVVJM LgorCisgICAgICAgIE5ldyB0ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1Vmlk ZW8oKSBpcyBhZGRlZCBpbiAKKyAgICAgICAgU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVRdDo6Y29tbWl0TG9hZCk6CisKIDIwMTEtMDItMTUgIENocmlzIFJvZ2VycyAgPGNyb2dlcnNA Z29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVR dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv TWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCShyZXZpc2lvbiA3ODY3NCkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTg3LDcgKzE4Nyw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OmNv bW1pdExvYWQoY28KICAgICAgICAgbV93ZWJDb3JlUGxheWVyLT5yZWFkeVN0YXRlQ2hhbmdlZCgp OwogICAgIH0KIAotICAgIGNvbnN0IFFVcmwgclVybCA9IFFVcmwoUVN0cmluZyh1cmwpKTsKKyAg ICBLVVJMIGtVcmwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpOworICAgIGNvbnN0IFFVcmwgclVybCA9 IGtVcmw7CiAgICAgY29uc3QgUVN0cmluZyBzY2hlbWUgPSByVXJsLnNjaGVtZSgpLnRvTG93ZXIo KTsKIAogICAgIC8vIEdyYWIgdGhlIGNsaWVudCBtZWRpYSBlbGVtZW50CkluZGV4OiBTb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNzg2NzQpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDExLTAyLTE1ICBIdWkgSHVhbmcgIDxodWku Mi5odWFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIFVSTCBvZiBIVE1MNSBWaWRlbyBFbGVtZW50IGlzIHBlcmNlbnQgZW5j b2RlZCBhdCB3ZWJzaXRlcyBzdWNoIGFzIHlvdXR1YmUuCisgICAgICAgIEl0IGlzIHBlcmNlbnQg ZW5jb2RlZCBhZ2FpbiBieSBRVXJsIGNvbnN0cnVjdG9yIFFVcmw6OlFVcmwoUVN0cmluZykuIFRo aXMgY2F1c2VzCisgICAgICAgIHRoZSBIVFRQIEdFVCByZXF1ZXN0IGZvciB0aGUgdmlkZW8gdG8g YmUgcmVqZWN0ZWQgYnkgdGhlIHNlcnZpY2UgcHJvdmlkZXIuIAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM5NzMuCisKKyAgICAgICAgVGhlIGJ1ZyBp cyBmaXhlZCBieSBjb25zdHJ1Y3RpbmcgUVVybCBmcm9tIHRoZSBlbmNvZGVkIFVSTCBpbiAKKyAg ICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlUXQ6OmNvbW1pdExvYWQuIAorCisgICAgICAgIE5ldyB0 ZXN0IGZ1bmN0aW9uIHRzdF9RV2ViUGFnZTo6bG9hZEh0bWw1VmlkZW8oKSBpcyBhZGRlZCB0byBs b2FkIEhUTUwgY29udGVudCB3aXRoCisgICAgICAgIEhUTUw1IFZpZGVvIGVsZW1lbnQuIEEgbmV3 IHB1YmxpYyBtZXRob2QgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6Om1lZGlhQ29udGVudFVybEJ5 RWxlbWVudElkCisgICAgICAgIGlzIGFkZGVkIHRvIHJldHJpZXZlIHRoZSBVUkwgb2YgdGhlIG1l ZGlhIGNvbnRlbnQgZnJvbSBXZWJDb3JlIE1lZGlhUGxheWVyUHJpdmF0ZVF0LgorICAgICAgICBB IG5ldyBtYWNybyBFTkFCTEVfUVRfTVVMVElNRURJQSBpcyBpbnRyb2R1Y2VkIGluIHRlc3RzLnBy aSB0byBtYWtlIHN1cmUgdGhhdCB0aGUgdGVzdAorICAgICAgICBpcyBza2lwcGVkIGlmIFF0IE11 bHRpbWVkaWEgaXMgbm90IGF2YWlsYWJsZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1 bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9y dFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaDoKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90 c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbyk6 CisgICAgICAgICogdGVzdHMvdGVzdHMucHJpOgorCiAyMDExLTAyLTE1ICBLZW5uZXRoIFJ1c3Nl bGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIu CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAkocmV2aXNpb24gNzg2NzQpCisrKyBTb3VyY2Uv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtODAsNiArODAsMTEgQEAKICNpbmNsdWRlICJxd2VicGFnZV9wLmgiCiAj aW5jbHVkZSAicXdlYnNjcmlwdHdvcmxkLmgiCiAKKyNpZiBFTkFCTEUoVklERU8pICYmIEVOQUJM RShRVF9NVUxUSU1FRElBKQorI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKKyNpbmNsdWRl ICJNZWRpYVBsYXllclByaXZhdGVRdC5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogCiBRTWFwPGludCwgUVdlYlNjcmlwdFdvcmxkKj4gbV93b3JsZE1hcDsKQEAgLTk1Nyw2 ICs5NjIsMzYgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6c2V0TWluaW11bQogICAg IGNvcmVQYWdlLT5zZXR0aW5ncygpLT5zZXRNaW5ET01UaW1lckludGVydmFsKGludGVydmFsKTsK IH0KIAorUVVybCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6bWVkaWFDb250ZW50VXJsQnlFbGVt ZW50SWQoUVdlYkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0cmluZyYgZWxlbWVudElkKQoreworICAg IFFVcmwgcmVzOworCisjaWYgRU5BQkxFKFZJREVPKSAmJiBFTkFCTEUoUVRfTVVMVElNRURJQSkK KyAgICBGcmFtZSogY29yZUZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShmcmFtZSk7Cisg ICAgaWYgKCFjb3JlRnJhbWUpCisgICAgICAgIHJldHVybiByZXM7CisKKyAgICBEb2N1bWVudCog ZG9jID0gY29yZUZyYW1lLT5kb2N1bWVudCgpOworICAgIGlmICghZG9jKQorICAgICAgICByZXR1 cm4gcmVzOworCisgICAgTm9kZSogY29yZU5vZGUgPSBkb2MtPmdldEVsZW1lbnRCeUlkKGVsZW1l bnRJZCk7CisgICAgaWYgKCFjb3JlTm9kZSkKKyAgICAgICAgcmV0dXJuIHJlczsKKworICAgIEhU TUxWaWRlb0VsZW1lbnQqIHZpZGVvRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxWaWRlb0VsZW1l bnQqPihjb3JlTm9kZSk7CisgICAgUGxhdGZvcm1NZWRpYSBwbGF0Zm9ybU1lZGlhID0gdmlkZW9F bGVtZW50LT5wbGF0Zm9ybU1lZGlhKCk7CisgICAgaWYgKHBsYXRmb3JtTWVkaWEudHlwZSAhPSBQ bGF0Zm9ybU1lZGlhOjpRdE1lZGlhUGxheWVyVHlwZSkKKyAgICAgICAgcmV0dXJuIHJlczsKKwor ICAgIE1lZGlhUGxheWVyUHJpdmF0ZVF0KiBtZWRpYVBsYXllclF0ID0gc3RhdGljX2Nhc3Q8TWVk aWFQbGF5ZXJQcml2YXRlUXQqPihwbGF0Zm9ybU1lZGlhLm1lZGlhLnF0TWVkaWFQbGF5ZXIpOwor ICAgIGlmIChtZWRpYVBsYXllclF0ICYmIG1lZGlhUGxheWVyUXQtPm1lZGlhUGxheWVyKCkpCisg ICAgICAgIHJlcyA9IG1lZGlhUGxheWVyUXQtPm1lZGlhUGxheWVyKCktPm1lZGlhKCkuY2Fub25p Y2FsVXJsKCk7CisjZW5kaWYKKworICAgIHJldHVybiByZXM7Cit9CisKIC8vIFByb3ZpZGUgYSBi YWNrd2FyZCBjb21wYXRpYmlsaXR5IHdpdGggcHJldmlvdXNseSBleHBvcnRlZCBwcml2YXRlIHN5 bWJvbHMgYXMgb2YgUXRXZWJLaXQgNC42IHJlbGVhc2UKIAogdm9pZCBRV0VCS0lUX0VYUE9SVCBx dF9yZXN1bWVBY3RpdmVET01PYmplY3RzKFFXZWJGcmFtZSogZnJhbWUpCkluZGV4OiBTb3VyY2Uv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1 cHBvcnRRdC5oCShyZXZpc2lvbiA3ODY3NCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsNiAr NTEsNyBAQCBjbGFzcyBRV2ViRnJhbWU7CiBjbGFzcyBRV2ViUGFnZTsKIGNsYXNzIFFXZWJIaXN0 b3J5SXRlbTsKIGNsYXNzIFFXZWJTY3JpcHRXb3JsZDsKK2NsYXNzIFFVcmw7CiAKIGV4dGVybiBR TWFwPGludCwgUVdlYlNjcmlwdFdvcmxkKj4gbV93b3JsZE1hcDsKIApAQCAtMTkyLDYgKzE5Myw4 IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBkb3VibGUgZGVmYXVsdE1pbmltdW1UaW1lckludGVy dmFsKCk7IC8vIE5vdCByZWFsbHkgdGllZCB0byBXZWJWaWV3CiAgICAgc3RhdGljIHZvaWQgc2V0 TWluaW11bVRpbWVySW50ZXJ2YWwoUVdlYlBhZ2UqLCBkb3VibGUpOworCisgICAgc3RhdGljIFFV cmwgbWVkaWFDb250ZW50VXJsQnlFbGVtZW50SWQoUVdlYkZyYW1lKiwgY29uc3QgUVN0cmluZyYg ZWxlbWVudElkKTsKIH07CiAKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0cy90 ZXN0cy5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy90ZXN0cy5wcmkJ KHJldmlzaW9uIDc4Njc0KQorKysgU291cmNlL1dlYktpdC9xdC90ZXN0cy90ZXN0cy5wcmkJKHdv cmtpbmcgY29weSkKQEAgLTUsNiArNSwxNSBAQCBWUEFUSCArPSAkJF9QUk9fRklMRV9QV0RfCiAj IEFkZCB0aGUgdHN0XyBwcmVmaXgsIEluIFFURElSX2J1aWxkIGl0J3MgZG9uZSBieSBxdHRlc3Rf cDQucHJmCiBDT05GSUcoUVRESVJfYnVpbGQpIHsgbG9hZChxdHRlc3RfcDQpIH0KIEVMU0UgeyBU QVJHRVQgPSB0c3RfJCRUQVJHRVQgfQorCisjIExvYWQgbW9iaWxpdHljb25maWcgaWYgUXQgTW9i aWxpdHkgaXMgYXZhaWxhYmxlCitsb2FkKG1vYmlsaXR5Y29uZmlnLCB0cnVlKQorY29udGFpbnMo TU9CSUxJVFlfQ09ORklHLCBtdWx0aW1lZGlhKSB7CisgICAgIyBUaGlzIGRlZmluZSBpcyB1c2Vk IGJ5IHRlc3RzIGRlcGVuZGluZyBvbiBRdCBNdWx0aW1lZGlhCisgICAgREVGSU5FUyAtPSBFTkFC TEVfUVRfTVVMVElNRURJQT0wCisgICAgREVGSU5FUyArPSBFTkFCTEVfUVRfTVVMVElNRURJQT0x Cit9CisKIFNPVVJDRVMgKz0gJCR7VEFSR0VUfS5jcHAKIElOQ0xVREVQQVRIICs9IFwKICAgICAk JFBXRCBcCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFn ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA3ODY3NCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsNyBA QCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgbG9hZEZpbmlzaGVkKCk7CiAgICAgdm9pZCBhY2Nl cHROYXZpZ2F0aW9uUmVxdWVzdFdpdGhOZXdXaW5kb3coKTsKICAgICB2b2lkIHVzZXJTdHlsZVNo ZWV0KCk7CisgICAgdm9pZCBsb2FkSHRtbDVWaWRlbygpOwogICAgIHZvaWQgbW9kaWZpZWQoKTsK ICAgICB2b2lkIGNvbnRleHRNZW51Q3Jhc2goKTsKICAgICB2b2lkIHVwZGF0ZVBvc2l0aW9uRGVw ZW5kZW50QWN0aW9uc0NyYXNoKCk7CkBAIC00MjksNiArNDMwLDE5IEBAIHZvaWQgdHN0X1FXZWJQ YWdlOjp1c2VyU3R5bGVTaGVldCgpCiAgICAgUUNPTVBBUkUobmV0d29ya01hbmFnZXItPnJlcXVl c3RlZFVybHMuYXQoMCksIFFVcmwoImh0dHA6Ly9kb2VzLm5vdC9leGlzdC5wbmciKSk7CiB9CiAK K3ZvaWQgdHN0X1FXZWJQYWdlOjpsb2FkSHRtbDVWaWRlbygpCit7CisjaWYgZGVmaW5lZChFTkFC TEVfUVRfTVVMVElNRURJQSkgJiYgRU5BQkxFX1FUX01VTFRJTUVESUEKKyAgICBRQnl0ZUFycmF5 IHVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0P2E9MSUyQ2I9MiIpOworICAgIG1fdmlldy0+c2V0 SHRtbCgiPHA+PHZpZGVvIGlkID0ndmlkZW8nIHNyYz0nIiArIHVybCArICInIGF1dG9wbGF5Lz48 L3A+Iik7CisgICAgUVRlc3Q6OnFXYWl0KDIwMDApOworICAgIFFVcmwgbVVybCA9IER1bXBSZW5k ZXJUcmVlU3VwcG9ydFF0OjptZWRpYUNvbnRlbnRVcmxCeUVsZW1lbnRJZChtX3BhZ2UtPm1haW5G cmFtZSgpLCAidmlkZW8iKTsKKyAgICBRQ09NUEFSRShtVXJsLnRvRW5jb2RlZCgpLCB1cmwpOwor I2Vsc2UKKyAgICBRU0tJUCgiVGhpcyB0ZXN0IHJlcXVpcmVzIFF0IE11bHRpbWVkaWEiLCBTa2lw QWxsKTsKKyNlbmRpZgorfQorCiB2b2lkIHRzdF9RV2ViUGFnZTo6dmlld01vZGVzKCkKIHsKICAg ICBtX3ZpZXctPnNldEh0bWwoIjxib2R5PjwvYm9keT4iKTsK