113629 2013-03-29 17:08:30 -0700 [EFL][WK2] --no-tiled-backing-store build fails because of not used #if USE(COORDINATED_GRAPHICS) 2013-04-05 12:25:37 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 113153 0 bartosh webkit-unassigned benjamin commit-queue gyuyoung.kim kondapallykalyan lucas.de.marchi luiz rakuco simon.fraser webkit.review.bot oldest_to_newest 866497 0 bartosh 2013-03-29 17:08:30 -0700 Build fails with this kind of errors: /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp: In function `OpaqueCGLayer* WKCoordinatedSceneFindScrollableContentsLayerAt(WKCoordinatedScene, WKPoint)': /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:40:31: error: invalid use of incomplete type `class WebCore::CoordinatedGraphicsScene' In file included from /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:33:0: /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h:35:7: error: forward declaration of `class WebCore::CoordinatedGraphicsScene' /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:40:63: error: `FloatPoint' is not a member of `WebCore' /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp: In function `uint32_t WKCoordinatedSceneGetLayerID(WKCoordinatedSceneLayer)': /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:45:25: error: invalid use of incomplete type `class WebCore::TextureMapperLayer' In file included from /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:33:0: /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h:36:7: error: forward declaration of `class WebCore::TextureMapperLayer' /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp: In function `void WKCoordinatedSceneScrollBy(WKCoordinatedSceneLayer, WKSize)': /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:50:18: error: invalid use of incomplete type `class WebCore::TextureMapperLayer' In file included from /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:33:0: /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/CoordinatedGraphics/WKCoordinatedSceneAPICast.h:36:7: error: forward declaration of `class WebCore::TextureMapperLayer' /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:50:29: error: `FloatSize' is not a member of `WebCore' /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp: In function `uint32_t WKCoordinatedSceneGetLayerID(WKCoordinatedSceneLayer)': /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:46:1: error: control reaches end of non-void function [-Werror=return-type] /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp: In function `OpaqueCGLayer* WKCoordinatedSceneFindScrollableContentsLayerAt(WKCoordinatedScene, WKPoint)': /home/ed/git/wk/WebKit/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:41:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: all warnings being treated as errors make[2]: *** [Source/WebKit2/CMakeFiles/ewebkit2.dir/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp.o] Error 1 make[1]: *** [Source/WebKit2/CMakeFiles/ewebkit2.dir/all] Error 2 make: *** [all] Error 2 866503 1 195824 bartosh 2013-03-29 17:20:50 -0700 Created attachment 195824 Patch 866975 2 bartosh 2013-04-01 01:06:46 -0700 Reverting back to UNCONFIRMED after reading https://bugs.webkit.org/page.cgi?id=fields.html#status 867029 3 bartosh 2013-04-01 04:04:07 -0700 Added WK2 reviewer as patch also changes WK2 code. 869390 4 196535 bartosh 2013-04-04 15:00:40 -0700 Created attachment 196535 Patch Rebased. Please, review! 869948 5 196535 commit-queue 2013-04-05 12:25:34 -0700 Comment on attachment 196535 Patch Clearing flags on attachment: 196535 Committed r147776: <http://trac.webkit.org/changeset/147776> 869949 6 commit-queue 2013-04-05 12:25:37 -0700 All reviewed patches have been landed. Closing bug. 195824 2013-03-29 17:20:50 -0700 2013-04-04 15:00:40 -0700 Patch bug-113629-20130330022046.patch text/plain 5129 bartosh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmNiZDFiMjBlNTNkNmNk ZTM2ZjBlZDI2MGEzYWFjODU3NmI4NTcwMS4uMGM0OGE1NTEyMTZiNGVhMzY0ZmI2MWI4ZjMyMGJm OTk0NjM3NWFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI5ICBFZCBC YXJ0b3NoICA8YmFydG9zaEBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF0gLS1uby10aWxlZC1i YWNraW5nLXN0b3JlIGJ1aWxkIGZhaWxzIGJlY2F1c2Ugb2Ygbm90IHVzZWQgI2lmIFVTRShDT09S RElOQVRFRF9HUkFQSElDUykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMzYyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdyYXBwZWQgY29kZSByZWxhdGVkIHRvIGNvb3JkaW5hdGVkIGdyYXBoaWNzIHdp dGggI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tDb29yZGluYXRlZFNjZW5lLmNwcDoKKyAgICAgICAgKiBV SVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojppbml0 aWFsaXplKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBh aW50VG9DYWlyb1N1cmZhY2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp1cGRhdGVWaWV3 cG9ydFNpemUpOgorCiAyMDEzLTAzLTI4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNv bT4KIAogICAgICAgICBXZSBsZWFrIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzIG9iamVj dHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nvb3JkaW5hdGVk R3JhcGhpY3MvV0tDb29yZGluYXRlZFNjZW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS0Nvb3JkaW5hdGVkU2NlbmUuY3BwCmluZGV4IDlh ODk1MGE5YTZiOTQxMzMxZjA4ZjdmOGQ4NDE2ZWY0M2MzZTY0OWIuLjVkMTRmNDM2OTY1M2FlYjc5 MTU0MzI4ODhmNzM3YWMyMjU4YzUwNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS0Nvb3JkaW5hdGVkU2NlbmUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS0Nvb3Jk aW5hdGVkU2NlbmUuY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZp Zy5oIgorI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKKwogI2luY2x1ZGUgIldLQ29vcmRp bmF0ZWRTY2VuZS5oIgogCiAjaW5jbHVkZSAiV0tDb29yZGluYXRlZFNjZW5lQVBJQ2FzdC5oIgpA QCAtNDcsMyArNDksNCBAQCBXS19FWFBPUlQgdm9pZCBXS0Nvb3JkaW5hdGVkU2NlbmVTY3JvbGxC eShXS0Nvb3JkaW5hdGVkU2NlbmVMYXllciBsYXllciwgV0tTaXplCiB7CiAgICAgdG9JbXBsKGxh eWVyKS0+c2Nyb2xsQnkoV2ViQ29yZTo6RmxvYXRTaXplKG9mZnNldC53aWR0aCwgb2Zmc2V0Lmhl aWdodCkpOwogfQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJWaWV3LmNw cAppbmRleCBlNWU4MGMyNDYyZjU1ZjFkOThlNjI2NDZjY2M5MWVhNGI3ZmI3MjIzLi42ZmZiYzVm ZTdlMTgwZjc2YmE3NDkwNjI1MzZiYjliM2E2YjgzYThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvV2ViVmlldy5jcHAKQEAgLTkxLDggKzkxLDEwIEBAIHZvaWQgV2ViVmlldzo6c2V0 RXdrVmlldyhFd2tWaWV3KiBld2tWaWV3KQogdm9pZCBXZWJWaWV3Ojppbml0aWFsaXplKCkKIHsK ICAgICBtX3BhZ2UtPmluaXRpYWxpemVXZWJQYWdlKCk7CisjaWYgVVNFKENPT1JESU5BVEVEX0dS QVBISUNTKQogICAgIGlmIChDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUqIHNjZW5lID0gY29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lKCkpCiAgICAgICAgIHNjZW5lLT5zZXRBY3RpdmUodHJ1ZSk7Cisj ZW5kaWYKIH0KIAogdm9pZCBXZWJWaWV3OjpzZXRVc2VyVmlld3BvcnRUcmFuc2xhdGlvbihkb3Vi bGUgdHgsIGRvdWJsZSB0eSkKQEAgLTEwNSw2ICsxMDcsNyBAQCBJbnRQb2ludCBXZWJWaWV3Ojp1 c2VyVmlld3BvcnRUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKICAgICBy ZXR1cm4gbV91c2VyVmlld3BvcnRUcmFuc2Zvcm0ubWFwUG9pbnQocG9pbnQpOwogfQogCisjaWYg VVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogdm9pZCBXZWJWaWV3OjpwYWludFRvQ3VycmVudEdM Q29udGV4dCgpCiB7CiAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKiBzY2VuZSA9IGNvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZSgpOwpAQCAtMTE3LDEzICsxMjAsMTUgQEAgdm9pZCBXZWJWaWV3 OjpwYWludFRvQ3VycmVudEdMQ29udGV4dCgpCiAgICAgRmxvYXRSZWN0IHZpZXdwb3J0ID0gbV91 c2VyVmlld3BvcnRUcmFuc2Zvcm0ubWFwUmVjdChJbnRSZWN0KEludFBvaW50KCksIG1fZXdrVmll dy0+ZGV2aWNlU2l6ZSgpKSk7CiAgICAgc2NlbmUtPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KHRy YW5zZm9ybVRvU2NlbmUoKS50b1RyYW5zZm9ybWF0aW9uTWF0cml4KCksIC8qIG9wYWNpdHkgKi8g MSwgdmlld3BvcnQpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViVmlldzo6cGFpbnRUb0NhaXJvU3Vy ZmFjZShjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UpCiB7CisjaWYgVVNFKENPT1JESU5BVEVEX0dS QVBISUNTKQogICAgIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogc2NlbmUgPSBjb29yZGluYXRl ZEdyYXBoaWNzU2NlbmUoKTsKICAgICBpZiAoIXNjZW5lKQogICAgICAgICByZXR1cm47Ci0KKyNl bmRpZgogICAgIFBsYXRmb3JtQ29udGV4dENhaXJvIGNvbnRleHQoY2Fpcm9fY3JlYXRlKHN1cmZh Y2UpKTsKIAogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3NpdGlvbiA9IG1fZXdrVmlldy0+ cGFnZVBvc2l0aW9uKCk7CkBAIC0xMzEsOCArMTM2LDkgQEAgdm9pZCBXZWJWaWV3OjpwYWludFRv Q2Fpcm9TdXJmYWNlKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSkKIAogICAgIGNhaXJvX21hdHJp eF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2NhbGUsIDAsIDAsIGVmZmVjdGl2ZVNjYWxlLCAt cGFnZVBvc2l0aW9uLngoKSAqIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSwgLXBhZ2VQb3Np dGlvbi55KCkgKiBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgfTsKICAgICBjYWlyb19zZXRf bWF0cml4KGNvbnRleHQuY3IoKSwgJnRyYW5zZm9ybSk7Ci0KKyNpZiBVU0UoQ09PUkRJTkFURURf R1JBUEhJQ1MpCiAgICAgc2NlbmUtPnBhaW50VG9HcmFwaGljc0NvbnRleHQoJmNvbnRleHQpOwor I2VuZGlmCiB9CiAKIEV2YXNfT2JqZWN0KiBXZWJWaWV3OjpldmFzT2JqZWN0KCkKQEAgLTIxNCw3 ICsyMjAsOSBAQCB2b2lkIFdlYlZpZXc6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgpCiAgICAgfQogICAg IEZsb2F0UG9pbnQgdWlQb3NpdGlvbihtX2V3a1ZpZXctPnBhZ2VQb3NpdGlvbigpKTsKICAgICB1 aVBvc2l0aW9uLnNjYWxlKDEgLyBtX2V3a1ZpZXctPnBhZ2VTY2FsZUZhY3RvcigpLCAxIC8gbV9l d2tWaWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNT KQogICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChGbG9h dFJlY3QodWlQb3NpdGlvbiwgbV9ld2tWaWV3LT5zaXplKCkpLCBGbG9hdFBvaW50KCkpOworI2Vu ZGlmCiB9CiAKIHZvaWQgV2ViVmlldzo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdlYkNv cmU6OkludFNpemUmIHNpemUpCkBAIC0yMzksNiArMjQ3LDcgQEAgQWZmaW5lVHJhbnNmb3JtIFdl YlZpZXc6OnRyYW5zZm9ybVRvU2NlbmUoKSBjb25zdAogICAgIHJldHVybiB0cmFuc2Zvcm0udG9B ZmZpbmVUcmFuc2Zvcm0oKTsKIH0KIAorI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKIENv b3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogV2ViVmlldzo6Y29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l KCkKIHsKICAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSA9IG1fcGFnZS0+ZHJhd2lu Z0FyZWEoKTsKQEAgLTI1MSw2ICsyNjAsNyBAQCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUqIFdl YlZpZXc6OmNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSgpCiAKICAgICByZXR1cm4gbGF5ZXJUcmVl SG9zdFByb3h5LT5jb29yZGluYXRlZEdyYXBoaWNzU2NlbmUoKTsKIH0KKyNlbmRpZgogCiAvLyBQ YWdlIENsaWVudAogCkBAIC00MTAsNiArNDIwLDcgQEAgdm9pZCBXZWJWaWV3OjpzZXRGaW5kSW5k aWNhdG9yKFBhc3NSZWZQdHI8RmluZEluZGljYXRvcj4sIGJvb2wsIGJvb2wpCiAgICAgbm90SW1w bGVtZW50ZWQoKTsKIH0KIAorI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKIHZvaWQgV2Vi Vmlldzo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShjb25zdCBMYXllclRyZWVDb250 ZXh0JikKIHsKICAgICBpZiAoQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKiBzY2VuZSA9IGNvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZSgpKQpAQCAtNDIxLDYgKzQzMiw3IEBAIHZvaWQgV2ViVmlldzo6 ZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkKICAgICBpZiAoQ29vcmRpbmF0ZWRHcmFw aGljc1NjZW5lKiBzY2VuZSA9IGNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSgpKQogICAgICAgICBz Y2VuZS0+c2V0QWN0aXZlKGZhbHNlKTsKIH0KKyNlbmRpZgogCiB2b2lkIFdlYlZpZXc6OnVwZGF0 ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKQogewo= 196535 2013-04-04 15:00:40 -0700 2013-04-05 12:25:34 -0700 Patch Patch.113629 text/plain 4618 bartosh Y29tbWl0IGZlOTcwOTY1ZjAzZTRmNGVjMmUyM2JjOTQwMWMzY2I4NGM1NDcwODEKQXV0aG9yOiBF ZCBCYXJ0b3NoIDxiYXJ0b3NoQGdtYWlsLmNvbT4KRGF0ZTogICBTYXQgTWFyIDMwIDAyOjQzOjA4 IDIwMTMgKzAyMDAKCiAgICBGaXhlZCAjMTEzNjI5CiAgICAKICAgIFNpZ25lZC1vZmYtYnk6IEVk IEJhcnRvc2ggPGJhcnRvc2hAZ21haWwuY29tPgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1OTNlNDU2Li5lYTM5 MDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMDMtMjkgIEVkIEJhcnRvc2gg IDxiYXJ0b3NoQGdtYWlsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIC0tbm8tdGlsZWQtYmFj a2luZy1zdG9yZSBidWlsZCBmYWlscyBiZWNhdXNlIG9mIG5vdCB1c2VkICNpZiBVU0UoQ09PUkRJ TkFURURfR1JBUEhJQ1MpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTM2MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXcmFwcGVkIGNvZGUgcmVsYXRlZCB0byBjb29yZGluYXRlZCBncmFwaGljcyB3aXRo ICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b29yZGluYXRlZEdyYXBoaWNzL1dLQ29vcmRpbmF0ZWRTY2VuZS5jcHA6CisgICAgICAgICogVUlQ cm9jZXNzL2VmbC9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6aW5pdGlh bGl6ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpwYWlu dFRvQ2Fpcm9TdXJmYWNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6dXBkYXRlVmlld3Bv cnRTaXplKToKKwogMjAxMy0wNC0wMyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgRXhwb3NlIHNldHRpbmdzIHRvIGRpc2FibGUgcGx1Z2luIHNuYXBzaG90dGluZyBh dXRvc3RhcnQgYW5kIHByaW1hcnkgZGV0ZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tDb29yZGluYXRlZFNjZW5lLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS0Nv b3JkaW5hdGVkU2NlbmUuY3BwCmluZGV4IDlhODk1MGEuLjVkMTRmNDMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS0Nvb3JkaW5h dGVkU2NlbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29vcmRpbmF0 ZWRHcmFwaGljcy9XS0Nvb3JkaW5hdGVkU2NlbmUuY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAgKi8K IAogI2luY2x1ZGUgImNvbmZpZy5oIgorI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKKwog I2luY2x1ZGUgIldLQ29vcmRpbmF0ZWRTY2VuZS5oIgogCiAjaW5jbHVkZSAiV0tDb29yZGluYXRl ZFNjZW5lQVBJQ2FzdC5oIgpAQCAtNDcsMyArNDksNCBAQCBXS19FWFBPUlQgdm9pZCBXS0Nvb3Jk aW5hdGVkU2NlbmVTY3JvbGxCeShXS0Nvb3JkaW5hdGVkU2NlbmVMYXllciBsYXllciwgV0tTaXpl CiB7CiAgICAgdG9JbXBsKGxheWVyKS0+c2Nyb2xsQnkoV2ViQ29yZTo6RmxvYXRTaXplKG9mZnNl dC53aWR0aCwgb2Zmc2V0LmhlaWdodCkpOwogfQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJWaWV3LmNwcAppbmRleCBiNTlkNDQxLi4xZjUxMjBlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlldy5jcHAKQEAgLTkxLDggKzkxLDEwIEBAIHZvaWQgV2Vi Vmlldzo6c2V0RXdrVmlldyhFd2tWaWV3KiBld2tWaWV3KQogdm9pZCBXZWJWaWV3Ojppbml0aWFs aXplKCkKIHsKICAgICBtX3BhZ2UtPmluaXRpYWxpemVXZWJQYWdlKCk7CisjaWYgVVNFKENPT1JE SU5BVEVEX0dSQVBISUNTKQogICAgIGlmIChDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUqIHNjZW5l ID0gY29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKCkpCiAgICAgICAgIHNjZW5lLT5zZXRBY3RpdmUo dHJ1ZSk7CisjZW5kaWYKIH0KIAogdm9pZCBXZWJWaWV3OjpzZXRTaXplKGNvbnN0IFdlYkNvcmU6 OkludFNpemUmIHNpemUpCkBAIC0xMTIsNiArMTE0LDcgQEAgSW50UG9pbnQgV2ViVmlldzo6dXNl clZpZXdwb3J0VG9Db250ZW50cyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiAgICAgcmV0 dXJuIG1fdXNlclZpZXdwb3J0VHJhbnNmb3JtLm1hcFBvaW50KHBvaW50KTsKIH0KIAorI2lmIFVT RShDT09SRElOQVRFRF9HUkFQSElDUykKIHZvaWQgV2ViVmlldzo6cGFpbnRUb0N1cnJlbnRHTENv bnRleHQoKQogewogICAgIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogc2NlbmUgPSBjb29yZGlu YXRlZEdyYXBoaWNzU2NlbmUoKTsKQEAgLTEyNCwxMyArMTI3LDE1IEBAIHZvaWQgV2ViVmlldzo6 cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoKQogCiAgICAgc2NlbmUtPnBhaW50VG9DdXJyZW50R0xD b250ZXh0KHRyYW5zZm9ybVRvU2NlbmUoKS50b1RyYW5zZm9ybWF0aW9uTWF0cml4KCksIC8qIG9w YWNpdHkgKi8gMSwgdmlld3BvcnQpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViVmlldzo6cGFpbnRU b0NhaXJvU3VyZmFjZShjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UpCiB7CisjaWYgVVNFKENPT1JE SU5BVEVEX0dSQVBISUNTKQogICAgIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogc2NlbmUgPSBj b29yZGluYXRlZEdyYXBoaWNzU2NlbmUoKTsKICAgICBpZiAoIXNjZW5lKQogICAgICAgICByZXR1 cm47Ci0KKyNlbmRpZgogICAgIFBsYXRmb3JtQ29udGV4dENhaXJvIGNvbnRleHQoY2Fpcm9fY3Jl YXRlKHN1cmZhY2UpKTsKIAogICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBhZ2VQb3NpdGlvbiA9IG1f ZXdrVmlldy0+cGFnZVBvc2l0aW9uKCk7CkBAIC0xMzgsOCArMTQzLDkgQEAgdm9pZCBXZWJWaWV3 OjpwYWludFRvQ2Fpcm9TdXJmYWNlKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSkKIAogICAgIGNh aXJvX21hdHJpeF90IHRyYW5zZm9ybSA9IHsgZWZmZWN0aXZlU2NhbGUsIDAsIDAsIGVmZmVjdGl2 ZVNjYWxlLCAtcGFnZVBvc2l0aW9uLngoKSAqIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSwg LXBhZ2VQb3NpdGlvbi55KCkgKiBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkgfTsKICAgICBj YWlyb19zZXRfbWF0cml4KGNvbnRleHQuY3IoKSwgJnRyYW5zZm9ybSk7Ci0KKyNpZiBVU0UoQ09P UkRJTkFURURfR1JBUEhJQ1MpCiAgICAgc2NlbmUtPnBhaW50VG9HcmFwaGljc0NvbnRleHQoJmNv bnRleHQpOworI2VuZGlmCiB9CiAKIEV2YXNfT2JqZWN0KiBXZWJWaWV3OjpldmFzT2JqZWN0KCkK QEAgLTIzNSw2ICsyNDEsNyBAQCBBZmZpbmVUcmFuc2Zvcm0gV2ViVmlldzo6dHJhbnNmb3JtVG9T Y2VuZSgpIGNvbnN0CiAgICAgcmV0dXJuIHRyYW5zZm9ybS50b0FmZmluZVRyYW5zZm9ybSgpOwog fQogCisjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogQ29vcmRpbmF0ZWRHcmFwaGljc1Nj ZW5lKiBXZWJWaWV3Ojpjb29yZGluYXRlZEdyYXBoaWNzU2NlbmUoKQogewogICAgIERyYXdpbmdB cmVhUHJveHkqIGRyYXdpbmdBcmVhID0gbV9wYWdlLT5kcmF3aW5nQXJlYSgpOwpAQCAtMjQ3LDYg KzI1NCw3IEBAIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogV2ViVmlldzo6Y29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lKCkKIAogICAgIHJldHVybiBsYXllclRyZWVIb3N0UHJveHktPmNvb3JkaW5h dGVkR3JhcGhpY3NTY2VuZSgpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViVmlldzo6dXBkYXRlVmll d3BvcnRTaXplKCkKIHsKQEAgLTQyMyw2ICs0MzEsNyBAQCB2b2lkIFdlYlZpZXc6OnNldEZpbmRJ bmRpY2F0b3IoUGFzc1JlZlB0cjxGaW5kSW5kaWNhdG9yPiwgYm9vbCwgYm9vbCkKICAgICBub3RJ bXBsZW1lbnRlZCgpOwogfQogCisjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogdm9pZCBX ZWJWaWV3OjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNv bnRleHQmKQogewogICAgIGlmIChDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUqIHNjZW5lID0gY29v cmRpbmF0ZWRHcmFwaGljc1NjZW5lKCkpCkBAIC00MzQsNiArNDQzLDcgQEAgdm9pZCBXZWJWaWV3 OjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKQogICAgIGlmIChDb29yZGluYXRlZEdy YXBoaWNzU2NlbmUqIHNjZW5lID0gY29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lKCkpCiAgICAgICAg IHNjZW5lLT5zZXRBY3RpdmUoZmFsc2UpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViVmlldzo6dXBk YXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpCiB7 Cg==