39302 2010-05-18 11:22:29 -0700 [Chromium] WebDevToolsAgentClient::sendMessageToFrontendOnIOThread needs to be implemented as virtual function 2010-06-17 05:27:58 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 victorw mnaganov fishd pfeldman victorw webkit.review.bot yurys oldest_to_newest 227394 0 victorw 2010-05-18 11:22:29 -0700 Here is IORPCDelegate code in WebDevToolsAgentImpl.cpp: class IORPCDelegate : public DevToolsRPC::Delegate, public Noncopyable { public: IORPCDelegate() { } virtual ~IORPCDelegate() { } virtual void sendRpcMessage(const WebDevToolsMessageData& data) { WebDevToolsAgentClient::sendMessageToFrontendOnIOThread(data); } }; WebDevToolsAgentClient::sendMessageToFrontendOnIOThread is implemented in chromium code base (devtools_agent.cc). This prevents us from building webkit as a dll. We should change sendMessageToFrontendOnIOThread to be a virtual function and access it through WebDevToolsAgentClient object. 227726 1 yurys 2010-05-19 00:28:10 -0700 Mikhail, could you look into this? 227845 2 mnaganov 2010-05-19 08:58:34 -0700 Yes, will do. 238106 3 victorw 2010-06-14 15:46:07 -0700 Hi Mikhail, Any update on this? I am splitting webkit to be a dll for chromium dev build, this issue needs to be fixed in order to move forward. Thanks! (In reply to comment #2) > Yes, will do. 238302 4 mnaganov 2010-06-15 01:45:38 -0700 Victor, I'm sorry for holding you! I already tried once to fix it, but discovered that it's not trivial, as the call path goes all the way through static methods (that's why in the current state of affairs it is natural for the method to be static). Then I was distracted, etc. I will try harder, I promise! 238518 5 58812 mnaganov 2010-06-15 13:29:02 -0700 Created attachment 58812 proposed patch Below is the corresponding Chromium change. After applying it, a cleanup change to WebKit will be required. Also, after applying the WebKit patch, Heap snapshots will stop working until Chromium change will be applied. I see no other good way of dealing with it, as sendMessageToFrontendOnIOThread is declared and used in WebKit, but defined in Chromium. Thus, to remove it, we first need to remove its usage (WebKit), then definition (Chromium), then declaration (WebKit again). diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 5adfa09..42f32e2 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -57,12 +57,14 @@ DevToolsAgent::DevToolsAgent(int routing_id, RenderView* render_view) : routing_id_(routing_id), render_view_(render_view) { agent_for_routing_id_[routing_id] = this; + DevToolsAgentFilter::SetDevToolsAgent(this); CommandLine* cmd = CommandLine::ForCurrentProcess(); expose_v8_debugger_protocol_ =cmd->HasSwitch(switches::kRemoteShellPort); } DevToolsAgent::~DevToolsAgent() { + DevToolsAgentFilter::SetDevToolsAgent(NULL); agent_for_routing_id_.erase(routing_id_); } @@ -96,6 +98,13 @@ void DevToolsAgent::sendMessageToFrontend( render_view_->Send(m); } + +void DevToolsAgent::sendMessageToFrontendFromIOThread( + const WebKit::WebDevToolsMessageData& data) { + DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data)); +} + + int DevToolsAgent::hostIdentifier() { return routing_id_; } @@ -195,9 +204,3 @@ WebDevToolsAgent* DevToolsAgent::GetWebAgent() { return NULL; return web_view->devToolsAgent(); } - -// static -void WebKit::WebDevToolsAgentClient::sendMessageToFrontendOnIOThread( - const WebDevToolsMessageData& data) { - DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data)); -} diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 23fa10c..f1262d0 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -40,6 +40,8 @@ class DevToolsAgent : public WebKit::WebDevToolsAgentClient { // WebDevToolsAgentClient implementation virtual void sendMessageToFrontend( const WebKit::WebDevToolsMessageData& data); + virtual void sendMessageToFrontendFromIOThread( + const WebKit::WebDevToolsMessageData& data); virtual int hostIdentifier(); virtual void forceRepaint(); diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 5eb54ed..01c1be0 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -28,6 +28,8 @@ void DevToolsAgentFilter::DispatchMessageLoop() { } // static +DevToolsAgent* DevToolsAgentFilter::agent_ = NULL; +// static IPC::Channel* DevToolsAgentFilter::channel_ = NULL; // static int DevToolsAgentFilter::current_routing_id_ = 0; @@ -65,8 +67,13 @@ void DevToolsAgentFilter::OnDebuggerPauseScript() { } void DevToolsAgentFilter::OnRpcMessage(const DevToolsMessageData& data) { - message_handled_ = WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread( - data.ToWebDevToolsMessageData()); + if (agent_ != NULL) { + message_handled_ = WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread( + agent_, + data.ToWebDevToolsMessageData()); + } else { + message_handled_ = false; + } } // static diff --git a/chrome/renderer/devtools_agent_filter.h b/chrome/renderer/devtools_agent_filter.h index 8d23918..caae82b 100644 --- a/chrome/renderer/devtools_agent_filter.h +++ b/chrome/renderer/devtools_agent_filter.h @@ -10,6 +10,7 @@ #include "ipc/ipc_channel_proxy.h" +class DevToolsAgent; struct DevToolsMessageData; // DevToolsAgentFilter is registered as an IPC filter in order to be able to @@ -25,6 +26,7 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter { virtual ~DevToolsAgentFilter(); static void SendRpcMessage(const DevToolsMessageData& data); + static void SetDevToolsAgent(DevToolsAgent* agent) { agent_ = agent; } private: // IPC::ChannelProxy::MessageFilter override. Called on IO thread. @@ -46,6 +48,7 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter { // from IO thread. static int current_routing_id_; static IPC::Channel* channel_; + static DevToolsAgent* agent_; DISALLOW_COPY_AND_ASSIGN(DevToolsAgentFilter); }; 238519 6 webkit.review.bot 2010-06-15 13:31:43 -0700 Attachment 58812 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/chromium/src/WebDevToolsAgentImpl.cpp:126: Use 0 instead of NULL. [readability/null] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 238718 7 58859 mnaganov 2010-06-16 01:20:52 -0700 Created attachment 58859 fixed style error 238767 8 58868 mnaganov 2010-06-16 03:19:23 -0700 Created attachment 58868 as we discussed offline Chromium change is now smaller: diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 5adfa09..01c66e4 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -195,9 +195,3 @@ WebDevToolsAgent* DevToolsAgent::GetWebAgent() { return NULL; return web_view->devToolsAgent(); } - -// static -void WebKit::WebDevToolsAgentClient::sendMessageToFrontendOnIOThread( - const WebDevToolsMessageData& data) { - DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data)); -} diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 5eb54ed..4c98cbe 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -64,8 +64,21 @@ void DevToolsAgentFilter::OnDebuggerPauseScript() { WebDevToolsAgent::debuggerPauseScript(); } +namespace { + +class WebDevToolsMessageTransportImpl : public WebKit::WebDevToolsMessageTransport { + public: + void sendMessageToFrontendOnIOThread(const WebKit::WebDevToolsMessageData& data) { + DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data)); + } +}; + +} // namespace + void DevToolsAgentFilter::OnRpcMessage(const DevToolsMessageData& data) { + WebDevToolsMessageTransportImpl transport; message_handled_ = WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread( + &transport, data.ToWebDevToolsMessageData()); } 238800 9 58880 mnaganov 2010-06-16 04:52:28 -0700 Created attachment 58880 will not break functionality, but requires 4 steps to commit Chromium part: diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 5eb54ed..4c98cbe 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -64,8 +64,21 @@ void DevToolsAgentFilter::OnDebuggerPauseScript() { WebDevToolsAgent::debuggerPauseScript(); } +namespace { + +class WebDevToolsMessageTransportImpl : public WebKit::WebDevToolsMessageTransport { + public: + void sendMessageToFrontendOnIOThread(const WebKit::WebDevToolsMessageData& data) { + DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data)); + } +}; + +} // namespace + void DevToolsAgentFilter::OnRpcMessage(const DevToolsMessageData& data) { + WebDevToolsMessageTransportImpl transport; message_handled_ = WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread( + &transport, data.ToWebDevToolsMessageData()); } 238954 10 58880 fishd 2010-06-16 10:41:38 -0700 Comment on attachment 58880 will not break functionality, but requires 4 steps to commit WebKit/chromium/public/WebDevToolsAgentClient.h:74 + class WebDevToolsMessageTransport { one file per class please. 239021 11 mnaganov 2010-06-16 12:17:33 -0700 OK, will fix this in the next commit. I wanted to make this class an inner of WebDevToolsAgentClient, but forgot that C++ doesn't allow forward declarations for inner classes (except inside its containing class). 239300 12 58880 yurys 2010-06-17 01:52:13 -0700 Comment on attachment 58880 will not break functionality, but requires 4 steps to commit WebKit/chromium/public/WebDevToolsAgentClient.h:75 + public: style: wrong indentation 239345 13 mnaganov 2010-06-17 05:27:58 -0700 Fixed Yury's style comment. Manually committed http://trac.webkit.org/changeset/61320 2010-06-17 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Pavel Feldman. [Chromium] Prepare to making WebDevToolsAgentClient::sendMessageToFrontendOnIOThread virtual https://bugs.webkit.org/show_bug.cgi?id=39302 * public/WebDevToolsAgent.h: * public/WebDevToolsAgentClient.h: (WebKit::WebDevToolsMessageTransport::~WebDevToolsMessageTransport): * src/WebDevToolsAgentImpl.cpp: (WebKit::): (WebKit::WebDevToolsAgent::dispatchMessageFromFrontendOnIOThread): 58812 2010-06-15 13:29:02 -0700 2010-06-16 01:20:52 -0700 proposed patch fix-39302-patch text/plain 3489 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE1OGU5NWQuLjJlNzUxNDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTA2LTE1ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBQcmVwYXJlIHRvIG1ha2luZyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmRPbklPVGhyZWFkIHZpcnR1YWwKKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMDIKKworICAgICAgICAqIHB1YmxpYy9XZWJE ZXZUb29sc0FnZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VU b0Zyb250ZW5kRnJvbUlPVGhyZWFkKToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29s c0FnZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKToKKwogMjAxMC0w Ni0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBDaHJvbWl1bSBidWlsZC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RGV2VG9vbHNBZ2VudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0FnZW50 LmgKaW5kZXggZTNiNTE4Ni4uMmM5MjA0NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJE ZXZUb29sc0FnZW50LmgKQEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkg c3RhdGljIHZvaWQgZGVidWdnZXJQYXVzZVNjcmlwdCgpOwogCiAgICAgV0VCS0lUX0FQSSBzdGF0 aWMgYm9vbCBkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKGNvbnN0IFdlYkRl dlRvb2xzTWVzc2FnZURhdGEmKTsKKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29sIGRpc3BhdGNo TWVzc2FnZUZyb21Gcm9udGVuZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNBZ2VudENsaWVudCosIGNv bnN0IFdlYkRldlRvb2xzTWVzc2FnZURhdGEmKTsKIAogICAgIHR5cGVkZWYgdm9pZCAoKk1lc3Nh Z2VMb29wRGlzcGF0Y2hIYW5kbGVyKSgpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCmluZGV4IDYyMmY3ODguLjMwYjA1NDEgMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCisrKyBi L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCkBAIC00MSw2 ICs0MSw3IEBAIHN0cnVjdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhOwogY2xhc3MgV2ViRGV2VG9v bHNBZ2VudENsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlVG9G cm9udGVuZChjb25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJikgeyB9CisgICAgdmlydHVhbCB2 b2lkIHNlbmRNZXNzYWdlVG9Gcm9udGVuZEZyb21JT1RocmVhZChjb25zdCBXZWJEZXZUb29sc01l c3NhZ2VEYXRhJikgeyB9CiAKICAgICAvLyBJbnZhbGlkYXRlcyB3aWRnZXQgd2hpY2ggbGVhZHMg dG8gdGhlIHJlcGFpbnQuCiAgICAgdmlydHVhbCB2b2lkIGZvcmNlUmVwYWludCgpIHsgfQpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAgYi9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRleCBjNGJiYmZh Li4yY2UxYTZjIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdl bnRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBs LmNwcApAQCAtMTIzLDEyICsxMjMsMTcgQEAgc3RhdGljIGNvbnN0IGNoYXIga1Jlc291cmNlVHJh Y2tpbmdGZWF0dXJlTmFtZVtdID0gInJlc291cmNlLXRyYWNraW5nIjsKIAogY2xhc3MgSU9SUENE ZWxlZ2F0ZSA6IHB1YmxpYyBEZXZUb29sc1JQQzo6RGVsZWdhdGUsIHB1YmxpYyBOb25jb3B5YWJs ZSB7CiBwdWJsaWM6Ci0gICAgSU9SUENEZWxlZ2F0ZSgpIHsgfQorICAgIElPUlBDRGVsZWdhdGUo KSA6IG1fY2xpZW50KE5VTEwpIHsgfQorICAgIGV4cGxpY2l0IElPUlBDRGVsZWdhdGUoV2ViRGV2 VG9vbHNBZ2VudENsaWVudCogY2xpZW50KSA6IG1fY2xpZW50KGNsaWVudCkgeyB9CiAgICAgdmly dHVhbCB+SU9SUENEZWxlZ2F0ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZW5kUnBjTWVzc2Fn ZShjb25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJiBkYXRhKQogICAgIHsKLSAgICAgICAgV2Vi RGV2VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kT25JT1RocmVhZChkYXRh KTsKKyAgICAgICAgaWYgKG1fY2xpZW50KQorICAgICAgICAgICAgbV9jbGllbnQtPnNlbmRNZXNz YWdlVG9Gcm9udGVuZEZyb21JT1RocmVhZChkYXRhKTsKICAgICB9CisKK3ByaXZhdGU6CisgICAg V2ViRGV2VG9vbHNBZ2VudENsaWVudCogbV9jbGllbnQ7CiB9OwogCiBjbGFzcyBDbGllbnRNZXNz YWdlTG9vcEFkYXB0ZXIgOiBwdWJsaWMgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OkNsaWVu dE1lc3NhZ2VMb29wIHsKQEAgLTY1NSw0ICs2NjAsMTIgQEAgYm9vbCBXZWJEZXZUb29sc0FnZW50 OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKGNvbnN0IFdlYkRldlRvb2xz TWUKICAgICByZXR1cm4gUHJvZmlsZXJBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRh dGEpOwogfQogCitib29sIFdlYkRldlRvb2xzQWdlbnQ6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9u dGVuZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNBZ2VudENsaWVudCogY2xpZW50LCBjb25zdCBXZWJE ZXZUb29sc01lc3NhZ2VEYXRhJiBkYXRhKQoreworICAgIElPUlBDRGVsZWdhdGUgdHJhbnNwb3J0 KGNsaWVudCk7CisgICAgUHJvZmlsZXJBZ2VudERlbGVnYXRlU3R1YiBzdHViKCZ0cmFuc3BvcnQp OworICAgIFByb2ZpbGVyQWdlbnRJbXBsIGFnZW50KCZzdHViKTsKKyAgICByZXR1cm4gUHJvZmls ZXJBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRhdGEpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQK 58859 2010-06-16 01:20:52 -0700 2010-06-16 03:19:23 -0700 fixed style error fix-39302-patch text/plain 3486 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE1OGU5NWQuLjJlNzUxNDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTA2LTE1ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBQcmVwYXJlIHRvIG1ha2luZyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmRPbklPVGhyZWFkIHZpcnR1YWwKKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMDIKKworICAgICAgICAqIHB1YmxpYy9XZWJE ZXZUb29sc0FnZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VU b0Zyb250ZW5kRnJvbUlPVGhyZWFkKToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29s c0FnZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKToKKwogMjAxMC0w Ni0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBDaHJvbWl1bSBidWlsZC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RGV2VG9vbHNBZ2VudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0FnZW50 LmgKaW5kZXggZTNiNTE4Ni4uMmM5MjA0NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJE ZXZUb29sc0FnZW50LmgKQEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkg c3RhdGljIHZvaWQgZGVidWdnZXJQYXVzZVNjcmlwdCgpOwogCiAgICAgV0VCS0lUX0FQSSBzdGF0 aWMgYm9vbCBkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKGNvbnN0IFdlYkRl dlRvb2xzTWVzc2FnZURhdGEmKTsKKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29sIGRpc3BhdGNo TWVzc2FnZUZyb21Gcm9udGVuZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNBZ2VudENsaWVudCosIGNv bnN0IFdlYkRldlRvb2xzTWVzc2FnZURhdGEmKTsKIAogICAgIHR5cGVkZWYgdm9pZCAoKk1lc3Nh Z2VMb29wRGlzcGF0Y2hIYW5kbGVyKSgpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCmluZGV4IDYyMmY3ODguLjMwYjA1NDEgMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCisrKyBi L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNBZ2VudENsaWVudC5oCkBAIC00MSw2 ICs0MSw3IEBAIHN0cnVjdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhOwogY2xhc3MgV2ViRGV2VG9v bHNBZ2VudENsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlVG9G cm9udGVuZChjb25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJikgeyB9CisgICAgdmlydHVhbCB2 b2lkIHNlbmRNZXNzYWdlVG9Gcm9udGVuZEZyb21JT1RocmVhZChjb25zdCBXZWJEZXZUb29sc01l c3NhZ2VEYXRhJikgeyB9CiAKICAgICAvLyBJbnZhbGlkYXRlcyB3aWRnZXQgd2hpY2ggbGVhZHMg dG8gdGhlIHJlcGFpbnQuCiAgICAgdmlydHVhbCB2b2lkIGZvcmNlUmVwYWludCgpIHsgfQpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAgYi9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcAppbmRleCBjNGJiYmZh Li4yY2UxYTZjIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdl bnRJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBs LmNwcApAQCAtMTIzLDEyICsxMjMsMTcgQEAgc3RhdGljIGNvbnN0IGNoYXIga1Jlc291cmNlVHJh Y2tpbmdGZWF0dXJlTmFtZVtdID0gInJlc291cmNlLXRyYWNraW5nIjsKIAogY2xhc3MgSU9SUENE ZWxlZ2F0ZSA6IHB1YmxpYyBEZXZUb29sc1JQQzo6RGVsZWdhdGUsIHB1YmxpYyBOb25jb3B5YWJs ZSB7CiBwdWJsaWM6Ci0gICAgSU9SUENEZWxlZ2F0ZSgpIHsgfQorICAgIElPUlBDRGVsZWdhdGUo KSA6IG1fY2xpZW50KDApIHsgfQorICAgIGV4cGxpY2l0IElPUlBDRGVsZWdhdGUoV2ViRGV2VG9v bHNBZ2VudENsaWVudCogY2xpZW50KSA6IG1fY2xpZW50KGNsaWVudCkgeyB9CiAgICAgdmlydHVh bCB+SU9SUENEZWxlZ2F0ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZW5kUnBjTWVzc2FnZShj b25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJiBkYXRhKQogICAgIHsKLSAgICAgICAgV2ViRGV2 VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kT25JT1RocmVhZChkYXRhKTsK KyAgICAgICAgaWYgKG1fY2xpZW50KQorICAgICAgICAgICAgbV9jbGllbnQtPnNlbmRNZXNzYWdl VG9Gcm9udGVuZEZyb21JT1RocmVhZChkYXRhKTsKICAgICB9CisKK3ByaXZhdGU6CisgICAgV2Vi RGV2VG9vbHNBZ2VudENsaWVudCogbV9jbGllbnQ7CiB9OwogCiBjbGFzcyBDbGllbnRNZXNzYWdl TG9vcEFkYXB0ZXIgOiBwdWJsaWMgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OkNsaWVudE1l c3NhZ2VMb29wIHsKQEAgLTY1NSw0ICs2NjAsMTIgQEAgYm9vbCBXZWJEZXZUb29sc0FnZW50Ojpk aXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKGNvbnN0IFdlYkRldlRvb2xzTWUK ICAgICByZXR1cm4gUHJvZmlsZXJBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRhdGEp OwogfQogCitib29sIFdlYkRldlRvb2xzQWdlbnQ6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVu ZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNBZ2VudENsaWVudCogY2xpZW50LCBjb25zdCBXZWJEZXZU b29sc01lc3NhZ2VEYXRhJiBkYXRhKQoreworICAgIElPUlBDRGVsZWdhdGUgdHJhbnNwb3J0KGNs aWVudCk7CisgICAgUHJvZmlsZXJBZ2VudERlbGVnYXRlU3R1YiBzdHViKCZ0cmFuc3BvcnQpOwor ICAgIFByb2ZpbGVyQWdlbnRJbXBsIGFnZW50KCZzdHViKTsKKyAgICByZXR1cm4gUHJvZmlsZXJB Z2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRhdGEpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQK 58868 2010-06-16 03:19:23 -0700 2010-06-16 04:52:28 -0700 as we discussed offline fix-39302-patch text/plain 3639 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE1OGU5NWQuLjE5NGM2ZDEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTA2LTE2ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBQcmVwYXJlIHRvIG1ha2luZyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmRPbklPVGhyZWFkIHZpcnR1YWwKKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMDIKKworICAgICAgICAqIHB1YmxpYy9XZWJE ZXZUb29sc0FnZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNNZXNzYWdlVHJhbnNwb3J0Ojp+V2ViRGV2 VG9vbHNNZXNzYWdlVHJhbnNwb3J0KToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29s c0FnZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKToKKwogMjAxMC0w Ni0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBDaHJvbWl1bSBidWlsZC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RGV2VG9vbHNBZ2VudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0FnZW50 LmgKaW5kZXggZTNiNTE4Ni4uYTQ1MzMzMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJE ZXZUb29sc0FnZW50LmgKQEAgLTM1LDYgKzM1LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiBj bGFzcyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OworY2xhc3MgV2ViRGV2VG9vbHNNZXNzYWdlVHJh bnNwb3J0OwogY2xhc3MgV2ViRnJhbWU7CiBjbGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJVUkxS ZXF1ZXN0OwpAQCAtNzQsNiArNzUsNyBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMg dm9pZCBkZWJ1Z2dlclBhdXNlU2NyaXB0KCk7CiAKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29s IGRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZE9uSU9UaHJlYWQoY29uc3QgV2ViRGV2VG9vbHNN ZXNzYWdlRGF0YSYpOworICAgIFdFQktJVF9BUEkgc3RhdGljIGJvb2wgZGlzcGF0Y2hNZXNzYWdl RnJvbUZyb250ZW5kT25JT1RocmVhZChXZWJEZXZUb29sc01lc3NhZ2VUcmFuc3BvcnQqLCBjb25z dCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJik7CiAKICAgICB0eXBlZGVmIHZvaWQgKCpNZXNzYWdl TG9vcERpc3BhdGNoSGFuZGxlcikoKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50Q2xpZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkRldlRvb2xzQWdlbnRDbGllbnQuaAppbmRleCA2MjJmNzg4Li4yNTNhOTQxIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaAorKysgYi9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaApAQCAtNzEsNiAr NzEsMTIgQEAgcHJvdGVjdGVkOgogICAgIH5XZWJEZXZUb29sc0FnZW50Q2xpZW50KCkgeyB9CiB9 OwogCitjbGFzcyBXZWJEZXZUb29sc01lc3NhZ2VUcmFuc3BvcnQgeworICBwdWJsaWM6CisgICAg dmlydHVhbCB+V2ViRGV2VG9vbHNNZXNzYWdlVHJhbnNwb3J0KCkgeyB9CisgICAgdmlydHVhbCB2 b2lkIHNlbmRNZXNzYWdlVG9Gcm9udGVuZE9uSU9UaHJlYWQoY29uc3QgV2ViRGV2VG9vbHNNZXNz YWdlRGF0YSYpID0gMDsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggYzRiYmJm YS4uYTE0NTQ1MCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Fn ZW50SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1w bC5jcHAKQEAgLTEyMywxMiArMTIzLDE3IEBAIHN0YXRpYyBjb25zdCBjaGFyIGtSZXNvdXJjZVRy YWNraW5nRmVhdHVyZU5hbWVbXSA9ICJyZXNvdXJjZS10cmFja2luZyI7CiAKIGNsYXNzIElPUlBD RGVsZWdhdGUgOiBwdWJsaWMgRGV2VG9vbHNSUEM6OkRlbGVnYXRlLCBwdWJsaWMgTm9uY29weWFi bGUgewogcHVibGljOgotICAgIElPUlBDRGVsZWdhdGUoKSB7IH0KKyAgICBJT1JQQ0RlbGVnYXRl KCkgOiBtX3RyYW5zcG9ydCgwKSB7IH0KKyAgICBleHBsaWNpdCBJT1JQQ0RlbGVnYXRlKFdlYkRl dlRvb2xzTWVzc2FnZVRyYW5zcG9ydCogdHJhbnNwb3J0KSA6IG1fdHJhbnNwb3J0KHRyYW5zcG9y dCkgeyB9CiAgICAgdmlydHVhbCB+SU9SUENEZWxlZ2F0ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBzZW5kUnBjTWVzc2FnZShjb25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJiBkYXRhKQogICAg IHsKLSAgICAgICAgV2ViRGV2VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5k T25JT1RocmVhZChkYXRhKTsKKyAgICAgICAgaWYgKG1fdHJhbnNwb3J0KQorICAgICAgICAgICAg bV90cmFuc3BvcnQtPnNlbmRNZXNzYWdlVG9Gcm9udGVuZE9uSU9UaHJlYWQoZGF0YSk7CiAgICAg fQorCitwcml2YXRlOgorICAgIFdlYkRldlRvb2xzTWVzc2FnZVRyYW5zcG9ydCogbV90cmFuc3Bv cnQ7CiB9OwogCiBjbGFzcyBDbGllbnRNZXNzYWdlTG9vcEFkYXB0ZXIgOiBwdWJsaWMgV2ViQ29y ZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OkNsaWVudE1lc3NhZ2VMb29wIHsKQEAgLTY1NSw0ICs2NjAs MTIgQEAgYm9vbCBXZWJEZXZUb29sc0FnZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRP bklPVGhyZWFkKGNvbnN0IFdlYkRldlRvb2xzTWUKICAgICByZXR1cm4gUHJvZmlsZXJBZ2VudERp c3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRhdGEpOwogfQogCitib29sIFdlYkRldlRvb2xzQWdl bnQ6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNNZXNz YWdlVHJhbnNwb3J0KiB0cmFuc3BvcnQsIGNvbnN0IFdlYkRldlRvb2xzTWVzc2FnZURhdGEmIGRh dGEpCit7CisgICAgSU9SUENEZWxlZ2F0ZSBkZWxlZ2F0ZSh0cmFuc3BvcnQpOworICAgIFByb2Zp bGVyQWdlbnREZWxlZ2F0ZVN0dWIgc3R1YigmZGVsZWdhdGUpOworICAgIFByb2ZpbGVyQWdlbnRJ bXBsIGFnZW50KCZzdHViKTsKKyAgICByZXR1cm4gUHJvZmlsZXJBZ2VudERpc3BhdGNoOjpkaXNw YXRjaCgmYWdlbnQsIGRhdGEpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 58880 2010-06-16 04:52:28 -0700 2010-06-17 05:27:12 -0700 will not break functionality, but requires 4 steps to commit fix-39302-patch text/plain 3729 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE1OGU5NWQuLjE5NGM2ZDEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTA2LTE2ICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBQcmVwYXJlIHRvIG1ha2luZyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmRPbklPVGhyZWFkIHZpcnR1YWwKKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMDIKKworICAgICAgICAqIHB1YmxpYy9XZWJE ZXZUb29sc0FnZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQu aDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNNZXNzYWdlVHJhbnNwb3J0Ojp+V2ViRGV2 VG9vbHNNZXNzYWdlVHJhbnNwb3J0KToKKyAgICAgICAgKiBzcmMvV2ViRGV2VG9vbHNBZ2VudElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2ViS2l0OjpXZWJEZXZUb29s c0FnZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKToKKwogMjAxMC0w Ni0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBDaHJvbWl1bSBidWlsZC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RGV2VG9vbHNBZ2VudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0FnZW50 LmgKaW5kZXggZTNiNTE4Ni4uYTQ1MzMzMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJE ZXZUb29sc0FnZW50LmgKQEAgLTM1LDYgKzM1LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiBj bGFzcyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OworY2xhc3MgV2ViRGV2VG9vbHNNZXNzYWdlVHJh bnNwb3J0OwogY2xhc3MgV2ViRnJhbWU7CiBjbGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJVUkxS ZXF1ZXN0OwpAQCAtNzQsNiArNzUsNyBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMg dm9pZCBkZWJ1Z2dlclBhdXNlU2NyaXB0KCk7CiAKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBib29s IGRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZE9uSU9UaHJlYWQoY29uc3QgV2ViRGV2VG9vbHNN ZXNzYWdlRGF0YSYpOworICAgIFdFQktJVF9BUEkgc3RhdGljIGJvb2wgZGlzcGF0Y2hNZXNzYWdl RnJvbUZyb250ZW5kT25JT1RocmVhZChXZWJEZXZUb29sc01lc3NhZ2VUcmFuc3BvcnQqLCBjb25z dCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJik7CiAKICAgICB0eXBlZGVmIHZvaWQgKCpNZXNzYWdl TG9vcERpc3BhdGNoSGFuZGxlcikoKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJEZXZUb29sc0FnZW50Q2xpZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkRldlRvb2xzQWdlbnRDbGllbnQuaAppbmRleCA2MjJmNzg4Li4yNTNhOTQxIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaAorKysgYi9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzQWdlbnRDbGllbnQuaApAQCAtNzEsNiAr NzEsMTIgQEAgcHJvdGVjdGVkOgogICAgIH5XZWJEZXZUb29sc0FnZW50Q2xpZW50KCkgeyB9CiB9 OwogCitjbGFzcyBXZWJEZXZUb29sc01lc3NhZ2VUcmFuc3BvcnQgeworICBwdWJsaWM6CisgICAg dmlydHVhbCB+V2ViRGV2VG9vbHNNZXNzYWdlVHJhbnNwb3J0KCkgeyB9CisgICAgdmlydHVhbCB2 b2lkIHNlbmRNZXNzYWdlVG9Gcm9udGVuZE9uSU9UaHJlYWQoY29uc3QgV2ViRGV2VG9vbHNNZXNz YWdlRGF0YSYpID0gMDsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggYzRiYmJm YS4uYjczMjAyYyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0Fn ZW50SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1w bC5jcHAKQEAgLTEyMywxMiArMTIzLDE5IEBAIHN0YXRpYyBjb25zdCBjaGFyIGtSZXNvdXJjZVRy YWNraW5nRmVhdHVyZU5hbWVbXSA9ICJyZXNvdXJjZS10cmFja2luZyI7CiAKIGNsYXNzIElPUlBD RGVsZWdhdGUgOiBwdWJsaWMgRGV2VG9vbHNSUEM6OkRlbGVnYXRlLCBwdWJsaWMgTm9uY29weWFi bGUgewogcHVibGljOgotICAgIElPUlBDRGVsZWdhdGUoKSB7IH0KKyAgICBJT1JQQ0RlbGVnYXRl KCkgOiBtX3RyYW5zcG9ydCgwKSB7IH0KKyAgICBleHBsaWNpdCBJT1JQQ0RlbGVnYXRlKFdlYkRl dlRvb2xzTWVzc2FnZVRyYW5zcG9ydCogdHJhbnNwb3J0KSA6IG1fdHJhbnNwb3J0KHRyYW5zcG9y dCkgeyB9CiAgICAgdmlydHVhbCB+SU9SUENEZWxlZ2F0ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBzZW5kUnBjTWVzc2FnZShjb25zdCBXZWJEZXZUb29sc01lc3NhZ2VEYXRhJiBkYXRhKQogICAg IHsKLSAgICAgICAgV2ViRGV2VG9vbHNBZ2VudENsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5k T25JT1RocmVhZChkYXRhKTsKKyAgICAgICAgaWYgKG1fdHJhbnNwb3J0KQorICAgICAgICAgICAg bV90cmFuc3BvcnQtPnNlbmRNZXNzYWdlVG9Gcm9udGVuZE9uSU9UaHJlYWQoZGF0YSk7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIFdlYkRldlRvb2xzQWdlbnRDbGllbnQ6OnNlbmRNZXNzYWdl VG9Gcm9udGVuZE9uSU9UaHJlYWQoZGF0YSk7CiAgICAgfQorCitwcml2YXRlOgorICAgIFdlYkRl dlRvb2xzTWVzc2FnZVRyYW5zcG9ydCogbV90cmFuc3BvcnQ7CiB9OwogCiBjbGFzcyBDbGllbnRN ZXNzYWdlTG9vcEFkYXB0ZXIgOiBwdWJsaWMgV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2ZXI6OkNs aWVudE1lc3NhZ2VMb29wIHsKQEAgLTY1NSw0ICs2NjIsMTIgQEAgYm9vbCBXZWJEZXZUb29sc0Fn ZW50OjpkaXNwYXRjaE1lc3NhZ2VGcm9tRnJvbnRlbmRPbklPVGhyZWFkKGNvbnN0IFdlYkRldlRv b2xzTWUKICAgICByZXR1cm4gUHJvZmlsZXJBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQs IGRhdGEpOwogfQogCitib29sIFdlYkRldlRvb2xzQWdlbnQ6OmRpc3BhdGNoTWVzc2FnZUZyb21G cm9udGVuZE9uSU9UaHJlYWQoV2ViRGV2VG9vbHNNZXNzYWdlVHJhbnNwb3J0KiB0cmFuc3BvcnQs IGNvbnN0IFdlYkRldlRvb2xzTWVzc2FnZURhdGEmIGRhdGEpCit7CisgICAgSU9SUENEZWxlZ2F0 ZSBkZWxlZ2F0ZSh0cmFuc3BvcnQpOworICAgIFByb2ZpbGVyQWdlbnREZWxlZ2F0ZVN0dWIgc3R1 YigmZGVsZWdhdGUpOworICAgIFByb2ZpbGVyQWdlbnRJbXBsIGFnZW50KCZzdHViKTsKKyAgICBy ZXR1cm4gUHJvZmlsZXJBZ2VudERpc3BhdGNoOjpkaXNwYXRjaCgmYWdlbnQsIGRhdGEpOworfQor CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK