28772 2009-08-27 06:52:48 -0700 Inspected tab craches in Chromium when there is an excpetion in user script 2009-08-27 12:41:05 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 0 yurys pfeldman dglazkov pfeldman oldest_to_newest 143102 0 yurys 2009-08-27 06:52:48 -0700 Inspected tab sometimes crashes with the following stack trace: Thread 0 *CRASHED* (EXCEPTION_ACCESS_VIOLATION @0x00000000) 0x6516ec11 [chrome.dll - api.cc:431] v8::Context::Enter() 0x64c8dac7 [chrome.dll - scriptscope.cpp:50] WebCore::ScriptScope::ScriptScope(WebCore::ScriptState *,bool) 0x64c52b8f [chrome.dll - inspectorfrontend.cpp:70] WebCore::InspectorFrontend::newScriptObject() 0x64c5384f [chrome.dll - consolemessage.cpp:80] WebCore::ConsoleMessage::addToConsole(WebCore::InspectorFrontend *) 0x64b3bde5 [chrome.dll - inspectorcontroller.cpp:378] WebCore::InspectorController::addConsoleMessage(WebCore::ScriptState *,WebCore::ConsoleMessage *) 0x64b3bd54 [chrome.dll - inspectorcontroller.cpp:361] WebCore::InspectorController::addMessageToConsole(WebCore::MessageSource,WebCore::MessageType,WebCore::MessageLevel,WebCore::String const &,unsigned int,WebCore::String const &) 0x64b3998a [chrome.dll - console.cpp:149] WebCore::Console::addMessage(WebCore::MessageSource,WebCore::MessageType,WebCore::MessageLevel,WebCore::String const &,unsigned int,WebCore::String const &) 0x64c50e68 [chrome.dll - v8consolemessage.cpp:62] WebCore::V8ConsoleMessage::dispatchNow(WebCore::Page *) 0x64c5100d [chrome.dll - v8consolemessage.cpp:125] WebCore::V8ConsoleMessage::handler(v8::Handle<v8::Message>,v8::Handle<v8::Value>) 0x651a85a0 [chrome.dll - messages.cc:140] v8::internal::MessageHandler::ReportMessage(v8::internal::MessageLocation *,v8::internal::Handle<v8::internal::Object>) 0x6518c93b [chrome.dll - top.cc:821] v8::internal::Top::ReportPendingMessages() 0x651a8c93 [chrome.dll - compiler.cc:283] v8::internal::Compiler::Compile(v8::internal::Handle<v8::internal::String>,v8::internal::Handle<v8::internal::Object>,int,int,v8::Extension *,v8::internal::ScriptDataImpl *) 0x6516df1a [chrome.dll - api.cc:1096] v8::Script::Compile(v8::Handle<v8::String>,v8::ScriptOrigin *,v8::ScriptData *) 0x64b37821 [chrome.dll - v8proxy.cpp:249] WebCore::V8Proxy::compileScript(v8::Handle<v8::String>,WebCore::String const &,int) 0x64b37acc [chrome.dll - v8proxy.cpp:347] WebCore::V8Proxy::evaluate(WebCore::ScriptSourceCode const &,WebCore::Node *) 0x64c50cd3 [chrome.dll - v8isolatedworld.cpp:73] WebCore::V8IsolatedWorld::evaluate(WTF::Vector<WebCore::ScriptSourceCode,0> const &,WebCore::V8Proxy *,int) 0x64acae6f [chrome.dll - webframe_impl.cc:1606] WebFrameImpl::ExecuteScriptInNewWorld(WebKit::WebScriptSource const *,int,int) 0x64eaa56a [chrome.dll - user_script_slave.cc:165] UserScriptSlave::InjectScripts(WebFrame *,UserScript::RunLocation) 0x64eb3bdf [chrome.dll - render_view.cc:1403] RenderView::DidFinishDocumentLoadForFrame(WebView *,WebFrame *) 0x64ad481f [chrome.dll - webframeloaderclient_impl.cc:330] WebFrameLoaderClient::dispatchDidFinishDocumentLoad() 0x6542d95f [chrome.dll + 0x0097d95f] 0x64afe914 [chrome.dll - document.cpp:3926] WebCore::Document::finishedParsing() 0x64d06774 [chrome.dll - htmlparser.cpp:1633] WebCore::HTMLParser::finished() 0x64c5fd41 [chrome.dll - htmltokenizer.cpp:1846] WebCore::HTMLTokenizer::end() 0x64c5fbe7 [chrome.dll - htmltokenizer.cpp:1790] WebCore::HTMLTokenizer::write(WebCore::SegmentedString const &,bool) 0x64c60409 [chrome.dll - htmltokenizer.cpp:2053] WebCore::HTMLTokenizer::notifyFinished(WebCore::CachedResource *) 0x64cde6d2 [chrome.dll - cachedscript.cpp:55] WebCore::CachedScript::didAddClient(WebCore::CachedResourceClient *) 0x64c1f757 [chrome.dll - cachedresource.cpp:353] WebCore::CachedResource::switchClientsToRevalidatedResource() 0x64c2b5d3 [chrome.dll - cache.cpp:222] WebCore::Cache::revalidationSucceeded(WebCore::CachedResource *,WebCore::ResourceResponse const &) 0x64c2ebcd [chrome.dll - loader.cpp:454] WebCore::Loader::Host::didReceiveResponse(WebCore::SubresourceLoader *,WebCore::ResourceResponse const &) 0x64cf59e8 [chrome.dll - subresourceloader.cpp:137] WebCore::SubresourceLoader::didReceiveResponse(WebCore::ResourceResponse const &) 0x64c71d6a [chrome.dll - resourceloader.cpp:392] WebCore::ResourceLoader::didReceiveResponse(WebCore::ResourceHandle *,WebCore::ResourceResponse const &) 0x64d3d246 [chrome.dll - resourcehandle.cpp:124] WebCore::ResourceHandleInternal::didReceiveResponse(WebKit::WebURLLoader *,WebKit::WebURLResponse const &) 0x65072aea [chrome.dll - weburlloader_impl.cc:416] webkit_glue::WebURLLoaderImpl::Context::OnReceivedResponse(webkit_glue::ResourceLoaderBridge::ResponseInfo const &,bool) 0x65052663 [chrome.dll - resource_dispatcher.cc:346] ResourceDispatcher::OnReceivedResponse(int,ResourceResponseHead const &) 0x650537e0 [chrome.dll - ipc_message_utils.h:963] IPC::MessageWithTuple<Tuple2<int,ResourceResponseHead> >::Dispatch<ResourceDispatcher,void ( ResourceDispatcher::*)(int,ResourceResponseHead const &)>(IPC::Message const *,ResourceDispatcher *,void ( ResourceDispatcher::*)(int,ResourceResponseHead const &)) 0x65052b82 [chrome.dll - resource_dispatcher.cc:508] ResourceDispatcher::DispatchMessageW(IPC::Message const &) 0x6505252a [chrome.dll - resource_dispatcher.cc:292] ResourceDispatcher::OnMessageReceived(IPC::Message const &) 0x65050979 [chrome.dll - child_thread.cc:98] ChildThread::OnMessageReceived(IPC::Message const &) 0x64de0c1d [chrome.dll - ipc_channel_proxy.cc:184] IPC::ChannelProxy::Context::OnRemoveFilter(IPC::ChannelProxy::MessageFilter *) 0x64e982aa [chrome.dll - message_pump_default.cc:50] base::MessagePumpDefault::Run(base::MessagePump::Delegate *) 0x64e87aee [chrome.dll - message_loop.cc:199] MessageLoop::RunInternal() 0x64e87ab7 [chrome.dll - message_loop.cc:181] MessageLoop::RunHandler() 0x64e87a5a [chrome.dll - message_loop.cc:155] MessageLoop::Run() 0x64ea40b2 [chrome.dll - renderer_main.cc:148] RendererMain(MainFunctionParams const &) 0x64ab36f9 [chrome.dll - chrome_dll_main.cc:505] ChromeMain 0x01192bb0 [chrome.exe - google_update_client.cc:96] google_update::GoogleUpdateClient::Launch(HINSTANCE__ *,sandbox::SandboxInterfaceInfo *,wchar_t *,char const *,int *) 0x01192fe2 [chrome.exe - chrome_exe_main.cc:94] wWinMain Thread 1 Related Chromium bug: http://code.google.com/p/chromium/issues/detail?id=20393 143103 1 yurys 2009-08-27 06:56:44 -0700 The crash happens because of recent change in V8Proxy::context(Frame*) behavior (https://bugs.webkit.org/show_bug.cgi?id=27701). V8Proxy::context(Frame*) now tries to get entered V8IsolatedWorld and compare its frame with the frame passed as parameter to V8Proxy::context. In case of web inspector the latter frame is always Page's main frame which means that the comparison will fail for all iframes. 143105 2 38668 yurys 2009-08-27 07:34:15 -0700 Created attachment 38668 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. 143107 3 38669 yurys 2009-08-27 07:39:22 -0700 Created attachment 38669 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. 143110 4 pfeldman 2009-08-27 07:49:41 -0700 > + ScriptState* scriptState = frame->page()->inspectorController()->frontendScriptState(); I do not see this accessor in the InspectorController. Rest looks good. 143113 5 38670 yurys 2009-08-27 07:58:19 -0700 Created attachment 38670 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. Added missing InspectorController.h 143116 6 38670 dglazkov 2009-08-27 08:26:18 -0700 Comment on attachment 38670 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. > + > + Need a short description and bug URL (OOPS!) Probably didn't mean to leave this one in. r=me. This makes ScriptQuarantinedObject inspector-specific, but that's ok. 143117 7 pfeldman 2009-08-27 08:31:54 -0700 I'd like to land this myself in coordination with the Chromium build cycle. 143170 8 pfeldman 2009-08-27 12:41:05 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/v8/ScriptController.cpp M WebCore/bindings/v8/ScriptController.h M WebCore/bindings/v8/ScriptObjectQuarantine.cpp M WebCore/bindings/v8/ScriptScope.cpp M WebCore/bindings/v8/ScriptState.cpp M WebCore/bindings/v8/ScriptState.h M WebCore/bindings/v8/ScriptValue.h M WebCore/inspector/InspectorController.h Committed r47831 38668 2009-08-27 07:34:15 -0700 2009-08-27 07:39:22 -0700 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. scriptstate.patch text/plain 9181 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMDktMDgtMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKyAgICAgICAg U2NyaXB0U3RhdGUgbm93IGtlZXBzIGV4cGxpY2l0IEhhbmRsZSBvZiBkZXZ0b29scyBmcm9udC1l bmQKKyAgICAgICAgdXRpbGl0eSBjb250ZXh0IGluc3RlYWQgb2YgdHJ5aW5nIHRvIHJldHJpZXZl IGl0IGZyb20gaW5zcGVjdGVkCisgICAgICAgIEZyYW1lLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODc3MgorCisgICAgICAgICogYmluZGluZ3Mv djgvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250 cm9sbGVyLmg6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGluZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRRdWFyYW50aW5lZFNjcmlwdE9iamVjdCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvU2NyaXB0U2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny aXB0U2NvcGU6OlNjcmlwdFNjb3BlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTdGF0ZTo6U2NyaXB0U3RhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6On5TY3JpcHRTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpzY3JpcHRTdGF0ZUZyb21QYWdlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRT dGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6OmNvbnRleHQpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFZhbHVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRW YWx1ZTo6flNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlY4UHJveHk6OmNvbnRleHQpOgorCiAyMDA5LTA4LTI3ICBBcml5 YSBIaWRheWF0ICA8YXJpeWEuaGlkYXlhdEBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29u dHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250 cm9sbGVyLmNwcAkocmV2aXNpb24gNDc4MTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw2IEBACiAjaW5jbHVk ZSAibnBydW50aW1lX3ByaXYuaCIKICNpbmNsdWRlICJOUFY4T2JqZWN0LmgiCiAjaW5jbHVkZSAi U2NyaXB0U291cmNlQ29kZS5oIgotI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSAi V2lkZ2V0LmgiCiAjaW5jbHVkZSAiWFNTQXVkaXRvci5oIgogCkBAIC05MSw3ICs5MCw2IEBAIFNj cmlwdENvbnRyb2xsZXI6OlNjcmlwdENvbnRyb2xsZXIoRnJhbWUKICAgICAsIG1fc291cmNlVVJM KDApCiAgICAgLCBtX3Byb2Nlc3NpbmdUaW1lckNhbGxiYWNrKGZhbHNlKQogICAgICwgbV9wYXVz ZWQoZmFsc2UpCi0gICAgLCBtX3NjcmlwdFN0YXRlKG5ldyBTY3JpcHRTdGF0ZShmcmFtZSkpCiAg ICAgLCBtX3Byb3h5KG5ldyBWOFByb3h5KGZyYW1lKSkKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExV R0lOX0FQSSkKICAgICAsIG1fd2luZG93U2NyaXB0TlBPYmplY3QoMCkKSW5kZXg6IFdlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0 Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGcmFtZTsKICAgICBjbGFzcyBI VE1MUGx1Z0luRWxlbWVudDsKICAgICBjbGFzcyBTY3JpcHRTb3VyY2VDb2RlOwotICAgIGNsYXNz IFNjcmlwdFN0YXRlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBjbGFzcyBXaWRnZXQ7CiAgICAg Y2xhc3MgWFNTQXVkaXRvcjsKQEAgLTg2LDggKzg1LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAvLyB3aXRoIHdoYXQgSlNDIGRvZXMgYXMgd2VsbC4KICAgICAgICAgU2NyaXB0Q29u dHJvbGxlciogd2luZG93U2hlbGwoKSB7IHJldHVybiB0aGlzOyB9CiAKLSAgICAgICAgU2NyaXB0 U3RhdGUqIHN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JpcHRTdGF0ZS5nZXQoKTsgfQotCiAg ICAgICAgIFhTU0F1ZGl0b3IqIHhzc0F1ZGl0b3IoKSB7IHJldHVybiBtX1hTU0F1ZGl0b3IuZ2V0 KCk7IH0KIAogICAgICAgICB2b2lkIGNvbGxlY3RHYXJiYWdlKCk7CkBAIC0xNTcsNyArMTU0LDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fcHJvY2Vzc2luZ1RpbWVyQ2Fs bGJhY2s7CiAgICAgICAgIGJvb2wgbV9wYXVzZWQ7CiAKLSAgICAgICAgT3duUHRyPFNjcmlwdFN0 YXRlPiBtX3NjcmlwdFN0YXRlOwogICAgICAgICBPd25QdHI8VjhQcm94eT4gbV9wcm94eTsKICAg ICAgICAgdHlwZWRlZiBIYXNoTWFwPFdpZGdldCosIE5QT2JqZWN0Kj4gUGx1Z2luT2JqZWN0TWFw OwogCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGlu ZS5jcHAJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRPYmpl Y3RRdWFyYW50aW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRE9NV2luZG93LmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKKyNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgog I2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCkBAIC03 NSw3ICs3Niw4IEBAIGJvb2wgZ2V0UXVhcmFudGluZWRTY3JpcHRPYmplY3QoU3RvcmFnZSoKICAg ICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUoY29udGV4dCk7CiAKICAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gdjhTdG9yYWdlID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENs YXNzSW5kZXg6OlNUT1JBR0UsIHN0b3JhZ2UpOwotICAgIHF1YXJhbnRpbmVkT2JqZWN0ID0gU2Ny aXB0T2JqZWN0KGZyYW1lLT5zY3JpcHQoKS0+c3RhdGUoKSwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+ KHY4OjpPYmplY3Q6OkNhc3QoKnY4U3RvcmFnZSkpKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0 U3RhdGUgPSBmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmZyb250ZW5kU2Ny aXB0U3RhdGUoKTsKKyAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChzY3JpcHRT dGF0ZSwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+KHY4OjpPYmplY3Q6OkNhc3QoKnY4U3RvcmFnZSkp KTsKICNlbHNlCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcXVhcmFudGluZWRPYmpl Y3QgPSBTY3JpcHRPYmplY3QoKTsKQEAgLTk2LDcgKzk4LDggQEAgYm9vbCBnZXRRdWFyYW50aW5l ZFNjcmlwdE9iamVjdChOb2RlKiBubwogICAgIHY4OjpDb250ZXh0OjpTY29wZSBzY29wZShjb250 ZXh0KTsKIAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2OE5vZGUgPSBWOERPTVdyYXBwZXI6 OmNvbnZlcnROb2RlVG9WOE9iamVjdChub2RlKTsKLSAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNj cmlwdE9iamVjdChmcmFtZS0+c2NyaXB0KCktPnN0YXRlKCksIHY4OjpMb2NhbDx2ODo6T2JqZWN0 Pih2ODo6T2JqZWN0OjpDYXN0KCp2OE5vZGUpKSk7CisgICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0 YXRlID0gZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5mcm9udGVuZFNjcmlw dFN0YXRlKCk7CisgICAgcXVhcmFudGluZWRPYmplY3QgPSBTY3JpcHRPYmplY3Qoc2NyaXB0U3Rh dGUsIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OE5vZGUpKSk7CiAK ICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTExMyw3ICsxMTYsOCBAQCBib29sIGdldFF1YXJhbnRp bmVkU2NyaXB0T2JqZWN0KERPTVdpbmRvCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKGNv bnRleHQpOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4RG9tV2luZG93ID0gVjhET01X cmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgZG9tV2lu ZG93KTsKLSAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChmcmFtZS0+c2NyaXB0 KCktPnN0YXRlKCksIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OERv bVdpbmRvdykpKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUgPSBmcmFtZS0+cGFnZSgp LT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmZyb250ZW5kU2NyaXB0U3RhdGUoKTsKKyAgICBxdWFy YW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChzY3JpcHRTdGF0ZSwgdjg6OkxvY2FsPHY4OjpP YmplY3Q+KHY4OjpPYmplY3Q6OkNhc3QoKnY4RG9tV2luZG93KSkpOwogCiAgICAgcmV0dXJuIHRy dWU7CiB9CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAkocmV2aXNpb24gNDc4 MTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzYsMTQgKzM2LDEzIEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJG cmFtZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgotI2luY2x1ZGUgIlY4UHJveHkuaCIKIAog I2luY2x1ZGUgPHY4Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2NyaXB0U2NvcGU6OlNj cmlwdFNjb3BlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgYm9vbCByZXBvcnRFeGNlcHRpb25z KQotICAgIDogbV9jb250ZXh0KFY4UHJveHk6OmNvbnRleHQoc2NyaXB0U3RhdGUtPmZyYW1lKCkp KQorICAgIDogbV9jb250ZXh0KHNjcmlwdFN0YXRlLT5jb250ZXh0KCkpCiAgICAgLCBtX3Njb3Bl KG1fY29udGV4dCkKICAgICAsIG1fc2NyaXB0U3RhdGUoc2NyaXB0U3RhdGUpCiAgICAgLCBtX3Jl cG9ydEV4Y2VwdGlvbnMocmVwb3J0RXhjZXB0aW9ucykKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0U3RhdGUuY3BwCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0U3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw5ICs0MiwyMiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIFNjcmlwdFN0YXRlOjpTY3JpcHRTdGF0ZShGcmFtZSogZnJhbWUpCiAgICAg OiBtX2ZyYW1lKGZyYW1lKQorICAgICwgbV9jb250ZXh0KHY4OjpQZXJzaXN0ZW50PHY4OjpDb250 ZXh0Pjo6TmV3KFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQoZnJhbWUpKSkKIHsKIH0KIAorU2Ny aXB0U3RhdGU6OlNjcmlwdFN0YXRlKEZyYW1lKiBmcmFtZSwgdjg6OkhhbmRsZTx2ODo6Q29udGV4 dD4gY29udGV4dCkKKyAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NvbnRleHQodjg6OlBl cnNpc3RlbnQ8djg6OkNvbnRleHQ+OjpOZXcoY29udGV4dCkpCit7Cit9CisKK1NjcmlwdFN0YXRl Ojp+U2NyaXB0U3RhdGUoKQoreworICAgIG1fY29udGV4dC5EaXNwb3NlKCk7CisgICAgbV9jb250 ZXh0LkNsZWFyKCk7Cit9CisKIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUq IG5vZGUpCiB7CiAgICAgLy8gVGhpcyBzaG91bGQgYmUgbmV2ZXIgcmVhY2hlZCB3aXRoIFY4IGJp bmRpbmdzIChXZWJLaXQgb25seSB1c2VzIGl0CkBAIC01NSw3ICs2OCw5IEBAIFNjcmlwdFN0YXRl KiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqIG4KIAogU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRl RnJvbVBhZ2UoUGFnZSogcGFnZSkKIHsKLSAgICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNj cmlwdCgpLT5zdGF0ZSgpOworICAgIC8vIFRoaXMgc2hvdWxkIGJlIG5ldmVyIHJlYWNoZWQgd2l0 aCBWOCBiaW5kaW5ncy4KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsK IH0KIAogfQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaAkocmV2aXNpb24gNDc4MTgp CisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAg LTMyLDE2ICszMiwxOSBAQAogI2RlZmluZSBTY3JpcHRTdGF0ZV9oCiAKICNpbmNsdWRlIDx2OC5o PgorI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgY2xhc3MgTm9kZTsKICAgICBjbGFzcyBQYWdlOwogICAgIGNsYXNzIEZyYW1lOwogCi0gICAg Y2xhc3MgU2NyaXB0U3RhdGUgeworICAgIGNsYXNzIFNjcmlwdFN0YXRlIDogcHVibGljIE5vbmNv cHlhYmxlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIFNjcmlwdFN0YXRlKCkgeyB9CiAgICAgICAg IFNjcmlwdFN0YXRlKEZyYW1lKiBmcmFtZSk7CisgICAgICAgIFNjcmlwdFN0YXRlKEZyYW1lKiBm cmFtZSwgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCk7CisgICAgICAgIH5TY3JpcHRT dGF0ZSgpOwogCiAgICAgICAgIGJvb2wgaGFkRXhjZXB0aW9uKCkgeyByZXR1cm4gIW1fZXhjZXB0 aW9uLklzRW1wdHkoKTsgfQogICAgICAgICB2b2lkIHNldEV4Y2VwdGlvbih2ODo6TG9jYWw8djg6 OlZhbHVlPiBleGNlcHRpb24pCkBAIC01MSwxMCArNTQsMTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBleGNlcHRpb24oKSB7IHJldHVybiBtX2V4 Y2VwdGlvbjsgfQogCiAgICAgICAgIEZyYW1lKiBmcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJh bWU7IH0KKyAgICAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0KCkgY29uc3QKKyAg ICAgICAgeworICAgICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6Q29udGV4dD46Ok5ldyht X2NvbnRleHQpOworICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICB2ODo6TG9jYWw8 djg6OlZhbHVlPiBtX2V4Y2VwdGlvbjsKICAgICAgICAgRnJhbWUqIG1fZnJhbWU7CisgICAgICAg IHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBtX2NvbnRleHQ7CiAgICAgfTsKIAogICAgIFNj cmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqKTsKSW5kZXg6IFdlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0VmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFZhbHVlLmgJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRWYWx1ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyArMTMzLDcgQEAgcHVibGljOgog ICAgICAgICBtX3ZhbHVlLkNsZWFyKCk7CiAgICAgfQogCi0gICAgflNjcmlwdFZhbHVlKCkgCisg ICAgdmlydHVhbCB+U2NyaXB0VmFsdWUoKSAKICAgICB7CiAgICAgICAgIGNsZWFyKCk7CiAgICAg fQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNv cmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTMsNiArMTA5 MywxMCBAQCB2ODo6TG9jYWw8djg6OkNvbnRleHQ+IFY4UHJveHk6OmNvbnRleHQoCiAKICAgICBp ZiAoVjhJc29sYXRlZFdvcmxkKiB3b3JsZCA9IFY4SXNvbGF0ZWRXb3JsZDo6Z2V0RW50ZXJlZCgp KSB7CiAgICAgICAgIGNvbnRleHQgPSB2ODo6TG9jYWw8djg6OkNvbnRleHQ+OjpOZXcod29ybGQt PmNvbnRleHQoKSk7CisgICAgICAgIEZyYW1lKiBmZiA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWUo Y29udGV4dCk7CisgICAgICAgIEZyYW1lKiBtZiA9IGZmLT5wYWdlKCktPm1haW5GcmFtZSgpOwor ICAgICAgICBib29sIGlzX21mID0gbWYgPT0gZnJhbWU7CisgICAgICAgIGJvb2wgaXNfbWYxID0g bWYgPT0gZmY7CiAgICAgICAgIGlmIChmcmFtZSAhPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lKGNv bnRleHQpKQogICAgICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4oKTsKICAg ICB9Cg== 38669 2009-08-27 07:39:22 -0700 2009-08-27 07:58:19 -0700 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. scriptstate2.patch text/plain 8495 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMDktMDgtMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKyAgICAgICAg U2NyaXB0U3RhdGUgbm93IGtlZXBzIGV4cGxpY2l0IEhhbmRsZSBvZiBkZXZ0b29scyBmcm9udC1l bmQKKyAgICAgICAgdXRpbGl0eSBjb250ZXh0IGluc3RlYWQgb2YgdHJ5aW5nIHRvIHJldHJpZXZl IGl0IGZyb20gaW5zcGVjdGVkCisgICAgICAgIEZyYW1lLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODc3MgorCisgICAgICAgICogYmluZGluZ3Mv djgvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250 cm9sbGVyLmg6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGluZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRRdWFyYW50aW5lZFNjcmlwdE9iamVjdCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvU2NyaXB0U2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny aXB0U2NvcGU6OlNjcmlwdFNjb3BlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTdGF0ZTo6U2NyaXB0U3RhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6On5TY3JpcHRTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpzY3JpcHRTdGF0ZUZyb21QYWdlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRT dGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6OmNvbnRleHQpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFZhbHVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRW YWx1ZTo6flNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlY4UHJveHk6OmNvbnRleHQpOgorCiAyMDA5LTA4LTI3ICBBcml5 YSBIaWRheWF0ICA8YXJpeWEuaGlkYXlhdEBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29u dHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250 cm9sbGVyLmNwcAkocmV2aXNpb24gNDc4MTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw2IEBACiAjaW5jbHVk ZSAibnBydW50aW1lX3ByaXYuaCIKICNpbmNsdWRlICJOUFY4T2JqZWN0LmgiCiAjaW5jbHVkZSAi U2NyaXB0U291cmNlQ29kZS5oIgotI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSAi V2lkZ2V0LmgiCiAjaW5jbHVkZSAiWFNTQXVkaXRvci5oIgogCkBAIC05MSw3ICs5MCw2IEBAIFNj cmlwdENvbnRyb2xsZXI6OlNjcmlwdENvbnRyb2xsZXIoRnJhbWUKICAgICAsIG1fc291cmNlVVJM KDApCiAgICAgLCBtX3Byb2Nlc3NpbmdUaW1lckNhbGxiYWNrKGZhbHNlKQogICAgICwgbV9wYXVz ZWQoZmFsc2UpCi0gICAgLCBtX3NjcmlwdFN0YXRlKG5ldyBTY3JpcHRTdGF0ZShmcmFtZSkpCiAg ICAgLCBtX3Byb3h5KG5ldyBWOFByb3h5KGZyYW1lKSkKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExV R0lOX0FQSSkKICAgICAsIG1fd2luZG93U2NyaXB0TlBPYmplY3QoMCkKSW5kZXg6IFdlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0 Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGcmFtZTsKICAgICBjbGFzcyBI VE1MUGx1Z0luRWxlbWVudDsKICAgICBjbGFzcyBTY3JpcHRTb3VyY2VDb2RlOwotICAgIGNsYXNz IFNjcmlwdFN0YXRlOwogICAgIGNsYXNzIFN0cmluZzsKICAgICBjbGFzcyBXaWRnZXQ7CiAgICAg Y2xhc3MgWFNTQXVkaXRvcjsKQEAgLTg2LDggKzg1LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAvLyB3aXRoIHdoYXQgSlNDIGRvZXMgYXMgd2VsbC4KICAgICAgICAgU2NyaXB0Q29u dHJvbGxlciogd2luZG93U2hlbGwoKSB7IHJldHVybiB0aGlzOyB9CiAKLSAgICAgICAgU2NyaXB0 U3RhdGUqIHN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JpcHRTdGF0ZS5nZXQoKTsgfQotCiAg ICAgICAgIFhTU0F1ZGl0b3IqIHhzc0F1ZGl0b3IoKSB7IHJldHVybiBtX1hTU0F1ZGl0b3IuZ2V0 KCk7IH0KIAogICAgICAgICB2b2lkIGNvbGxlY3RHYXJiYWdlKCk7CkBAIC0xNTcsNyArMTU0LDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fcHJvY2Vzc2luZ1RpbWVyQ2Fs bGJhY2s7CiAgICAgICAgIGJvb2wgbV9wYXVzZWQ7CiAKLSAgICAgICAgT3duUHRyPFNjcmlwdFN0 YXRlPiBtX3NjcmlwdFN0YXRlOwogICAgICAgICBPd25QdHI8VjhQcm94eT4gbV9wcm94eTsKICAg ICAgICAgdHlwZWRlZiBIYXNoTWFwPFdpZGdldCosIE5QT2JqZWN0Kj4gUGx1Z2luT2JqZWN0TWFw OwogCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGlu ZS5jcHAJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRPYmpl Y3RRdWFyYW50aW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRE9NV2luZG93LmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKKyNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgog I2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCkBAIC03 NSw3ICs3Niw4IEBAIGJvb2wgZ2V0UXVhcmFudGluZWRTY3JpcHRPYmplY3QoU3RvcmFnZSoKICAg ICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUoY29udGV4dCk7CiAKICAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gdjhTdG9yYWdlID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENs YXNzSW5kZXg6OlNUT1JBR0UsIHN0b3JhZ2UpOwotICAgIHF1YXJhbnRpbmVkT2JqZWN0ID0gU2Ny aXB0T2JqZWN0KGZyYW1lLT5zY3JpcHQoKS0+c3RhdGUoKSwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+ KHY4OjpPYmplY3Q6OkNhc3QoKnY4U3RvcmFnZSkpKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0 U3RhdGUgPSBmcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmZyb250ZW5kU2Ny aXB0U3RhdGUoKTsKKyAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChzY3JpcHRT dGF0ZSwgdjg6OkxvY2FsPHY4OjpPYmplY3Q+KHY4OjpPYmplY3Q6OkNhc3QoKnY4U3RvcmFnZSkp KTsKICNlbHNlCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcXVhcmFudGluZWRPYmpl Y3QgPSBTY3JpcHRPYmplY3QoKTsKQEAgLTk2LDcgKzk4LDggQEAgYm9vbCBnZXRRdWFyYW50aW5l ZFNjcmlwdE9iamVjdChOb2RlKiBubwogICAgIHY4OjpDb250ZXh0OjpTY29wZSBzY29wZShjb250 ZXh0KTsKIAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2OE5vZGUgPSBWOERPTVdyYXBwZXI6 OmNvbnZlcnROb2RlVG9WOE9iamVjdChub2RlKTsKLSAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNj cmlwdE9iamVjdChmcmFtZS0+c2NyaXB0KCktPnN0YXRlKCksIHY4OjpMb2NhbDx2ODo6T2JqZWN0 Pih2ODo6T2JqZWN0OjpDYXN0KCp2OE5vZGUpKSk7CisgICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0 YXRlID0gZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5mcm9udGVuZFNjcmlw dFN0YXRlKCk7CisgICAgcXVhcmFudGluZWRPYmplY3QgPSBTY3JpcHRPYmplY3Qoc2NyaXB0U3Rh dGUsIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OE5vZGUpKSk7CiAK ICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTExMyw3ICsxMTYsOCBAQCBib29sIGdldFF1YXJhbnRp bmVkU2NyaXB0T2JqZWN0KERPTVdpbmRvCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKGNv bnRleHQpOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4RG9tV2luZG93ID0gVjhET01X cmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6OkRPTVdJTkRPVywgZG9tV2lu ZG93KTsKLSAgICBxdWFyYW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChmcmFtZS0+c2NyaXB0 KCktPnN0YXRlKCksIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OERv bVdpbmRvdykpKTsKKyAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUgPSBmcmFtZS0+cGFnZSgp LT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmZyb250ZW5kU2NyaXB0U3RhdGUoKTsKKyAgICBxdWFy YW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChzY3JpcHRTdGF0ZSwgdjg6OkxvY2FsPHY4OjpP YmplY3Q+KHY4OjpPYmplY3Q6OkNhc3QoKnY4RG9tV2luZG93KSkpOwogCiAgICAgcmV0dXJuIHRy dWU7CiB9CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAkocmV2aXNpb24gNDc4 MTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFNjb3BlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzYsMTQgKzM2LDEzIEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJG cmFtZS5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgotI2luY2x1ZGUgIlY4UHJveHkuaCIKIAog I2luY2x1ZGUgPHY4Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2NyaXB0U2NvcGU6OlNj cmlwdFNjb3BlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgYm9vbCByZXBvcnRFeGNlcHRpb25z KQotICAgIDogbV9jb250ZXh0KFY4UHJveHk6OmNvbnRleHQoc2NyaXB0U3RhdGUtPmZyYW1lKCkp KQorICAgIDogbV9jb250ZXh0KHNjcmlwdFN0YXRlLT5jb250ZXh0KCkpCiAgICAgLCBtX3Njb3Bl KG1fY29udGV4dCkKICAgICAsIG1fc2NyaXB0U3RhdGUoc2NyaXB0U3RhdGUpCiAgICAgLCBtX3Jl cG9ydEV4Y2VwdGlvbnMocmVwb3J0RXhjZXB0aW9ucykKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0U3RhdGUuY3BwCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0U3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw5ICs0MiwyMiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIFNjcmlwdFN0YXRlOjpTY3JpcHRTdGF0ZShGcmFtZSogZnJhbWUpCiAgICAg OiBtX2ZyYW1lKGZyYW1lKQorICAgICwgbV9jb250ZXh0KHY4OjpQZXJzaXN0ZW50PHY4OjpDb250 ZXh0Pjo6TmV3KFY4UHJveHk6Om1haW5Xb3JsZENvbnRleHQoZnJhbWUpKSkKIHsKIH0KIAorU2Ny aXB0U3RhdGU6OlNjcmlwdFN0YXRlKEZyYW1lKiBmcmFtZSwgdjg6OkhhbmRsZTx2ODo6Q29udGV4 dD4gY29udGV4dCkKKyAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NvbnRleHQodjg6OlBl cnNpc3RlbnQ8djg6OkNvbnRleHQ+OjpOZXcoY29udGV4dCkpCit7Cit9CisKK1NjcmlwdFN0YXRl Ojp+U2NyaXB0U3RhdGUoKQoreworICAgIG1fY29udGV4dC5EaXNwb3NlKCk7CisgICAgbV9jb250 ZXh0LkNsZWFyKCk7Cit9CisKIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUq IG5vZGUpCiB7CiAgICAgLy8gVGhpcyBzaG91bGQgYmUgbmV2ZXIgcmVhY2hlZCB3aXRoIFY4IGJp bmRpbmdzIChXZWJLaXQgb25seSB1c2VzIGl0CkBAIC01NSw3ICs2OCw5IEBAIFNjcmlwdFN0YXRl KiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqIG4KIAogU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRl RnJvbVBhZ2UoUGFnZSogcGFnZSkKIHsKLSAgICByZXR1cm4gcGFnZS0+bWFpbkZyYW1lKCktPnNj cmlwdCgpLT5zdGF0ZSgpOworICAgIC8vIFRoaXMgc2hvdWxkIGJlIG5ldmVyIHJlYWNoZWQgd2l0 aCBWOCBiaW5kaW5ncy4KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsK IH0KIAogfQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRTdGF0ZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0U3RhdGUuaAkocmV2aXNpb24gNDc4MTgp CisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAg LTMyLDE2ICszMiwxOSBAQAogI2RlZmluZSBTY3JpcHRTdGF0ZV9oCiAKICNpbmNsdWRlIDx2OC5o PgorI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgY2xhc3MgTm9kZTsKICAgICBjbGFzcyBQYWdlOwogICAgIGNsYXNzIEZyYW1lOwogCi0gICAg Y2xhc3MgU2NyaXB0U3RhdGUgeworICAgIGNsYXNzIFNjcmlwdFN0YXRlIDogcHVibGljIE5vbmNv cHlhYmxlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIFNjcmlwdFN0YXRlKCkgeyB9CiAgICAgICAg IFNjcmlwdFN0YXRlKEZyYW1lKiBmcmFtZSk7CisgICAgICAgIFNjcmlwdFN0YXRlKEZyYW1lKiBm cmFtZSwgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCk7CisgICAgICAgIH5TY3JpcHRT dGF0ZSgpOwogCiAgICAgICAgIGJvb2wgaGFkRXhjZXB0aW9uKCkgeyByZXR1cm4gIW1fZXhjZXB0 aW9uLklzRW1wdHkoKTsgfQogICAgICAgICB2b2lkIHNldEV4Y2VwdGlvbih2ODo6TG9jYWw8djg6 OlZhbHVlPiBleGNlcHRpb24pCkBAIC01MSwxMCArNTQsMTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBleGNlcHRpb24oKSB7IHJldHVybiBtX2V4 Y2VwdGlvbjsgfQogCiAgICAgICAgIEZyYW1lKiBmcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJh bWU7IH0KKyAgICAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBjb250ZXh0KCkgY29uc3QKKyAg ICAgICAgeworICAgICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6Q29udGV4dD46Ok5ldyht X2NvbnRleHQpOworICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICB2ODo6TG9jYWw8 djg6OlZhbHVlPiBtX2V4Y2VwdGlvbjsKICAgICAgICAgRnJhbWUqIG1fZnJhbWU7CisgICAgICAg IHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0PiBtX2NvbnRleHQ7CiAgICAgfTsKIAogICAgIFNj cmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21Ob2RlKE5vZGUqKTsKSW5kZXg6IFdlYkNvcmUvYmlu ZGluZ3MvdjgvU2NyaXB0VmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdFZhbHVlLmgJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRWYWx1ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyArMTMzLDcgQEAgcHVibGljOgog ICAgICAgICBtX3ZhbHVlLkNsZWFyKCk7CiAgICAgfQogCi0gICAgflNjcmlwdFZhbHVlKCkgCisg ICAgdmlydHVhbCB+U2NyaXB0VmFsdWUoKSAKICAgICB7CiAgICAgICAgIGNsZWFyKCk7CiAgICAg fQo= 38670 2009-08-27 07:58:19 -0700 2009-08-27 08:26:18 -0700 Retrieve inspector frontend ScriptState from InspectorController. Keep explicit handle to the v8::Context in ScriptState. scriptstate3.patch text/plain 9100 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzgxOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMDktMDgtMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKyAgICAgICAg U2NyaXB0U3RhdGUgbm93IGtlZXBzIGV4cGxpY2l0IEhhbmRsZSBvZiBkZXZ0b29scyBmcm9udC1l bmQKKyAgICAgICAgdXRpbGl0eSBjb250ZXh0IGluc3RlYWQgb2YgdHJ5aW5nIHRvIHJldHJpZXZl IGl0IGZyb20gaW5zcGVjdGVkCisgICAgICAgIEZyYW1lLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODc3MgorCisgICAgICAgICogYmluZGluZ3Mv djgvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpTY3JpcHRDb250cm9sbGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250 cm9sbGVyLmg6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGluZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRRdWFyYW50aW5lZFNjcmlwdE9iamVjdCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvU2NyaXB0U2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny aXB0U2NvcGU6OlNjcmlwdFNjb3BlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTdGF0ZTo6U2NyaXB0U3RhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6On5TY3JpcHRTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpzY3JpcHRTdGF0ZUZyb21QYWdlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRT dGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0U3RhdGU6OmNvbnRleHQpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1NjcmlwdFZhbHVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRW YWx1ZTo6flNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZnJvbnRlbmRT Y3JpcHRTdGF0ZSk6CisKIDIwMDktMDgtMjcgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJD b3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ3ODE4KQorKysg V2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNiBAQAogI2luY2x1ZGUgIm5wcnVudGltZV9wcml2LmgiCiAjaW5jbHVkZSAi TlBWOE9iamVjdC5oIgogI2luY2x1ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKLSNpbmNsdWRlICJT Y3JpcHRTdGF0ZS5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogI2luY2x1ZGUgIlhTU0F1ZGl0b3Iu aCIKIApAQCAtOTEsNyArOTAsNiBAQCBTY3JpcHRDb250cm9sbGVyOjpTY3JpcHRDb250cm9sbGVy KEZyYW1lCiAgICAgLCBtX3NvdXJjZVVSTCgwKQogICAgICwgbV9wcm9jZXNzaW5nVGltZXJDYWxs YmFjayhmYWxzZSkKICAgICAsIG1fcGF1c2VkKGZhbHNlKQotICAgICwgbV9zY3JpcHRTdGF0ZShu ZXcgU2NyaXB0U3RhdGUoZnJhbWUpKQogICAgICwgbV9wcm94eShuZXcgVjhQcm94eShmcmFtZSkp CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgLCBtX3dpbmRvd1NjcmlwdE5Q T2JqZWN0KDApCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaAkocmV2 aXNpb24gNDc4MTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuaAko d29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgRnJhbWU7CiAgICAgY2xhc3MgSFRNTFBsdWdJbkVsZW1lbnQ7CiAgICAgY2xhc3MgU2Ny aXB0U291cmNlQ29kZTsKLSAgICBjbGFzcyBTY3JpcHRTdGF0ZTsKICAgICBjbGFzcyBTdHJpbmc7 CiAgICAgY2xhc3MgV2lkZ2V0OwogICAgIGNsYXNzIFhTU0F1ZGl0b3I7CkBAIC04Niw4ICs4NSw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gd2l0aCB3aGF0IEpTQyBkb2VzIGFz IHdlbGwuCiAgICAgICAgIFNjcmlwdENvbnRyb2xsZXIqIHdpbmRvd1NoZWxsKCkgeyByZXR1cm4g dGhpczsgfQogCi0gICAgICAgIFNjcmlwdFN0YXRlKiBzdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1f c2NyaXB0U3RhdGUuZ2V0KCk7IH0KLQogICAgICAgICBYU1NBdWRpdG9yKiB4c3NBdWRpdG9yKCkg eyByZXR1cm4gbV9YU1NBdWRpdG9yLmdldCgpOyB9CiAKICAgICAgICAgdm9pZCBjb2xsZWN0R2Fy YmFnZSgpOwpAQCAtMTU3LDcgKzE1NCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg Ym9vbCBtX3Byb2Nlc3NpbmdUaW1lckNhbGxiYWNrOwogICAgICAgICBib29sIG1fcGF1c2VkOwog Ci0gICAgICAgIE93blB0cjxTY3JpcHRTdGF0ZT4gbV9zY3JpcHRTdGF0ZTsKICAgICAgICAgT3du UHRyPFY4UHJveHk+IG1fcHJveHk7CiAgICAgICAgIHR5cGVkZWYgSGFzaE1hcDxXaWRnZXQqLCBO UE9iamVjdCo+IFBsdWdpbk9iamVjdE1hcDsKIApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRPYmplY3RRdWFyYW50aW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuY3BwCShyZXZpc2lvbiA0NzgxOCkKKysrIFdlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0T2JqZWN0UXVhcmFudGluZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRPTVdp bmRvdy5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxl ci5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKICNpbmNs dWRlICJTY3JpcHRWYWx1ZS5oIgpAQCAtNzUsNyArNzYsOCBAQCBib29sIGdldFF1YXJhbnRpbmVk U2NyaXB0T2JqZWN0KFN0b3JhZ2UqCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKGNvbnRl eHQpOwogCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4U3RvcmFnZSA9IFY4RE9NV3JhcHBl cjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpTVE9SQUdFLCBzdG9yYWdlKTsKLSAg ICBxdWFyYW50aW5lZE9iamVjdCA9IFNjcmlwdE9iamVjdChmcmFtZS0+c2NyaXB0KCktPnN0YXRl KCksIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OFN0b3JhZ2UpKSk7 CisgICAgU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlID0gZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9y Q29udHJvbGxlcigpLT5mcm9udGVuZFNjcmlwdFN0YXRlKCk7CisgICAgcXVhcmFudGluZWRPYmpl Y3QgPSBTY3JpcHRPYmplY3Qoc2NyaXB0U3RhdGUsIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6 T2JqZWN0OjpDYXN0KCp2OFN0b3JhZ2UpKSk7CiAjZWxzZQogICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgIHF1YXJhbnRpbmVkT2JqZWN0ID0gU2NyaXB0T2JqZWN0KCk7CkBAIC05Niw3ICs5 OCw4IEBAIGJvb2wgZ2V0UXVhcmFudGluZWRTY3JpcHRPYmplY3QoTm9kZSogbm8KICAgICB2ODo6 Q29udGV4dDo6U2NvcGUgc2NvcGUoY29udGV4dCk7CiAKICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gdjhOb2RlID0gVjhET01XcmFwcGVyOjpjb252ZXJ0Tm9kZVRvVjhPYmplY3Qobm9kZSk7Ci0g ICAgcXVhcmFudGluZWRPYmplY3QgPSBTY3JpcHRPYmplY3QoZnJhbWUtPnNjcmlwdCgpLT5zdGF0 ZSgpLCB2ODo6TG9jYWw8djg6Ok9iamVjdD4odjg6Ok9iamVjdDo6Q2FzdCgqdjhOb2RlKSkpOwor ICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSA9IGZyYW1lLT5wYWdlKCktPmluc3BlY3RvckNv bnRyb2xsZXIoKS0+ZnJvbnRlbmRTY3JpcHRTdGF0ZSgpOworICAgIHF1YXJhbnRpbmVkT2JqZWN0 ID0gU2NyaXB0T2JqZWN0KHNjcmlwdFN0YXRlLCB2ODo6TG9jYWw8djg6Ok9iamVjdD4odjg6Ok9i amVjdDo6Q2FzdCgqdjhOb2RlKSkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0xMTMsNyAr MTE2LDggQEAgYm9vbCBnZXRRdWFyYW50aW5lZFNjcmlwdE9iamVjdChET01XaW5kbwogICAgIHY4 OjpDb250ZXh0OjpTY29wZSBzY29wZShjb250ZXh0KTsKIAogICAgIHY4OjpIYW5kbGU8djg6OlZh bHVlPiB2OERvbVdpbmRvdyA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFz c0luZGV4OjpET01XSU5ET1csIGRvbVdpbmRvdyk7Ci0gICAgcXVhcmFudGluZWRPYmplY3QgPSBT Y3JpcHRPYmplY3QoZnJhbWUtPnNjcmlwdCgpLT5zdGF0ZSgpLCB2ODo6TG9jYWw8djg6Ok9iamVj dD4odjg6Ok9iamVjdDo6Q2FzdCgqdjhEb21XaW5kb3cpKSk7CisgICAgU2NyaXB0U3RhdGUqIHNj cmlwdFN0YXRlID0gZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5mcm9udGVu ZFNjcmlwdFN0YXRlKCk7CisgICAgcXVhcmFudGluZWRPYmplY3QgPSBTY3JpcHRPYmplY3Qoc2Ny aXB0U3RhdGUsIHY4OjpMb2NhbDx2ODo6T2JqZWN0Pih2ODo6T2JqZWN0OjpDYXN0KCp2OERvbVdp bmRvdykpKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92 OC9TY3JpcHRTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9TY3Jp cHRTY29wZS5jcHAJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9TY3Jp cHRTY29wZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE0ICszNiwxMyBAQAogI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIK LSNpbmNsdWRlICJWOFByb3h5LmgiCiAKICNpbmNsdWRlIDx2OC5oPgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKIFNjcmlwdFNjb3BlOjpTY3JpcHRTY29wZShTY3JpcHRTdGF0ZSogc2NyaXB0U3Rh dGUsIGJvb2wgcmVwb3J0RXhjZXB0aW9ucykKLSAgICA6IG1fY29udGV4dChWOFByb3h5Ojpjb250 ZXh0KHNjcmlwdFN0YXRlLT5mcmFtZSgpKSkKKyAgICA6IG1fY29udGV4dChzY3JpcHRTdGF0ZS0+ Y29udGV4dCgpKQogICAgICwgbV9zY29wZShtX2NvbnRleHQpCiAgICAgLCBtX3NjcmlwdFN0YXRl KHNjcmlwdFN0YXRlKQogICAgICwgbV9yZXBvcnRFeGNlcHRpb25zKHJlcG9ydEV4Y2VwdGlvbnMp CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAkocmV2aXNpb24gNDc4MTgpCisr KyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFN0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDIsOSArNDIsMjIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTY3JpcHRTdGF0ZTo6U2NyaXB0 U3RhdGUoRnJhbWUqIGZyYW1lKQogICAgIDogbV9mcmFtZShmcmFtZSkKKyAgICAsIG1fY29udGV4 dCh2ODo6UGVyc2lzdGVudDx2ODo6Q29udGV4dD46Ok5ldyhWOFByb3h5OjptYWluV29ybGRDb250 ZXh0KGZyYW1lKSkpCiB7CiB9CiAKK1NjcmlwdFN0YXRlOjpTY3JpcHRTdGF0ZShGcmFtZSogZnJh bWUsIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQpCisgICAgOiBtX2ZyYW1lKGZyYW1l KQorICAgICwgbV9jb250ZXh0KHY4OjpQZXJzaXN0ZW50PHY4OjpDb250ZXh0Pjo6TmV3KGNvbnRl eHQpKQoreworfQorCitTY3JpcHRTdGF0ZTo6flNjcmlwdFN0YXRlKCkKK3sKKyAgICBtX2NvbnRl eHQuRGlzcG9zZSgpOworICAgIG1fY29udGV4dC5DbGVhcigpOworfQorCiBTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGVGcm9tTm9kZShOb2RlKiBub2RlKQogewogICAgIC8vIFRoaXMgc2hvdWxkIGJl IG5ldmVyIHJlYWNoZWQgd2l0aCBWOCBiaW5kaW5ncyAoV2ViS2l0IG9ubHkgdXNlcyBpdApAQCAt NTUsNyArNjgsOSBAQCBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tTm9kZShOb2RlKiBuCiAK IFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZUZyb21QYWdlKFBhZ2UqIHBhZ2UpCiB7Ci0gICAgcmV0 dXJuIHBhZ2UtPm1haW5GcmFtZSgpLT5zY3JpcHQoKS0+c3RhdGUoKTsKKyAgICAvLyBUaGlzIHNo b3VsZCBiZSBuZXZlciByZWFjaGVkIHdpdGggVjggYmluZGluZ3MuCisgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgcmV0dXJuIDA7CiB9CiAKIH0KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0U3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Njcmlw dFN0YXRlLmgJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRT dGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwxNiArMzIsMTkgQEAKICNkZWZpbmUgU2NyaXB0 U3RhdGVfaAogCiAjaW5jbHVkZSA8djguaD4KKyNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIE5vZGU7CiAgICAgY2xhc3MgUGFnZTsK ICAgICBjbGFzcyBGcmFtZTsKIAotICAgIGNsYXNzIFNjcmlwdFN0YXRlIHsKKyAgICBjbGFzcyBT Y3JpcHRTdGF0ZSA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CiAgICAgcHVibGljOgogICAgICAgICBT Y3JpcHRTdGF0ZSgpIHsgfQogICAgICAgICBTY3JpcHRTdGF0ZShGcmFtZSogZnJhbWUpOworICAg ICAgICBTY3JpcHRTdGF0ZShGcmFtZSogZnJhbWUsIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNv bnRleHQpOworICAgICAgICB+U2NyaXB0U3RhdGUoKTsKIAogICAgICAgICBib29sIGhhZEV4Y2Vw dGlvbigpIHsgcmV0dXJuICFtX2V4Y2VwdGlvbi5Jc0VtcHR5KCk7IH0KICAgICAgICAgdm9pZCBz ZXRFeGNlcHRpb24odjg6OkxvY2FsPHY4OjpWYWx1ZT4gZXhjZXB0aW9uKQpAQCAtNTEsMTAgKzU0 LDE1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4g ZXhjZXB0aW9uKCkgeyByZXR1cm4gbV9leGNlcHRpb247IH0KIAogICAgICAgICBGcmFtZSogZnJh bWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lOyB9CisgICAgICAgIHY4OjpMb2NhbDx2ODo6Q29u dGV4dD4gY29udGV4dCgpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiB2ODo6 TG9jYWw8djg6OkNvbnRleHQ+OjpOZXcobV9jb250ZXh0KTsKKyAgICAgICAgfQogCiAgICAgcHJp dmF0ZToKICAgICAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gbV9leGNlcHRpb247CiAgICAgICAg IEZyYW1lKiBtX2ZyYW1lOworICAgICAgICB2ODo6UGVyc2lzdGVudDx2ODo6Q29udGV4dD4gbV9j b250ZXh0OwogICAgIH07CiAKICAgICBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGVGcm9tTm9kZShO b2RlKik7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFZhbHVlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRWYWx1ZS5oCShyZXZpc2lvbiA0NzgxOCkK KysrIFdlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0VmFsdWUuaAkod29ya2luZyBjb3B5KQpAQCAt MTMzLDcgKzEzMyw3IEBAIHB1YmxpYzoKICAgICAgICAgbV92YWx1ZS5DbGVhcigpOwogICAgIH0K IAotICAgIH5TY3JpcHRWYWx1ZSgpIAorICAgIHZpcnR1YWwgflNjcmlwdFZhbHVlKCkgCiAgICAg ewogICAgICAgICBjbGVhcigpOwogICAgIH0KSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmgJKHJldmlzaW9uIDQ3ODE4KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsNiArMTk3LDcgQEAgcHVi bGljOgogICAgIHZvaWQgd2luZG93U2NyaXB0T2JqZWN0QXZhaWxhYmxlKCk7CiAKICAgICB2b2lk IHNldEZyb250ZW5kUHJveHlPYmplY3QoU2NyaXB0U3RhdGUqIHN0YXRlLCBTY3JpcHRPYmplY3Qg d2ViSW5zcGVjdG9yT2JqLCBTY3JpcHRPYmplY3QgaW5qZWN0ZWRTY3JpcHRPYmogPSBTY3JpcHRP YmplY3QoKSk7CisgICAgU2NyaXB0U3RhdGUqIGZyb250ZW5kU2NyaXB0U3RhdGUoKSBjb25zdCB7 IHJldHVybiBtX3NjcmlwdFN0YXRlOyB9CiAKICAgICB2b2lkIHBvcHVsYXRlU2NyaXB0T2JqZWN0 cygpOwogICAgIHZvaWQgcmVzZXRTY3JpcHRPYmplY3RzKCk7Cg==