101241 2012-11-05 11:45:56 -0800 [EFL] [WK2] Random crash in Minibrowser 2012-11-06 16:17:44 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ostap73 webkit-unassigned cdumez gyuyoung.kim kalyan.kondapally lucas.de.marchi rakuco webkit.review.bot yael oldest_to_newest 758755 0 ostap73 2012-11-05 11:45:56 -0800 Assert in debug build or crash in release build on page load with multiple layers: ASSERTION FAILED: !HashTranslator::equal(KeyTraits::emptyValue(), key) /home/sl/work/webkit/Source/WTF/wtf/HashTable.h(588) : void WTF::HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::checkKey(const T&) [with HashTranslator = WTF::IdentityHashTranslator<WTF::PtrHash<void*> >, T = void*, Key = void*, Value = WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, Extractor = WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, HashFunctions = WTF::PtrHash<void*>, Traits = WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, KeyTraits = WTF::HashTraits<void*>] 1 0xb41b105b void WTF::HashTable<void*, WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, WTF::PtrHash<void*>, WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, WTF::HashTraits<void*> >::checkKey<WTF::IdentityHashTranslator<WTF::PtrHash<void*> >, void*>(void* const&) 2 0xb41b086a WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>* WTF::HashTable<void*, WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, WTF::PtrHash<void*>, WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, WTF::HashTraits<void*> >::lookup<WTF::IdentityHashTranslator<WTF::PtrHash<void*> >, void*>(void* const&) 3 0xb41afebe WTF::HashTableIterator<void*, WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, WTF::PtrHash<void*>, WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, WTF::HashTraits<void*> > WTF::HashTable<void*, WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, WTF::PtrHash<void*>, WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, WTF::HashTraits<void*> >::find<WTF::IdentityHashTranslator<WTF::PtrHash<void*> >, void*>(void* const&) 4 0xb41af21b WTF::HashTable<void*, WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<void*, WebCore::TextureMapperGLData::SharedGLData*> >, WTF::PtrHash<void*>, WTF::HashMapValueTraits<WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >, WTF::HashTraits<void*> >::find(void* const&) 5 0xb41ae78d WTF::HashMap<void*, WebCore::TextureMapperGLData::SharedGLData*, WTF::PtrHash<void*>, WTF::HashTraits<void*>, WTF::HashTraits<WebCore::TextureMapperGLData::SharedGLData*> >::find(void* const&) 6 0xb41ae0fc WebCore::TextureMapperGLData::SharedGLData::currentSharedGLData(WebCore::GraphicsContext3D*) 7 0xb41ae4fb WebCore::TextureMapperGLData::TextureMapperGLData(WebCore::GraphicsContext3D*) 8 0xb41a9348 WebCore::TextureMapperGL::TextureMapperGL() 9 0xb41ad805 WebCore::TextureMapperGL::create() 10 0xb41ad765 WebCore::TextureMapper::platformCreateAccelerated() 11 0xb3750d4f WebCore::TextureMapper::create(WebCore::TextureMapper::AccelerationMode) 12 0xb71a5e03 WebKit::LayerTreeRenderer::ensureRootLayer() 13 0xb71a5fb5 WebKit::LayerTreeRenderer::syncRemoteContent() 14 0xb7302a56 WebKit::PageViewportControllerClientEfl::display(WebCore::IntRect const&, WebCore::IntPoint const&) 15 0xb72ceb8d EwkViewImpl::displayTimerFired(WebCore::Timer<EwkViewImpl>*) 16 0xb72d5370 WebCore::Timer<EwkViewImpl>::fired() 17 0xb36d24bf WebCore::ThreadTimers::sharedTimerFiredInternal() 18 0xb36d23e3 WebCore::ThreadTimers::sharedTimerFired() 19 0xb4127453 20 0xb6a7d506 _ecore_timer_expired_call 21 0xb6a7d6c4 _ecore_timer_expired_timers_call 22 0xb6a79fdb 23 0xb6a7a6ef ecore_main_loop_begin 24 0xb6911d14 elm_run 25 0x804c46e elm_main 26 0x804c4b1 main 27 0xb65974d3 __libc_start_main 28 0x804a461 Segmentation fault (core dumped) It seems that from time to time accelerated compositing get switched off and immediately on. GL context variables gets cleared in EwkViewImpl::exitAcceleratedCompositingMode and recreated in EwkViewImpl::enterAcceleratedCompositingMode , but display timer continues to run and causes crash because of 0 GL context in EwkViewImpl::displayTimerFired . 758765 1 172374 ostap73 2012-11-05 11:55:47 -0800 Created attachment 172374 Check that GL context is valid when display timer gets fired. 758799 2 172381 ostap73 2012-11-05 12:43:20 -0800 Created attachment 172381 Rebased patch. 758841 3 172381 yael 2012-11-05 13:47:49 -0800 Comment on attachment 172381 Rebased patch. View in context: https://bugs.webkit.org/attachment.cgi?id=172381&action=review We should not be switching AC off and on as you are describing. IMO, the proper solution is to move the initialization and cleanup code out of EnterAcceleratedCompositing/ExitAcceleratedCompositing. No other port implements these methods. > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:194 > + Evas_GL* evasGL() const { return m_evasGL.get(); } > + Evas_GL_Context* evasGLContext() const { return m_evasGLContext ? m_evasGLContext->context() : 0; } > + Evas_GL_Surface* evasGLSurface() const { return m_evasGLSurface ? m_evasGLSurface->surface() : 0; } Adding these const is against the latest webkit coding style. 758881 4 ostap73 2012-11-05 14:09:14 -0800 (In reply to comment #3) > (From update of attachment 172381 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172381&action=review > > We should not be switching AC off and on as you are describing. It also happens if webprocess crashes. I've spent some time to figure out why it switches of AC in webprocess, but it is difficult to reproduce. I was able to get is several times clicking on demos on this page: http://webdesignerwall.com/trends/47-amazing-css3-animation-demos With debugger attached to webprocess I was not able to reproduce it. >IMO, the proper solution is to move the initialization and cleanup code out of EnterAcceleratedCompositing/ExitAcceleratedCompositing. No other port implements these methods. > > > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:194 > > + Evas_GL* evasGL() const { return m_evasGL.get(); } > > + Evas_GL_Context* evasGLContext() const { return m_evasGLContext ? m_evasGLContext->context() : 0; } > > + Evas_GL_Surface* evasGLSurface() const { return m_evasGLSurface ? m_evasGLSurface->surface() : 0; } > > Adding these const is against the latest webkit coding style. Wow. Do you have some reference? At least style checker didn't complain ;) Those "const" mean that method don't change object and optimizer can do something with them. Previously there was single call to those method in function, but now I've added 2nd one, so it is better go give some hint to compiler. 758894 5 172381 cdumez 2012-11-05 14:18:49 -0800 Comment on attachment 172381 Rebased patch. View in context: https://bugs.webkit.org/attachment.cgi?id=172381&action=review >>> Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:194 >>> + Evas_GL_Surface* evasGLSurface() const { return m_evasGLSurface ? m_evasGLSurface->surface() : 0; } >> >> Adding these const is against the latest webkit coding style. > > Wow. > Do you have some reference? > At least style checker didn't complain ;) > Those "const" mean that method don't change object and optimizer can do something with them. Previously there was single call to those method in function, but now I've added 2nd one, so it is better go give some hint to compiler. http://lists.webkit.org/pipermail/webkit-dev/2012-October/022576.html 758980 6 172425 ostap73 2012-11-05 16:02:49 -0800 Created attachment 172425 Do not clear GL surface and context in exitAcceleratedCompositing. With this patch Minibrowser also survives webprocess crash. 758981 7 172425 ostap73 2012-11-05 16:04:19 -0800 Comment on attachment 172425 Do not clear GL surface and context in exitAcceleratedCompositing. Spotted some problem myself. 758990 8 172428 ostap73 2012-11-05 16:14:10 -0800 Created attachment 172428 Updated patch. 759018 9 172428 kenneth 2012-11-05 16:31:01 -0800 Comment on attachment 172428 Updated patch. Kalyan is refactoring this code. We should wait for his patch. 759105 10 172428 gyuyoung.kim 2012-11-05 17:55:55 -0800 Comment on attachment 172428 Updated patch. View in context: https://bugs.webkit.org/attachment.cgi?id=172428&action=review > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:550 > + EINA_LOG_DOM_WARN(_ewk_log_dom, "Failed to create GLSurface."); Please use WARN. We already link this one to WARN macro in ewk_private.h 759107 11 gyuyoung.kim 2012-11-05 17:57:11 -0800 (In reply to comment #9) > (From update of attachment 172428 [details]) > Kalyan is refactoring this code. We should wait for his patch. Did he file a bug for the refactoring ? 759150 12 kalyan.kondapally 2012-11-05 18:45:49 -0800 (In reply to comment #9) > (From update of attachment 172428 [details]) > Kalyan is refactoring this code. We should wait for his patch. My changes dont touch this.I have created a bug for my Changes: https://bugs.webkit.org/show_bug.cgi?id=101291 759273 13 172491 ostap73 2012-11-05 22:39:01 -0800 Created attachment 172491 Updated patch by Gyuyoung comments. 759391 14 172491 webkit.review.bot 2012-11-06 01:35:15 -0800 Comment on attachment 172491 Updated patch by Gyuyoung comments. Clearing flags on attachment: 172491 Committed r133570: <http://trac.webkit.org/changeset/133570> 759392 15 webkit.review.bot 2012-11-06 01:35:20 -0800 All reviewed patches have been landed. Closing bug. 760172 16 172491 yael 2012-11-06 16:17:44 -0800 Comment on attachment 172491 Updated patch by Gyuyoung comments. View in context: https://bugs.webkit.org/attachment.cgi?id=172491&action=review > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:502 > bool EwkViewImpl::createGLSurface(const IntSize& viewSize) This function is no longer just for creating a surface. It should have been renamed accordingly. 172374 2012-11-05 11:55:47 -0800 2012-11-05 12:43:20 -0800 Check that GL context is valid when display timer gets fired. reload_crash.diff text/plain 2453 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NzdlZWM0Li4yOWFkYWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMTEtMDUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJhbmRvbSBjcmFzaCBpbiBNaW5pYnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBz dXJlIHRoYXQgR0wgY29udGV4dCB3YXMgbm90IGNsZWFyZWQgYmVmb3JlIGRpc3BsYXkgdGltZXIg ZmlyZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6ZGlzcGxheVRpbWVyRmlyZWQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6CisgICAgICAgIChFd2tWaWV3SW1wbDo6ZXZhc0dM KToKKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpldmFzR0xDb250ZXh0KToKKyAgICAgICAgKEV3a1Zp ZXdJbXBsOjpldmFzR0xTdXJmYWNlKToKKwogMjAxMi0xMC0zMSAgU2FtIFdlaW5pZyAgPHNhbUB3 ZWJraXQub3JnPgogCiAgICAgICAgIENvbnZlcnQgdGhlIHJlc3Qgb2YgdGhlIGVuY29kZXJzIHRv IHRha2UgdGhlIGVuY29kZXIgYXMgYSByZWZlcmVuY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAppbmRleCAwYmEwYzdlLi45YTg2MmUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3Bw CkBAIC0yNDIsNiArMjQyLDEyIEBAIHZvaWQgRXdrVmlld0ltcGw6OmRpc3BsYXlUaW1lckZpcmVk KFRpbWVyPEV3a1ZpZXdJbXBsPiopCiAgICAgaWYgKCFzZC0+aW1hZ2UpCiAgICAgICAgIHJldHVy bjsKIAorI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKKyAgICAvLyBDYW5ub3QgZHJhdyB3 aXRob3V0IHZhbGlkIEdMIGNvbnRleHQuCisgICAgaWYgKCFldmFzR0woKSB8fCAhZXZhc0dMQ29u dGV4dCgpKQorICAgICAgICByZXR1cm47CisjZW5kaWYKKwogICAgIEFTU0VSVChtX2RpcnR5UmVn aW9uKTsKICAgICBWZWN0b3I8SW50UmVjdD4gcmVjdHMgPSBtX2RpcnR5UmVnaW9uLT5yZWN0cygp OwogICAgIC8vIENsZWFyIHJlZ2lvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3SW1wbC5oCmluZGV4IDdkZDViZGQuLjU1YzA1OTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaApAQCAtMTc4LDkgKzE3OCw5 IEBAIHB1YmxpYzoKICAgICBXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIqIHBhZ2VWaWV3 cG9ydENvbnRyb2xsZXIoKSB7IHJldHVybiBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuZ2V0KCk7 IH0KICNlbmRpZgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBFdmFzX0dM KiBldmFzR0woKSB7IHJldHVybiBtX2V2YXNHTC5nZXQoKTsgfQotICAgIEV2YXNfR0xfQ29udGV4 dCogZXZhc0dMQ29udGV4dCgpIHsgcmV0dXJuIG1fZXZhc0dMQ29udGV4dCA/IG1fZXZhc0dMQ29u dGV4dC0+Y29udGV4dCgpIDogMDsgfQotICAgIEV2YXNfR0xfU3VyZmFjZSogZXZhc0dMU3VyZmFj ZSgpIHsgcmV0dXJuIG1fZXZhc0dMU3VyZmFjZSA/IG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgp IDogMDsgfQorICAgIEV2YXNfR0wqIGV2YXNHTCgpIGNvbnN0IHsgcmV0dXJuIG1fZXZhc0dMLmdl dCgpOyB9CisgICAgRXZhc19HTF9Db250ZXh0KiBldmFzR0xDb250ZXh0KCkgY29uc3QgeyByZXR1 cm4gbV9ldmFzR0xDb250ZXh0ID8gbV9ldmFzR0xDb250ZXh0LT5jb250ZXh0KCkgOiAwOyB9Cisg ICAgRXZhc19HTF9TdXJmYWNlKiBldmFzR0xTdXJmYWNlKCkgY29uc3QgeyByZXR1cm4gbV9ldmFz R0xTdXJmYWNlID8gbV9ldmFzR0xTdXJmYWNlLT5zdXJmYWNlKCkgOiAwOyB9CiAgICAgdm9pZCBy ZXNldEV2YXNHTFN1cmZhY2UoKSB7IG1fZXZhc0dMU3VyZmFjZS5jbGVhcigpOyB9CiAjZW5kaWYK IAo= 172381 2012-11-05 12:43:20 -0800 2012-11-05 16:02:49 -0800 Rebased patch. reload_crash_01.diff text/plain 2423 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOWNjNTRlLi5jYzEwZThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMTEtMDUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJhbmRvbSBjcmFzaCBpbiBNaW5pYnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBz dXJlIHRoYXQgR0wgY29udGV4dCB3YXMgbm90IGNsZWFyZWQgYmVmb3JlIGRpc3BsYXkgdGltZXIg ZmlyZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6ZGlzcGxheVRpbWVyRmlyZWQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6CisgICAgICAgIChFd2tWaWV3SW1wbDo6ZXZhc0dM KToKKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpldmFzR0xDb250ZXh0KToKKyAgICAgICAgKEV3a1Zp ZXdJbXBsOjpldmFzR0xTdXJmYWNlKToKKwogMjAxMi0xMS0wNSAgWWFlbCBBaGFyb24gIDx5YWVs LmFoYXJvbkBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBBbGxvdyB1c2luZyBBQ0NF TEVSQVRFRF9DT01QT1NJVElORyB3aXRob3V0IENPT1JESU5BVEVEX0dSQVBISUNTCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKaW5kZXggY2Vi YTJmZC4uMzEwYmIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0V3a1ZpZXdJbXBsLmNwcApAQCAtMjg3LDYgKzI4Nyw5IEBAIEFmZmluZVRyYW5zZm9ybSBFd2tW aWV3SW1wbDo6dHJhbnNmb3JtVG9TY3JlZW4oKSBjb25zdAogdm9pZCBFd2tWaWV3SW1wbDo6ZGlz cGxheVRpbWVyRmlyZWQoVGltZXI8RXdrVmlld0ltcGw+KikKIHsKICNpZiBVU0UoQ09PUkRJTkFU RURfR1JBUEhJQ1MpCisgICAgaWYgKCFldmFzR0woKSB8fCAhZXZhc0dMQ29udGV4dCgpKQorICAg ICAgICByZXR1cm47CisKICAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzZCA9IHNtYXJ0RGF0YSgp OwogCiAgICAgZXZhc19nbF9tYWtlX2N1cnJlbnQoZXZhc0dMKCksIGV2YXNHTFN1cmZhY2UoKSwg ZXZhc0dMQ29udGV4dCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9F d2tWaWV3SW1wbC5oCmluZGV4IDFiOTU5MmEuLjlkMTRjNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaApAQCAtMTg5LDkgKzE4OSw5IEBAIHB1 YmxpYzoKICAgICBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0 IHsgcmV0dXJuIG1fc2Nyb2xsUG9zaXRpb247IH0KICNlbmRpZgogI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKLSAgICBFdmFzX0dMKiBldmFzR0woKSB7IHJldHVybiBtX2V2YXNHTC5n ZXQoKTsgfQotICAgIEV2YXNfR0xfQ29udGV4dCogZXZhc0dMQ29udGV4dCgpIHsgcmV0dXJuIG1f ZXZhc0dMQ29udGV4dCA/IG1fZXZhc0dMQ29udGV4dC0+Y29udGV4dCgpIDogMDsgfQotICAgIEV2 YXNfR0xfU3VyZmFjZSogZXZhc0dMU3VyZmFjZSgpIHsgcmV0dXJuIG1fZXZhc0dMU3VyZmFjZSA/ IG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpIDogMDsgfQorICAgIEV2YXNfR0wqIGV2YXNHTCgp IGNvbnN0IHsgcmV0dXJuIG1fZXZhc0dMLmdldCgpOyB9CisgICAgRXZhc19HTF9Db250ZXh0KiBl dmFzR0xDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9ldmFzR0xDb250ZXh0ID8gbV9ldmFzR0xD b250ZXh0LT5jb250ZXh0KCkgOiAwOyB9CisgICAgRXZhc19HTF9TdXJmYWNlKiBldmFzR0xTdXJm YWNlKCkgY29uc3QgeyByZXR1cm4gbV9ldmFzR0xTdXJmYWNlID8gbV9ldmFzR0xTdXJmYWNlLT5z dXJmYWNlKCkgOiAwOyB9CiAgICAgdm9pZCBjbGVhckV2YXNHTFN1cmZhY2UoKSB7IG1fZXZhc0dM U3VyZmFjZS5jbGVhcigpOyB9CiAjZW5kaWYKIAo= 172425 2012-11-05 16:02:49 -0800 2012-11-05 16:04:18 -0800 Do not clear GL surface and context in exitAcceleratedCompositing. reload_crash_02.diff text/plain 3176 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOWNjNTRlLi5hMWYzZWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMTEtMDUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJhbmRvbSBjcmFzaCBpbiBNaW5pYnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG8gbm90 IGNsZWFyIEdMIGNvbnRleHQgYW5kIEdMIHN1cmZhY2UgaW4gZXhpdEFjY2VsZXJhdGVkQ29tcG9z aXRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6Y3JlYXRlR0xTdXJmYWNlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorCiAyMDEyLTExLTA1ICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEFs bG93IHVzaW5nIEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HIHdpdGhvdXQgQ09PUkRJTkFURURfR1JB UEhJQ1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBs LmNwcAppbmRleCBjZWJhMmZkLi5iMDhiZTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCkBAIC01MDEsNiArNTAxLDIyIEBAIHZvaWQg RXdrVmlld0ltcGw6OmluZm9ybUljb25DaGFuZ2UoKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKIGJvb2wgRXdrVmlld0ltcGw6OmNyZWF0ZUdMU3VyZmFjZShjb25zdCBJbnRTaXpl JiB2aWV3U2l6ZSkKIHsKKyAgICBpZiAoIW1fZXZhc0dMKSB7CisgICAgICAgIEV2YXMqIGV2YXMg PSBldmFzX29iamVjdF9ldmFzX2dldChtX3ZpZXcpOworICAgICAgICBtX2V2YXNHTCA9IGFkb3B0 UHRyKGV2YXNfZ2xfbmV3KGV2YXMpKTsKKyAgICAgICAgaWYgKCFtX2V2YXNHTCkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgewor ICAgICAgICBtX2V2YXNHTENvbnRleHQgPSBFdmFzR0xDb250ZXh0OjpjcmVhdGUoZXZhc0dMKCkp OworICAgICAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgeworICAgICAgICAgICAgRUlOQV9MT0df RE9NX1dBUk4oX2V3a19sb2dfZG9tLCAiRmFpbGVkIHRvIGNyZWF0ZSBHTENvbnRleHQuIik7Cisg ICAgICAgICAgICBtX2V2YXNHTC5jbGVhcigpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICB9CisgICAgfQorCiAgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERh dGEoKTsKIAogICAgIEV2YXNfR0xfQ29uZmlnIGV2YXNHTENvbmZpZyA9IHsKQEAgLTUzMCwyOCAr NTQ2LDExIEBAIGJvb2wgRXdrVmlld0ltcGw6OmNyZWF0ZUdMU3VyZmFjZShjb25zdCBJbnRTaXpl JiB2aWV3U2l6ZSkKIAogYm9vbCBFd2tWaWV3SW1wbDo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSgpCiB7Ci0gICAgaWYgKG1fZXZhc0dMKSB7Ci0gICAgICAgIEVJTkFfTE9HX0RPTV9X QVJOKF9ld2tfbG9nX2RvbSwgIkFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUgYWxyZWFkeSBl bnRlcmVkLiIpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgRXZhcyogZXZh cyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KG1fdmlldyk7Ci0gICAgbV9ldmFzR0wgPSBhZG9wdFB0 cihldmFzX2dsX25ldyhldmFzKSk7Ci0gICAgaWYgKCFtX2V2YXNHTCkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgbV9ldmFzR0xDb250ZXh0ID0gRXZhc0dMQ29udGV4dDo6Y3JlYXRlKGV2 YXNHTCgpKTsKLSAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgewotICAgICAgICBFSU5BX0xPR19E T01fV0FSTihfZXdrX2xvZ19kb20sICJGYWlsZWQgdG8gY3JlYXRlIEdMQ29udGV4dC4iKTsKLSAg ICAgICAgbV9ldmFzR0wuY2xlYXIoKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQot ICAgIGlmICghY3JlYXRlR0xTdXJmYWNlKHNpemUoKSkpIHsKLSAgICAgICAgRUlOQV9MT0dfRE9N X1dBUk4oX2V3a19sb2dfZG9tLCAiRmFpbGVkIHRvIGNyZWF0ZSBHTFN1cmZhY2UuIik7Ci0gICAg ICAgIG1fZXZhc0dMQ29udGV4dC5jbGVhcigpOwotICAgICAgICBtX2V2YXNHTC5jbGVhcigpOwot ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFtX2V2YXNHTFN1cmZhY2UpIHsKKyAgICAg ICAgaWYgKCFjcmVhdGVHTFN1cmZhY2Uoc2l6ZSgpKSkgeworICAgICAgICAgICAgRUlOQV9MT0df RE9NX1dBUk4oX2V3a19sb2dfZG9tLCAiRmFpbGVkIHRvIGNyZWF0ZSBHTFN1cmZhY2UuIik7Cisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAKICAgICBwYWdlKCkt PmRyYXdpbmdBcmVhKCktPmxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkoKS0+bGF5ZXJUcmVlUmVu ZGVyZXIoKS0+c2V0QWN0aXZlKHRydWUpOwpAQCAtNTYwLDEyICs1NTksNiBAQCBib29sIEV3a1Zp ZXdJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKIAogYm9vbCBFd2tWaWV3 SW1wbDo6ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKIHsKLSAgICBFSU5BX1NBRkVU WV9PTl9OVUxMX1JFVFVSTl9WQUwobV9ldmFzR0wsIGZhbHNlKTsKLQotICAgIG1fZXZhc0dMU3Vy ZmFjZS5jbGVhcigpOwotICAgIG1fZXZhc0dMQ29udGV4dC5jbGVhcigpOwotICAgIG1fZXZhc0dM LmNsZWFyKCk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KICNlbmRpZgo= 172428 2012-11-05 16:14:10 -0800 2012-11-05 22:39:01 -0800 Updated patch. reload_crash_04.diff text/plain 3145 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOWNjNTRlLi5hMWYzZWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMTEtMDUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJhbmRvbSBjcmFzaCBpbiBNaW5pYnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG8gbm90 IGNsZWFyIEdMIGNvbnRleHQgYW5kIEdMIHN1cmZhY2UgaW4gZXhpdEFjY2VsZXJhdGVkQ29tcG9z aXRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6Y3JlYXRlR0xTdXJmYWNlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorCiAyMDEyLTExLTA1ICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEFs bG93IHVzaW5nIEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HIHdpdGhvdXQgQ09PUkRJTkFURURfR1JB UEhJQ1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBs LmNwcAppbmRleCBjZWJhMmZkLi5mZGIyYzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCkBAIC01MDEsNiArNTAxLDIxIEBAIHZvaWQg RXdrVmlld0ltcGw6OmluZm9ybUljb25DaGFuZ2UoKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKIGJvb2wgRXdrVmlld0ltcGw6OmNyZWF0ZUdMU3VyZmFjZShjb25zdCBJbnRTaXpl JiB2aWV3U2l6ZSkKIHsKKyAgICBpZiAoIW1fZXZhc0dMKSB7CisgICAgICAgIEV2YXMqIGV2YXMg PSBldmFzX29iamVjdF9ldmFzX2dldChtX3ZpZXcpOworICAgICAgICBtX2V2YXNHTCA9IGFkb3B0 UHRyKGV2YXNfZ2xfbmV3KGV2YXMpKTsKKyAgICAgICAgaWYgKCFtX2V2YXNHTCkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgewor ICAgICAgICBtX2V2YXNHTENvbnRleHQgPSBFdmFzR0xDb250ZXh0OjpjcmVhdGUoZXZhc0dMKCkp OworICAgICAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgeworICAgICAgICAgICAgRUlOQV9MT0df RE9NX1dBUk4oX2V3a19sb2dfZG9tLCAiRmFpbGVkIHRvIGNyZWF0ZSBHTENvbnRleHQuIik7Cisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisKICAgICBFd2tfVmll d19TbWFydF9EYXRhKiBzZCA9IHNtYXJ0RGF0YSgpOwogCiAgICAgRXZhc19HTF9Db25maWcgZXZh c0dMQ29uZmlnID0gewpAQCAtNTMwLDI4ICs1NDUsMTEgQEAgYm9vbCBFd2tWaWV3SW1wbDo6Y3Jl YXRlR0xTdXJmYWNlKGNvbnN0IEludFNpemUmIHZpZXdTaXplKQogCiBib29sIEV3a1ZpZXdJbXBs OjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKIHsKLSAgICBpZiAobV9ldmFzR0wp IHsKLSAgICAgICAgRUlOQV9MT0dfRE9NX1dBUk4oX2V3a19sb2dfZG9tLCAiQWNjZWxlcmF0ZWQg Y29tcG9zaXRpbmcgbW9kZSBhbHJlYWR5IGVudGVyZWQuIik7Ci0gICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICB9Ci0KLSAgICBFdmFzKiBldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQobV92aWV3 KTsKLSAgICBtX2V2YXNHTCA9IGFkb3B0UHRyKGV2YXNfZ2xfbmV3KGV2YXMpKTsKLSAgICBpZiAo IW1fZXZhc0dMKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBtX2V2YXNHTENvbnRleHQg PSBFdmFzR0xDb250ZXh0OjpjcmVhdGUoZXZhc0dMKCkpOwotICAgIGlmICghbV9ldmFzR0xDb250 ZXh0KSB7Ci0gICAgICAgIEVJTkFfTE9HX0RPTV9XQVJOKF9ld2tfbG9nX2RvbSwgIkZhaWxlZCB0 byBjcmVhdGUgR0xDb250ZXh0LiIpOwotICAgICAgICBtX2V2YXNHTC5jbGVhcigpOwotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgaWYgKCFjcmVhdGVHTFN1cmZhY2Uoc2l6ZSgp KSkgewotICAgICAgICBFSU5BX0xPR19ET01fV0FSTihfZXdrX2xvZ19kb20sICJGYWlsZWQgdG8g Y3JlYXRlIEdMU3VyZmFjZS4iKTsKLSAgICAgICAgbV9ldmFzR0xDb250ZXh0LmNsZWFyKCk7Ci0g ICAgICAgIG1fZXZhc0dMLmNsZWFyKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAo IW1fZXZhc0dMU3VyZmFjZSkgeworICAgICAgICBpZiAoIWNyZWF0ZUdMU3VyZmFjZShzaXplKCkp KSB7CisgICAgICAgICAgICBFSU5BX0xPR19ET01fV0FSTihfZXdrX2xvZ19kb20sICJGYWlsZWQg dG8gY3JlYXRlIEdMU3VyZmFjZS4iKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgfQogICAgIH0KIAogICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+bGF5ZXJUcmVlQ29vcmRp bmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJlcigpLT5zZXRBY3RpdmUodHJ1ZSk7CkBAIC01 NjAsMTIgKzU1OCw2IEBAIGJvb2wgRXdrVmlld0ltcGw6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGUoKQogCiBib29sIEV3a1ZpZXdJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z01vZGUoKQogewotICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChtX2V2YXNHTCwg ZmFsc2UpOwotCi0gICAgbV9ldmFzR0xTdXJmYWNlLmNsZWFyKCk7Ci0gICAgbV9ldmFzR0xDb250 ZXh0LmNsZWFyKCk7Ci0gICAgbV9ldmFzR0wuY2xlYXIoKTsKLQogICAgIHJldHVybiB0cnVlOwog fQogI2VuZGlmCg== 172491 2012-11-05 22:39:01 -0800 2012-11-06 16:17:44 -0800 Updated patch by Gyuyoung comments. reload_crash_05.diff text/plain 3091 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOWNjNTRlLi5hMWYzZWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMTEtMDUgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPHYub3N0YXBlbmtvQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJhbmRvbSBjcmFzaCBpbiBNaW5pYnJvd3Nl cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG8gbm90 IGNsZWFyIEdMIGNvbnRleHQgYW5kIEdMIHN1cmZhY2UgaW4gZXhpdEFjY2VsZXJhdGVkQ29tcG9z aXRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHA6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6Y3JlYXRlR0xTdXJmYWNlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKyAgICAgICAgKEV3a1ZpZXdJ bXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorCiAyMDEyLTExLTA1ICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEFs bG93IHVzaW5nIEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HIHdpdGhvdXQgQ09PUkRJTkFURURfR1JB UEhJQ1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBs LmNwcAppbmRleCBjZWJhMmZkLi4yZDVkZmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCkBAIC01MDEsNiArNTAxLDIxIEBAIHZvaWQg RXdrVmlld0ltcGw6OmluZm9ybUljb25DaGFuZ2UoKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKIGJvb2wgRXdrVmlld0ltcGw6OmNyZWF0ZUdMU3VyZmFjZShjb25zdCBJbnRTaXpl JiB2aWV3U2l6ZSkKIHsKKyAgICBpZiAoIW1fZXZhc0dMKSB7CisgICAgICAgIEV2YXMqIGV2YXMg PSBldmFzX29iamVjdF9ldmFzX2dldChtX3ZpZXcpOworICAgICAgICBtX2V2YXNHTCA9IGFkb3B0 UHRyKGV2YXNfZ2xfbmV3KGV2YXMpKTsKKyAgICAgICAgaWYgKCFtX2V2YXNHTCkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgewor ICAgICAgICBtX2V2YXNHTENvbnRleHQgPSBFdmFzR0xDb250ZXh0OjpjcmVhdGUoZXZhc0dMKCkp OworICAgICAgICBpZiAoIW1fZXZhc0dMQ29udGV4dCkgeworICAgICAgICAgICAgV0FSTigiRmFp bGVkIHRvIGNyZWF0ZSBHTENvbnRleHQuIik7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KKyAgICB9CisKICAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzZCA9IHNtYXJ0RGF0 YSgpOwogCiAgICAgRXZhc19HTF9Db25maWcgZXZhc0dMQ29uZmlnID0gewpAQCAtNTMwLDI4ICs1 NDUsMTEgQEAgYm9vbCBFd2tWaWV3SW1wbDo6Y3JlYXRlR0xTdXJmYWNlKGNvbnN0IEludFNpemUm IHZpZXdTaXplKQogCiBib29sIEV3a1ZpZXdJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRp bmdNb2RlKCkKIHsKLSAgICBpZiAobV9ldmFzR0wpIHsKLSAgICAgICAgRUlOQV9MT0dfRE9NX1dB Uk4oX2V3a19sb2dfZG9tLCAiQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZSBhbHJlYWR5IGVu dGVyZWQuIik7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICBFdmFzKiBldmFz ID0gZXZhc19vYmplY3RfZXZhc19nZXQobV92aWV3KTsKLSAgICBtX2V2YXNHTCA9IGFkb3B0UHRy KGV2YXNfZ2xfbmV3KGV2YXMpKTsKLSAgICBpZiAoIW1fZXZhc0dMKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICBtX2V2YXNHTENvbnRleHQgPSBFdmFzR0xDb250ZXh0OjpjcmVhdGUoZXZh c0dMKCkpOwotICAgIGlmICghbV9ldmFzR0xDb250ZXh0KSB7Ci0gICAgICAgIEVJTkFfTE9HX0RP TV9XQVJOKF9ld2tfbG9nX2RvbSwgIkZhaWxlZCB0byBjcmVhdGUgR0xDb250ZXh0LiIpOwotICAg ICAgICBtX2V2YXNHTC5jbGVhcigpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0g ICAgaWYgKCFjcmVhdGVHTFN1cmZhY2Uoc2l6ZSgpKSkgewotICAgICAgICBFSU5BX0xPR19ET01f V0FSTihfZXdrX2xvZ19kb20sICJGYWlsZWQgdG8gY3JlYXRlIEdMU3VyZmFjZS4iKTsKLSAgICAg ICAgbV9ldmFzR0xDb250ZXh0LmNsZWFyKCk7Ci0gICAgICAgIG1fZXZhc0dMLmNsZWFyKCk7Ci0g ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIW1fZXZhc0dMU3VyZmFjZSkgeworICAgICAg ICBpZiAoIWNyZWF0ZUdMU3VyZmFjZShzaXplKCkpKSB7CisgICAgICAgICAgICBXQVJOKCJGYWls ZWQgdG8gY3JlYXRlIEdMU3VyZmFjZS4iKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+bGF5ZXJUcmVlQ29v cmRpbmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJlcigpLT5zZXRBY3RpdmUodHJ1ZSk7CkBA IC01NjAsMTIgKzU1OCw2IEBAIGJvb2wgRXdrVmlld0ltcGw6OmVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUoKQogCiBib29sIEV3a1ZpZXdJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGUoKQogewotICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChtX2V2YXNH TCwgZmFsc2UpOwotCi0gICAgbV9ldmFzR0xTdXJmYWNlLmNsZWFyKCk7Ci0gICAgbV9ldmFzR0xD b250ZXh0LmNsZWFyKCk7Ci0gICAgbV9ldmFzR0wuY2xlYXIoKTsKLQogICAgIHJldHVybiB0cnVl OwogfQogI2VuZGlmCg==