43767 2010-08-09 20:56:38 -0700 [EFL]REGRESSION(65021) need to fix build break 2010-08-10 22:02:29 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 ryuan.choi webkit-unassigned antognolli+webkit commit-queue eric gyuyoung.kim lucas.de.marchi oldest_to_newest 262479 0 ryuan.choi 2010-08-09 20:56:38 -0700 we need to fix build break 262482 1 63973 ryuan.choi 2010-08-09 21:02:23 -0700 Created attachment 63973 Patch 262497 2 63973 commit-queue 2010-08-09 22:31:56 -0700 Comment on attachment 63973 Patch Rejecting patch 63973 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Gavin Barraclough', u'--force']" exit_code: 1 Parsed 3 diffs from patch file(s). patching file WebKit/efl/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/efl/ewk/ewk_frame.cpp Hunk #1 FAILED at 1946. 1 out of 1 hunk FAILED -- saving rejects to file WebKit/efl/ewk/ewk_frame.cpp.rej patching file WebKit/efl/ewk/ewk_view.cpp Hunk #2 succeeded at 1350 with fuzz 2. Hunk #3 FAILED at 2528. 1 out of 3 hunks FAILED -- saving rejects to file WebKit/efl/ewk/ewk_view.cpp.rej Full output: http://queues.webkit.org/results/3714011 262512 3 63977 ryuan.choi 2010-08-09 23:38:13 -0700 Created attachment 63977 Patch 262516 4 63978 ryuan.choi 2010-08-09 23:45:21 -0700 Created attachment 63978 Patch 262519 5 63978 eric 2010-08-09 23:57:35 -0700 Comment on attachment 63978 Patch WebKit/efl/ewk/ewk_frame.cpp:1949 + WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually) We generally use WebCore::String instead of WTF::String directly. I guess it doesn't matter much. 262530 6 ryuan.choi 2010-08-10 00:33:40 -0700 (In reply to comment #5) > (From update of attachment 63978 [details]) > WebKit/efl/ewk/ewk_frame.cpp:1949 > + WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually) > We generally use WebCore::String instead of WTF::String directly. I guess it doesn't matter much. I believe r65021 changes WebCore::String. below is a part of r65021 Index: WebKit/efl/ewk/ewk_settings.cpp =================================================================== --- WebKit/efl/ewk/ewk_settings.cpp (revision 65020) +++ WebKit/efl/ewk/ewk_settings.cpp (working copy) @@ -67,7 +67,7 @@ uint64_t ewk_settings_web_database_defau void ewk_settings_web_database_path_set(const char *path) { #if ENABLE(DATABASE) - WebCore::String corePath = WebCore::String::fromUTF8(path); + WTF::String corePath = WTF::String::fromUTF8(path); WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(corePath); #endif } 262675 7 63978 commit-queue 2010-08-10 07:36:53 -0700 Comment on attachment 63978 Patch Rejecting patch 63978 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--force']" exit_code: 1 Parsed 3 diffs from patch file(s). patching file WebKit/efl/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/efl/ewk/ewk_frame.cpp Hunk #1 FAILED at 1946. 1 out of 1 hunk FAILED -- saving rejects to file WebKit/efl/ewk/ewk_frame.cpp.rej patching file WebKit/efl/ewk/ewk_view.cpp Hunk #2 succeeded at 1350 with fuzz 2. Hunk #3 FAILED at 2528. 1 out of 3 hunks FAILED -- saving rejects to file WebKit/efl/ewk/ewk_view.cpp.rej Full output: http://queues.webkit.org/results/3771023 262950 8 gyuyoung.kim 2010-08-10 18:34:25 -0700 Hello Ryuan, Please use "check-webkit-style" script before uploading your patch. The script is located in WebKitTools/Scripts. You should test your patch using the script before uploading your patch. 262952 9 eric 2010-08-10 18:36:50 -0700 webkit-patch upload also runs check-webkit-style for you when uploading a patch. :) 262959 10 ryuan.choi 2010-08-10 18:51:11 -0700 (In reply to comment #8) > Hello Ryuan, > > Please use "check-webkit-style" script before uploading your patch. > The script is located in WebKitTools/Scripts. > > You should test your patch using the script before uploading your patch. I use webkit-patch which include check-webkit-style. so I checked that script. I don't know why It was failed :( 262960 11 ryuan.choi 2010-08-10 18:54:04 -0700 (In reply to comment #9) > webkit-patch upload also runs check-webkit-style for you when uploading a patch. :) hello eric, what do I need to know for this patch to land? I can't know why it was failed. It was no problem in my environment although getting latest. 262963 12 eric 2010-08-10 19:02:44 -0700 It failed because it failed to apply. I think you need to upload a new patch which applies to top of tree. 262972 13 ryuan.choi 2010-08-10 19:28:18 -0700 (In reply to comment #12) > It failed because it failed to apply. I think you need to upload a new patch which applies to top of tree. Ok, I'll create patch from scratch after getting latest. 262976 14 64067 ryuan.choi 2010-08-10 19:44:09 -0700 Created attachment 64067 Patch 262990 15 64067 commit-queue 2010-08-10 22:02:23 -0700 Comment on attachment 64067 Patch Clearing flags on attachment: 64067 Committed r65122: <http://trac.webkit.org/changeset/65122> 262991 16 commit-queue 2010-08-10 22:02:29 -0700 All reviewed patches have been landed. Closing bug. 63973 2010-08-09 21:02:23 -0700 2010-08-09 23:38:08 -0700 Patch bug-43767-20100810130219.patch text/plain 3696 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTA0NykKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDkgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdUkVHUkVTU0lPTig2NTAyMSkgbmVlZCB0byBmaXggYnVpbGQgYnJlYWsK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzY3CisK KyAgICAgICAgUmVtb3ZlIEF0b21pY1N0cmluZ1dURiBhbmQgY2hhbmdlIG5hbWVzcGFjZSBUZXh0 Q2FzZUluc2Vuc2l0aXZlLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAgICAg IChld2tfZnJhbWVfcGx1Z2luX2NyZWF0ZSk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoK KyAgICAgICAgKGV3a192aWV3X3RleHRfc2VhcmNoKToKKyAgICAgICAgKGV3a192aWV3X3RleHRf bWF0Y2hlc19tYXJrKToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9jdXJzaXZlX3Nl dCk6CisKIDIwMTAtMDgtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcKSW5kZXg6IFdlYktp dC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdr X2ZyYW1lLmNwcAkocmV2aXNpb24gNjUwMzQpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTQ2LDcgKzE5NDYsNyBAQCB2b2lkIGV3a19mcmFtZV9m b3JjZV9sYXlvdXQoRXZhc19PYmplY3QqCiAgICAgICAgIHZpZXctPmZvcmNlTGF5b3V0KHRydWUp OwogfQogCi1XVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2lu X2NyZWF0ZShFdmFzX09iamVjdCogbywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6 ZSwgV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktV UkwmIHVybCwgY29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25z dCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmlu Z1dURjo6U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCitXVEY6OlBhc3NSZWZQ dHI8V2ViQ29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0ZShFdmFzX09iamVjdCog bywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2ViQ29yZTo6SFRNTFBsdWdJ bkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVybCwgY29uc3QgV1RGOjpW ZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0 cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9h ZE1hbnVhbGx5KQogewogICAgIHJldHVybiAwOwogfQpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2 aXNpb24gNjUwMzQpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEzMTgsMTMgKzEzMTgsMTMgQEAgRWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNo KGNvbnN0IEV2YQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFM U0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxT RSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHN0cmluZywgRUlOQV9GQUxT RSk7Ci0gICAgV2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CisgICAgV1RG OjpUZXh0Q2FzZVNlbnNpdGl2aXR5IHNlbnNpdGl2ZTsKICAgICBXZWJDb3JlOjpGaW5kRGlyZWN0 aW9uIGRpcmVjdGlvbjsKIAogICAgIGlmIChjYXNlX3NlbnNpdGl2ZSkKLSAgICAgICAgc2Vuc2l0 aXZlID0gV2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdmU7CisgICAgICAgIHNlbnNpdGl2ZSA9IFdU Rjo6VGV4dENhc2VTZW5zaXRpdmU7CiAgICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXZWJD b3JlOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOworICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRleHRD YXNlSW5zZW5zaXRpdmU7CiAKICAgICBpZiAoZm9yd2FyZCkKICAgICAgICAgZGlyZWN0aW9uID0g V2ViQ29yZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7CkBAIC0xMzUwLDEyICsxMzUwLDEyIEBAIHVu c2lnbmVkIGludCBld2tfdmlld190ZXh0X21hdGNoZXNfbWFyaygKICAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c2QsIHByaXYsIDApOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcs IDApOwotICAgIFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOworICAgIFdU Rjo6VGV4dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CiAKICAgICBpZiAoY2FzZV9zZW5zaXRp dmUpCi0gICAgICAgIHNlbnNpdGl2ZSA9IFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZlOworICAg ICAgICBzZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlU2Vuc2l0aXZlOwogICAgIGVsc2UKLSAgICAg ICAgc2Vuc2l0aXZlID0gV2ViQ29yZTo6VGV4dENhc2VJbnNlbnNpdGl2ZTsKKyAgICAgICAgc2Vu c2l0aXZlID0gV1RGOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOwogCiAgICAgcmV0dXJuIHByaXYtPnBh Z2UtPm1hcmtBbGxNYXRjaGVzRm9yVGV4dChXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwg c2Vuc2l0aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKIH0KQEAgLTI1MjgsNyArMjUyOCw3IEBAIEVp bmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2ZvbnRfY3Vyc2l2ZV8KICAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9P Ul9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChlaW5hX3N0cmluZ3NoYXJl X3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkgewotICAgICAg ICBXVEY6OkF0b21pY1N0cmluZ1dURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJv bVVURjgoZmFtaWx5KTsKKyAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5n Ojpmcm9tVVRGOChmYW1pbHkpOwogICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRDdXJz aXZlRm9udEZhbWlseShzKTsKICAgICB9CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsK 63977 2010-08-09 23:38:13 -0700 2010-08-09 23:45:11 -0700 Patch bug-43767-20100810153811.patch text/plain 3690 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTA1MikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDkgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgorCisgICAg ICAgIFtFRkxdUkVHUkVTU0lPTig2NTAyMSkgbmVlZCB0byBmaXggYnVpbGQgYnJlYWsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzY3CisKKyAgICAg ICAgUmVtb3ZlIEF0b21pY1N0cmluZ1dURiBhbmQgY2hhbmdlIG5hbWVzcGFjZSBUZXh0Q2FzZUlu c2Vuc2l0aXZlLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAgICAgIChld2tf ZnJhbWVfcGx1Z2luX2NyZWF0ZSk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a192aWV3X3RleHRfc2VhcmNoKToKKyAgICAgICAgKGV3a192aWV3X3RleHRfbWF0Y2hl c19tYXJrKToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9jdXJzaXZlX3NldCk6CisK IDIwMTAtMDgtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcKSW5kZXg6IFdlYktpdC9lZmwv ZXdrL2V3a19mcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1l LmNwcAkocmV2aXNpb24gNjUwNTIpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTQ2LDcgKzE5NDYsNyBAQCB2b2lkIGV3a19mcmFtZV9mb3JjZV9s YXlvdXQoRXZhc19PYmplY3QqCiAgICAgICAgIHZpZXctPmZvcmNlTGF5b3V0KHRydWUpOwogfQog Ci1XVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0 ZShFdmFzX09iamVjdCogbywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2Vi Q29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVy bCwgY29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6 OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZ1dURjo6 U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCitXVEY6OlBhc3NSZWZQdHI8V2Vi Q29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0ZShFdmFzX09iamVjdCogbywgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1l bnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVybCwgY29uc3QgV1RGOjpWZWN0b3I8 V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4m IHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVh bGx5KQogewogICAgIHJldHVybiAwOwogfQpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24g NjUwNTIpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzMTgsMTMgKzEzMTgsMTMgQEAgRWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNoKGNvbnN0 IEV2YQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwog ICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHN0cmluZywgRUlOQV9GQUxTRSk7Ci0g ICAgV2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CisgICAgV1RGOjpUZXh0 Q2FzZVNlbnNpdGl2aXR5IHNlbnNpdGl2ZTsKICAgICBXZWJDb3JlOjpGaW5kRGlyZWN0aW9uIGRp cmVjdGlvbjsKIAogICAgIGlmIChjYXNlX3NlbnNpdGl2ZSkKLSAgICAgICAgc2Vuc2l0aXZlID0g V2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdmU7CisgICAgICAgIHNlbnNpdGl2ZSA9IFdURjo6VGV4 dENhc2VTZW5zaXRpdmU7CiAgICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXZWJDb3JlOjpU ZXh0Q2FzZUluc2Vuc2l0aXZlOworICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlSW5z ZW5zaXRpdmU7CiAKICAgICBpZiAoZm9yd2FyZCkKICAgICAgICAgZGlyZWN0aW9uID0gV2ViQ29y ZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7CkBAIC0xMzUwLDEyICsxMzUwLDEyIEBAIHVuc2lnbmVk IGludCBld2tfdmlld190ZXh0X21hdGNoZXNfbWFyaygKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHBy aXYsIDApOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcsIDApOwot ICAgIFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOworICAgIFdURjo6VGV4 dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CiAKICAgICBpZiAoY2FzZV9zZW5zaXRpdmUpCi0g ICAgICAgIHNlbnNpdGl2ZSA9IFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZlOworICAgICAgICBz ZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlU2Vuc2l0aXZlOwogICAgIGVsc2UKLSAgICAgICAgc2Vu c2l0aXZlID0gV2ViQ29yZTo6VGV4dENhc2VJbnNlbnNpdGl2ZTsKKyAgICAgICAgc2Vuc2l0aXZl ID0gV1RGOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOwogCiAgICAgcmV0dXJuIHByaXYtPnBhZ2UtPm1h cmtBbGxNYXRjaGVzRm9yVGV4dChXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgc2Vuc2l0 aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKIH0KQEAgLTI1MjgsNyArMjUyOCw3IEBAIEVpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX2ZvbnRfY3Vyc2l2ZV8KICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxh Y2UoJnByaXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkgewotICAgICAgICBXVEY6 OkF0b21pY1N0cmluZ1dURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgo ZmFtaWx5KTsKKyAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9t VVRGOChmYW1pbHkpOwogICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRDdXJzaXZlRm9u dEZhbWlseShzKTsKICAgICB9CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsK 63978 2010-08-09 23:45:21 -0700 2010-08-10 19:44:02 -0700 Patch bug-43767-20100810154519.patch text/plain 3690 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTA1MikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDkgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgorCisgICAg ICAgIFtFRkxdUkVHUkVTU0lPTig2NTAyMSkgbmVlZCB0byBmaXggYnVpbGQgYnJlYWsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzY3CisKKyAgICAg ICAgUmVtb3ZlIEF0b21pY1N0cmluZ1dURiBhbmQgY2hhbmdlIG5hbWVzcGFjZSBUZXh0Q2FzZUlu c2Vuc2l0aXZlLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAgICAgIChld2tf ZnJhbWVfcGx1Z2luX2NyZWF0ZSk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a192aWV3X3RleHRfc2VhcmNoKToKKyAgICAgICAgKGV3a192aWV3X3RleHRfbWF0Y2hl c19tYXJrKToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9jdXJzaXZlX3NldCk6CisK IDIwMTAtMDgtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcKSW5kZXg6IFdlYktpdC9lZmwv ZXdrL2V3a19mcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1l LmNwcAkocmV2aXNpb24gNjUwNTIpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTQ2LDcgKzE5NDYsNyBAQCB2b2lkIGV3a19mcmFtZV9mb3JjZV9s YXlvdXQoRXZhc19PYmplY3QqCiAgICAgICAgIHZpZXctPmZvcmNlTGF5b3V0KHRydWUpOwogfQog Ci1XVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0 ZShFdmFzX09iamVjdCogbywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2Vi Q29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVy bCwgY29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6 OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZ1dURjo6 U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCitXVEY6OlBhc3NSZWZQdHI8V2Vi Q29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0ZShFdmFzX09iamVjdCogbywgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1l bnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVybCwgY29uc3QgV1RGOjpWZWN0b3I8 V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4m IHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVh bGx5KQogewogICAgIHJldHVybiAwOwogfQpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24g NjUwNTIpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzMTgsMTMgKzEzMTgsMTMgQEAgRWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNoKGNvbnN0 IEV2YQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwog ICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHN0cmluZywgRUlOQV9GQUxTRSk7Ci0g ICAgV2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CisgICAgV1RGOjpUZXh0 Q2FzZVNlbnNpdGl2aXR5IHNlbnNpdGl2ZTsKICAgICBXZWJDb3JlOjpGaW5kRGlyZWN0aW9uIGRp cmVjdGlvbjsKIAogICAgIGlmIChjYXNlX3NlbnNpdGl2ZSkKLSAgICAgICAgc2Vuc2l0aXZlID0g V2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdmU7CisgICAgICAgIHNlbnNpdGl2ZSA9IFdURjo6VGV4 dENhc2VTZW5zaXRpdmU7CiAgICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXZWJDb3JlOjpU ZXh0Q2FzZUluc2Vuc2l0aXZlOworICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlSW5z ZW5zaXRpdmU7CiAKICAgICBpZiAoZm9yd2FyZCkKICAgICAgICAgZGlyZWN0aW9uID0gV2ViQ29y ZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7CkBAIC0xMzUwLDEyICsxMzUwLDEyIEBAIHVuc2lnbmVk IGludCBld2tfdmlld190ZXh0X21hdGNoZXNfbWFyaygKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHBy aXYsIDApOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcsIDApOwot ICAgIFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOworICAgIFdURjo6VGV4 dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CiAKICAgICBpZiAoY2FzZV9zZW5zaXRpdmUpCi0g ICAgICAgIHNlbnNpdGl2ZSA9IFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZlOworICAgICAgICBz ZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlU2Vuc2l0aXZlOwogICAgIGVsc2UKLSAgICAgICAgc2Vu c2l0aXZlID0gV2ViQ29yZTo6VGV4dENhc2VJbnNlbnNpdGl2ZTsKKyAgICAgICAgc2Vuc2l0aXZl ID0gV1RGOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOwogCiAgICAgcmV0dXJuIHByaXYtPnBhZ2UtPm1h cmtBbGxNYXRjaGVzRm9yVGV4dChXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgc2Vuc2l0 aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKIH0KQEAgLTI1MjgsNyArMjUyOCw3IEBAIEVpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX2ZvbnRfY3Vyc2l2ZV8KICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxh Y2UoJnByaXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkgewotICAgICAgICBXVEY6 OkF0b21pY1N0cmluZ1dURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgo ZmFtaWx5KTsKKyAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9t VVRGOChmYW1pbHkpOwogICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRDdXJzaXZlRm9u dEZhbWlseShzKTsKICAgICB9CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsK 64067 2010-08-10 19:44:09 -0700 2010-08-10 22:02:23 -0700 Patch bug-43767-20100811114407.patch text/plain 3690 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTExNikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMTAgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgorCisgICAg ICAgIFtFRkxdUkVHUkVTU0lPTig2NTAyMSkgbmVlZCB0byBmaXggYnVpbGQgYnJlYWsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzY3CisKKyAgICAg ICAgUmVtb3ZlIEF0b21pY1N0cmluZ1dURiBhbmQgY2hhbmdlIG5hbWVzcGFjZSBUZXh0Q2FzZUlu c2Vuc2l0aXZlLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAgICAgIChld2tf ZnJhbWVfcGx1Z2luX2NyZWF0ZSk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a192aWV3X3RleHRfc2VhcmNoKToKKyAgICAgICAgKGV3a192aWV3X3RleHRfbWF0Y2hl c19tYXJrKToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9jdXJzaXZlX3NldCk6CisK IDIwMTAtMDgtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcKSW5kZXg6IFdlYktpdC9lZmwv ZXdrL2V3a19mcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1l LmNwcAkocmV2aXNpb24gNjUxMTQpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTQ2LDcgKzE5NDYsNyBAQCB2b2lkIGV3a19mcmFtZV9mb3JjZV9s YXlvdXQoRXZhc19PYmplY3QqCiAgICAgICAgIHZpZXctPmZvcmNlTGF5b3V0KHRydWUpOwogfQog Ci1XVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0 ZShFdmFzX09iamVjdCogbywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2Vi Q29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVy bCwgY29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6 OlZlY3RvcjxXVEY6OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZ1dURjo6 U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkpCitXVEY6OlBhc3NSZWZQdHI8V2Vi Q29yZTo6V2lkZ2V0PiBld2tfZnJhbWVfcGx1Z2luX2NyZWF0ZShFdmFzX09iamVjdCogbywgY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2luU2l6ZSwgV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1l bnQqIGVsZW1lbnQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIHVybCwgY29uc3QgV1RGOjpWZWN0b3I8 V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBXVEY6OlZlY3RvcjxXVEY6OlN0cmluZz4m IHBhcmFtVmFsdWVzLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVh bGx5KQogewogICAgIHJldHVybiAwOwogfQpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24g NjUxMTQpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzMTgsMTMgKzEzMTgsMTMgQEAgRWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNoKGNvbnN0 IEV2YQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwog ICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHN0cmluZywgRUlOQV9GQUxTRSk7Ci0g ICAgV2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CisgICAgV1RGOjpUZXh0 Q2FzZVNlbnNpdGl2aXR5IHNlbnNpdGl2ZTsKICAgICBXZWJDb3JlOjpGaW5kRGlyZWN0aW9uIGRp cmVjdGlvbjsKIAogICAgIGlmIChjYXNlX3NlbnNpdGl2ZSkKLSAgICAgICAgc2Vuc2l0aXZlID0g V2ViQ29yZTo6VGV4dENhc2VTZW5zaXRpdmU7CisgICAgICAgIHNlbnNpdGl2ZSA9IFdURjo6VGV4 dENhc2VTZW5zaXRpdmU7CiAgICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXZWJDb3JlOjpU ZXh0Q2FzZUluc2Vuc2l0aXZlOworICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlSW5z ZW5zaXRpdmU7CiAKICAgICBpZiAoZm9yd2FyZCkKICAgICAgICAgZGlyZWN0aW9uID0gV2ViQ29y ZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7CkBAIC0xMzUwLDEyICsxMzUwLDEyIEBAIHVuc2lnbmVk IGludCBld2tfdmlld190ZXh0X21hdGNoZXNfbWFyaygKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCAwKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHBy aXYsIDApOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcsIDApOwot ICAgIFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOworICAgIFdURjo6VGV4 dENhc2VTZW5zaXRpdml0eSBzZW5zaXRpdmU7CiAKICAgICBpZiAoY2FzZV9zZW5zaXRpdmUpCi0g ICAgICAgIHNlbnNpdGl2ZSA9IFdlYkNvcmU6OlRleHRDYXNlU2Vuc2l0aXZlOworICAgICAgICBz ZW5zaXRpdmUgPSBXVEY6OlRleHRDYXNlU2Vuc2l0aXZlOwogICAgIGVsc2UKLSAgICAgICAgc2Vu c2l0aXZlID0gV2ViQ29yZTo6VGV4dENhc2VJbnNlbnNpdGl2ZTsKKyAgICAgICAgc2Vuc2l0aXZl ID0gV1RGOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOwogCiAgICAgcmV0dXJuIHByaXYtPnBhZ2UtPm1h cmtBbGxNYXRjaGVzRm9yVGV4dChXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgc2Vuc2l0 aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKIH0KQEAgLTI1MjgsNyArMjUyOCw3IEBAIEVpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX2ZvbnRfY3Vyc2l2ZV8KICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxh Y2UoJnByaXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkgewotICAgICAgICBXVEY6 OkF0b21pY1N0cmluZ1dURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgo ZmFtaWx5KTsKKyAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9t VVRGOChmYW1pbHkpOwogICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRDdXJzaXZlRm9u dEZhbWlseShzKTsKICAgICB9CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsK