72596 2011-11-17 03:59:52 -0800 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() 2011-11-17 06:24:08 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72593 1 hausmann webkit-unassigned webkit.review.bot oldest_to_newest 504726 0 hausmann 2011-11-17 03:59:52 -0800 This is trivial to remove, the callers already check WebCore::Settings 504740 1 115560 hausmann 2011-11-17 04:26:37 -0800 Created attachment 115560 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() 504743 2 webkit.review.bot 2011-11-17 04:29:37 -0800 Attachment 115560 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Last 3072 characters of output: M Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h M Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h A Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h M Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h M Tools/qmake/mkspecs/features/default_post.prf M Tools/qmake/mkspecs/features/default_pre.prf M Tools/qmake/mkspecs/features/qtwebkit.prf A Tools/qmake/mkspecs/features/qtwebkit-private.prf M Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp M Tools/ChangeLog M Tools/MiniBrowser/qt/BrowserWindow.h M Tools/MiniBrowser/qt/UrlLoader.cpp M Tools/MiniBrowser/qt/BrowserWindow.cpp W: -empty_dir: trunk/Source/WebKit/qt/declarative/private W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.h W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.h W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebviewprivateextension.cpp W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebviewprivateextension_p.h W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem.h W: -empty_dir: trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.h r100603 = 5b10400dce635df634c34ef2967dba3a593ef12f (refs/remotes/origin/master) First, rewinding head to replay your work on top of it... Applying: [Qt] Move WebKit2 C++ APIs to private API and build QML extension plugin on top of that Using index info to reconstruct a base tree... <stdin>:222: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... warning: too many files (created: 165678 deleted: 9), skipping inexact rename detection CONFLICT (rename/delete): Rename Source/WebKit/qt/declarative/private/plugin.cpp->Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h in [Qt] Move WebKit2 C++ APIs to private API and build QML extension plugin on top of that and deleted in HEAD CONFLICT (rename/delete): Rename Source/WebKit/qt/declarative/private/private.pro->Source/WebKit/qt/declarative/public.pri in [Qt] Move WebKit2 C++ APIs to private API and build QML extension plugin on top of that and deleted in HEAD CONFLICT (rename/delete): Rename Source/WebKit2/UIProcess/API/qt/qquickwebviewprivateextension_p.h->Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h in [Qt] Move WebKit2 C++ APIs to private API and build QML extension plugin on top of that and deleted in HEAD Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog Auto-merging Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro Auto-merging Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp Failed to merge in the changes. Patch failed at 0001 [Qt] Move WebKit2 C++ APIs to private API and build QML extension plugin on top of that When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 157. If any of these errors are false positives, please file a bug against check-webkit-style. 504745 3 115562 hausmann 2011-11-17 04:34:17 -0800 Created attachment 115562 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() 504801 4 115562 hausmann 2011-11-17 06:24:00 -0800 Comment on attachment 115562 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() Clearing flags on attachment: 115562 Committed r100614: <http://trac.webkit.org/changeset/100614> 504802 5 hausmann 2011-11-17 06:24:08 -0800 All reviewed patches have been landed. Closing bug. 115560 2011-11-17 04:26:37 -0800 2011-11-17 04:34:12 -0800 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() bug-72596-20111117132656.patch text/plain 4003 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFiYTMxM2M0Y2VhYzk3 NGEwYzZkZDI3MmRiYjUyNTNmMzFkY2EzMi4uMmM4NTExZGQ1MmUzZDllNGM4YjJiYzU0ZmI3NjE3 OWNlMzI4ZmIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDExLTExLTE3ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIExh eWVyIHZpb2xhdGlvbjogV2ViQ29yZTo6ZG5zUHJlZmV0Y2ggdXNlcyBRV2ViU2V0dGluZ3M6Omds b2JhbFNldHRpbmdzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2UgZG9uJ3QgbmVlZCB0byB1c2UgUVdlYlNldHRpbmdzIGhlcmUsIGJlY2F1c2Ugd2Ug bm93IHByb3BhZ2F0ZSB0aGUgRE5TIHByZWZldGNoCisgICAgICAgIHNldHRpbmcgdG8gV2ViQ29y ZTo6U2V0dGluZ3MgYW5kIHRoZSByZXN0IG9mIFdlYkNvcmUgY2hlY2tzIHRoZSBzZXR0aW5nIGJl Zm9yZSBjYWxsaW5nCisgICAgICAgIFdlYkNvcmU6OnByZWZldGNoRE5TLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpwcmVmZXRjaEROUyk6IFJlbW92ZWQgdGhlIHVzZSBvZiBRV2ViU2V0dGluZ3MuCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5oOiBSZW1vdmUgb2Zm ZW5kaW5nIHF3ZWJzZXR0aW5ncy5oIGluY2x1c2lvbi4KKwogMjAxMS0xMS0xNyAgTWFyaW8gU2Fu Y2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQ29uc2lk ZXIgcGFyZW50IEF0a09iamVjdCBpbiB3ZWJraXRfYWNjZXNzaWJsZV9nZXRfcGFyZW50KCksIGlm IGFscmVhZHkgc2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDM4NTMzNDEwNjVhYWRjNmZkODY2ZGI2ZDQw M2Y0NjAzNDY1OTNiNDguLmNmMzkyNmY4MDRlOTBhZTM3OTVlMDlmYjc1ZTYwNGE1ODZlNjA5NzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMTcgIFNpbW9uIEhhdXNt YW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0gTGF5ZXIgdmlv bGF0aW9uOiBXZWJDb3JlOjpkbnNQcmVmZXRjaCB1c2VzIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0 dGluZ3MoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI1OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEFwaS9xd2Vic2V0dGluZ3MuY3BwOgorICAgICAgICAoUVdlYlNldHRpbmdzUHJpdmF0ZTo6YXBw bHkpOiBQcm9wYWdhdGUgdGhlIEROUyBwcmVmZXRjaCBzZXR0aW5nIHRvIFdlYkNvcmU6OlNldHRp bmdzLgorCiAyMDExLTExLTE2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTAwNDQ4LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVs cGVyLmNwcAppbmRleCBkMDE3YjkwNzQ0MWFiMmUxOWUyMDVlYjI2ZmQ3ZjA4MzA4MjdiZjQyLi44 NGQ3MGM3NzA4NmQ4MWEwNTM3YTY1NDk2YzE3YTQ2MjZhOTUwM2Y5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNw cApAQCAtMjYsMTAgKzI2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gdGhpcyBpcyBjYWxs ZWQgb24gbW91c2Ugb3ZlciBhIGhyZWYgYW5kIG9uIHBhZ2UgbG9hZGluZwogdm9pZCBwcmVmZXRj aEROUyhjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQogewotICAgIGlmIChRV2ViU2V0dGluZ3M6Omds b2JhbFNldHRpbmdzKCktPnRlc3RBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpEbnNQcmVmZXRjaEVu YWJsZWQpKSB7Ci0gICAgICAgIHN0YXRpYyBEbnNQcmVmZXRjaEhlbHBlciBkbnNQcmVmZXRjaEhl bHBlcjsKLSAgICAgICAgZG5zUHJlZmV0Y2hIZWxwZXIubG9va3VwKFFTdHJpbmcoaG9zdG5hbWUp KTsKLSAgICB9CisgICAgc3RhdGljIERuc1ByZWZldGNoSGVscGVyIGRuc1ByZWZldGNoSGVscGVy OworICAgIGRuc1ByZWZldGNoSGVscGVyLmxvb2t1cChRU3RyaW5nKGhvc3RuYW1lKSk7CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvRG5zUHJl ZmV0Y2hIZWxwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvRG5zUHJl ZmV0Y2hIZWxwZXIuaAppbmRleCA0ZmNkMTljYzI1ODAxNTUzZWVlYzY2MGJmMzMxMTMwZDNlMWU2 MGVlLi4wNDkyMWUyMGIwNDA2YWE1YjZhMDIyYTZhYzM1NDI5NWNlZmI2YjFlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBl ci5oCkBAIC0yNSw3ICsyNSw2IEBACiAjaW5jbHVkZSA8UVNldD4KICNpbmNsdWRlIDxRU3RyaW5n PgogI2luY2x1ZGUgPFFUaW1lPgotI2luY2x1ZGUgInF3ZWJzZXR0aW5ncy5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0 aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCmluZGV4IDEy MTZlYzk3ZmI0Y2I3OGMyYTY1ODljYTA1NDlkOTA3ZmI5MzgyOWYuLjQ5NWVjZDcxOWFlODI3ZTNk NjY4NGJlMjMzNWRjYTAwM2YyNzQ0YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBp L3F3ZWJzZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdz LmNwcApAQCAtMTcxLDYgKzE3MSwxMCBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5 KCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1 dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6QXV0b0xvYWRJbWFnZXMpKTsKICAgICAgICAgc2V0dGlu Z3MtPnNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseSh2YWx1ZSk7CiAKKyAgICAgICAgdmFsdWUg PSBhdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6RG5zUHJlZmV0Y2hFbmFibGVkLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZhbHVlKFFX ZWJTZXR0aW5nczo6RG5zUHJlZmV0Y2hFbmFibGVkKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXRE TlNQcmVmZXRjaGluZ0VuYWJsZWQodmFsdWUpOworCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRl cy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFzY3JpcHRFbmFibGVkLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRp bmdzOjpKYXZhc2NyaXB0RW5hYmxlZCkpOwogICAgICAgICBzZXR0aW5ncy0+c2V0U2NyaXB0RW5h YmxlZCh2YWx1ZSk7Cg== 115562 2011-11-17 04:34:17 -0800 2011-11-17 06:24:00 -0800 [Qt] Layer violation: WebCore::dnsPrefetch uses QWebSettings::globalSettings() bug-72596-20111117133436.patch text/plain 4036 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGMxODljYjYwOTViNWM0 MGU0NjA1MWE1NWRkOGU1M2FhMjIxMmFkZC4uMTYwODA0NzAwN2U4NjZiNDY5ZjExYzMzNTNhNmFm NjJiMjNhZDhhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDExLTExLTE3ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIExh eWVyIHZpb2xhdGlvbjogV2ViQ29yZTo6ZG5zUHJlZmV0Y2ggdXNlcyBRV2ViU2V0dGluZ3M6Omds b2JhbFNldHRpbmdzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2UgZG9uJ3QgbmVlZCB0byB1c2UgUVdlYlNldHRpbmdzIGhlcmUsIGJlY2F1c2Ugd2Ug bm93IHByb3BhZ2F0ZSB0aGUgRE5TIHByZWZldGNoCisgICAgICAgIHNldHRpbmcgdG8gV2ViQ29y ZTo6U2V0dGluZ3MgYW5kIHRoZSByZXN0IG9mIFdlYkNvcmUgY2hlY2tzIHRoZSBzZXR0aW5nIGJl Zm9yZSBjYWxsaW5nCisgICAgICAgIFdlYkNvcmU6OnByZWZldGNoRE5TLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpwcmVmZXRjaEROUyk6IFJlbW92ZWQgdGhlIHVzZSBvZiBRV2ViU2V0dGluZ3MuCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5oOiBSZW1vdmUgb2Zm ZW5kaW5nIHF3ZWJzZXR0aW5ncy5oIGluY2x1c2lvbi4KKwogMjAxMS0xMS0xNyAgS2VuaWNoaSBJ c2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBkb24n dCBjYWxsIGZvbnRjb25maWcgdHdpY2UgaW4gY29tcGxleCB0ZXh0IHBhdGgKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cK aW5kZXggMDM3NzIyM2E3NGIzMjI1NDc3Zjk0ZDJiY2E4NzA1YWJlM2Y0OWFkMC4uYTNjMTI5YzZh ZmZjZmUyNDhhNzBhZTk1MzRlOTUxODg5ZmYyZTEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxMS0xMS0xNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tp YS5jb20+CisKKyAgICAgICAgW1F0XSBMYXllciB2aW9sYXRpb246IFdlYkNvcmU6OmRuc1ByZWZl dGNoIHVzZXMgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjU5NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6Cisg ICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6IFByb3BhZ2F0ZSB0aGUgRE5TIHBy ZWZldGNoIHNldHRpbmcgdG8gV2ViQ29yZTo6U2V0dGluZ3MuCisKIDIwMTEtMTEtMTcgIFRvciBB cm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF0g TW92ZSBXZWJLaXQyIEMrKyBBUElzIHRvIHByaXZhdGUgQVBJIGFuZCBidWlsZCBRTUwgZXh0ZW5z aW9uIHBsdWdpbiBvbiB0b3Agb2YgdGhhdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNwcAppbmRleCBkMDE3YjkwNzQ0 MWFiMmUxOWUyMDVlYjI2ZmQ3ZjA4MzA4MjdiZjQyLi44NGQ3MGM3NzA4NmQ4MWEwNTM3YTY1NDk2 YzE3YTQ2MjZhOTUwM2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNwcApAQCAtMjYsMTAgKzI2LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogLy8gdGhpcyBpcyBjYWxsZWQgb24gbW91c2Ugb3ZlciBhIGhyZWYg YW5kIG9uIHBhZ2UgbG9hZGluZwogdm9pZCBwcmVmZXRjaEROUyhjb25zdCBTdHJpbmcmIGhvc3Ru YW1lKQogewotICAgIGlmIChRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnRlc3RBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpEbnNQcmVmZXRjaEVuYWJsZWQpKSB7Ci0gICAgICAgIHN0YXRp YyBEbnNQcmVmZXRjaEhlbHBlciBkbnNQcmVmZXRjaEhlbHBlcjsKLSAgICAgICAgZG5zUHJlZmV0 Y2hIZWxwZXIubG9va3VwKFFTdHJpbmcoaG9zdG5hbWUpKTsKLSAgICB9CisgICAgc3RhdGljIERu c1ByZWZldGNoSGVscGVyIGRuc1ByZWZldGNoSGVscGVyOworICAgIGRuc1ByZWZldGNoSGVscGVy Lmxvb2t1cChRU3RyaW5nKGhvc3RuYW1lKSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvRG5zUHJlZmV0Y2hIZWxwZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvRG5zUHJlZmV0Y2hIZWxwZXIuaAppbmRleCA0ZmNk MTljYzI1ODAxNTUzZWVlYzY2MGJmMzMxMTMwZDNlMWU2MGVlLi4wNDkyMWUyMGIwNDA2YWE1YjZh MDIyYTZhYzM1NDI5NWNlZmI2YjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5oCkBAIC0yNSw3ICsyNSw2IEBACiAj aW5jbHVkZSA8UVNldD4KICNpbmNsdWRlIDxRU3RyaW5nPgogI2luY2x1ZGUgPFFUaW1lPgotI2lu Y2x1ZGUgInF3ZWJzZXR0aW5ncy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCmluZGV4IDEyMTZlYzk3ZmI0Y2I3OGMyYTY1ODljYTA1 NDlkOTA3ZmI5MzgyOWYuLjQ5NWVjZDcxOWFlODI3ZTNkNjY4NGJlMjMzNWRjYTAwM2YyNzQ0YTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApAQCAtMTcxLDYgKzE3MSwxMCBA QCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6 QXV0b0xvYWRJbWFnZXMpKTsKICAgICAgICAgc2V0dGluZ3MtPnNldExvYWRzSW1hZ2VzQXV0b21h dGljYWxseSh2YWx1ZSk7CiAKKyAgICAgICAgdmFsdWUgPSBhdHRyaWJ1dGVzLnZhbHVlKFFXZWJT ZXR0aW5nczo6RG5zUHJlZmV0Y2hFbmFibGVkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6RG5zUHJlZmV0Y2hF bmFibGVkKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXRETlNQcmVmZXRjaGluZ0VuYWJsZWQodmFs dWUpOworCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6Okph dmFzY3JpcHRFbmFibGVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBn bG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpKYXZhc2NyaXB0RW5hYmxlZCkp OwogICAgICAgICBzZXR0aW5ncy0+c2V0U2NyaXB0RW5hYmxlZCh2YWx1ZSk7Cg==