61740 2011-05-30 11:12:48 -0700 [Texmap][Qt] Enable TextureMapper by default 2011-06-07 17:57:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 1 noam noam abecsi commit-queue dihan.wickremasuriya hausmann kenneth ossy webkit.review.bot oldest_to_newest 412295 0 noam 2011-05-30 11:12:48 -0700 Since the 2.2 release has branched, now is the time to enable TextureMapper and find the remaining issues with it. 412305 1 95357 noam 2011-05-30 11:31:54 -0700 Created attachment 95357 Patch This has been discussed in the mailing list. It might have some effects on tests with platforms I can't test manually, so I'll get it through the commit queue once reviewed. 412327 2 95357 kling 2011-05-30 12:40:36 -0700 Comment on attachment 95357 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95357&action=review r=me, let's rock the boat! > Source/WebCore/WebCore.pri:6 > +# Comment this to disable Texture Mapper. This comment feels a little awkward. 412329 3 95362 noam 2011-05-30 12:48:46 -0700 Created attachment 95362 Patch with a less awkward comment. 412344 4 95362 commit-queue 2011-05-30 13:57:32 -0700 Comment on attachment 95362 Patch with a less awkward comment. Clearing flags on attachment: 95362 Committed r87697: <http://trac.webkit.org/changeset/87697> 412345 5 commit-queue 2011-05-30 13:57:38 -0700 All reviewed patches have been landed. Closing bug. 412382 6 ossy 2011-05-30 15:16:37 -0700 It broke Qt Windows build. Could you fix it ASAP? It seems that OpenGL support is missing from the Qt on Windows bot. Andras, could you check it? If it is true, some ifdef guards are missing from the patch. 412384 7 noam 2011-05-30 15:34:50 -0700 Fixed in r87700 412488 8 ossy 2011-05-31 00:54:24 -0700 Symbian build is still broken. I have no idea why. 412492 9 hausmann 2011-05-31 01:10:22 -0700 (In reply to comment #8) > Symbian build is still broken. I have no idea why. Looks like a problem with the OpenGL headers: compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) ^ Should we build without OpenGL on Symbian perhaps? 412569 10 noam 2011-05-31 06:03:47 -0700 (In reply to comment #9) > (In reply to comment #8) > > Symbian build is still broken. I have no idea why. > > Looks like a problem with the OpenGL headers: > > compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] > "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined > GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) > ^ > > Should we build without OpenGL on Symbian perhaps? This shouldn't even be built on symbian, unless unix|mac applies to Symbian somehow. For now we should not enable TextureMapper for symbian, and eventually not build the OpenGL backend for Symbian. 412634 11 dihan.wickremasuriya 2011-05-31 08:17:39 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > Symbian build is still broken. I have no idea why. > > > > Looks like a problem with the OpenGL headers: > > > > compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] > > "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined > > GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) > > ^ > > > > Should we build without OpenGL on Symbian perhaps? > > This shouldn't even be built on symbian, unless unix|mac applies to Symbian somehow. > For now we should not enable TextureMapper for symbian, and eventually not build the OpenGL backend for Symbian. Actually qmake considers Symbian to be a flavor of unix. To exclude the texmap flag for Symbian you'll need to guard it with a 'mac|unix:!symbian' scope. 412733 12 noam 2011-05-31 10:23:14 -0700 Should be fixed in r87739 416792 13 96298 noam 2011-06-07 14:32:02 -0700 Created attachment 96298 Patch 416794 14 noam 2011-06-07 14:32:32 -0700 Reopening, so we can enable non-GL texture-mapper for Win/Symbian 416855 15 96298 kling 2011-06-07 15:36:58 -0700 Comment on attachment 96298 Patch rs=me 416979 16 96298 webkit.review.bot 2011-06-07 17:57:29 -0700 Comment on attachment 96298 Patch Clearing flags on attachment: 96298 Committed r88304: <http://trac.webkit.org/changeset/88304> 416980 17 webkit.review.bot 2011-06-07 17:57:35 -0700 All reviewed patches have been landed. Closing bug. 95357 2011-05-30 11:31:54 -0700 2011-05-30 12:48:46 -0700 Patch patch-default.diff text/plain 985 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YzgzMThmLi5iOWU2ODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMzAgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbVGV4 bWFwXVtRdF0gRW5hYmxlIFRleHR1cmVNYXBwZXIgYnkgZGVmYXVsdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE3NDAKKworICAgICAgICBNYWtlIENP TkZJRys9dGV4bWFwIGFuIG9wdC1vdXQgaW5zdGVhZCBvZiBhbiBvcHQtaW4uCisKKyAgICAgICAg Tm8gbmV3IGZ1bmN0aW9uYWxpdHkgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogV2ViQ29y ZS5wcmk6CisKIDIwMTEtMDUtMzAgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQppbmRl eCBmZDEzMzUzLi45NzlkZGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBy aQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQpAQCAtMyw4ICszLDggQEAKIGluY2x1 ZGUoLi4vY29tbW9uLnByaSkKIGluY2x1ZGUoZmVhdHVyZXMucHJpKQogCi0jIFVuY29tbWVudCB0 aGlzIHRvIGVuYWJsZSBUZXh0dXJlIE1hcHBlci4KLSMgQ09ORklHICs9IHRleG1hcAorIyBDb21t ZW50IHRoaXMgdG8gZGlzYWJsZSBUZXh0dXJlIE1hcHBlci4KK0NPTkZJRyArPSB0ZXhtYXAKIAog UVQgKj0gbmV0d29yawogCg== 95362 2011-05-30 12:48:46 -0700 2011-06-07 14:31:49 -0700 Patch with a less awkward comment. patch-default.diff text/plain 1024 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YzgzMThmLi5iOWU2ODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMzAgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgIFtUZXht YXBdW1F0XSBFbmFibGUgVGV4dHVyZU1hcHBlciBieSBkZWZhdWx0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTc0MAorCisgICAgICAgIE1ha2UgQ09O RklHKz10ZXhtYXAgYW4gb3B0LW91dCBpbnN0ZWFkIG9mIGFuIG9wdC1pbi4KKworICAgICAgICBO byBuZXcgZnVuY3Rpb25hbGl0eSBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJDb3Jl LnByaToKKwogMjAxMS0wNS0zMCAgTWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnByaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCmluZGV4 IGZkMTMzNTMuLjk3OWRkYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJp CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCkBAIC0zLDggKzMsOCBAQAogaW5jbHVk ZSguLi9jb21tb24ucHJpKQogaW5jbHVkZShmZWF0dXJlcy5wcmkpCiAKLSMgVW5jb21tZW50IHRo aXMgdG8gZW5hYmxlIFRleHR1cmUgTWFwcGVyLgotIyBDT05GSUcgKz0gdGV4bWFwCisjIFdlIGVu YWJsZSBUZXh0dXJlTWFwcGVyIGJ5IGRlZmF1bHQ7IHJlbW92ZSB0aGlzIGxpbmUgdG8gZW5hYmxl IEdyYXBoaWNzTGF5ZXJRdC4KK0NPTkZJRyArPSB0ZXhtYXAKIAogUVQgKj0gbmV0d29yawogCg== 96298 2011-06-07 14:32:02 -0700 2011-06-07 17:57:29 -0700 Patch bug-61740-20110607143031.patch text/plain 5684 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMDcgIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbVGV4bWFwXVtRdF0gRW5hYmxlIFRleHR1cmVN YXBwZXIgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjE3NDAKKworICAgICAgICBFbmFibGUgVGV4dHVyZU1hcHBlciBvbiBXaW5kb3dz K1N5bWJpYW4sIGRpc2FibGluZyB0aGUgZGlyZWN0IE9wZW5HTCBwYXRoLiBUaGlzIHdvdWxkIG1l YW4gdGhhdAorICAgICAgICBmb3Igbm93IFF0V2ViS2l0IG9uIFdpbmRvd3MvU3ltYmlhbiB3b3Vs ZCB1c2UgdGhlIFF0IGJhY2tlbmQgZm9yIFRleHR1cmVNYXBwZXIuCisKKyAgICAgICAgTm8gbmV3 IGZ1bmN0aW9uYWxpdHkgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogV2ViQ29yZS5wcmk6 CisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQv R3JhcGhpY3NDb250ZXh0M0RRdC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQv VGV4dHVyZU1hcHBlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXI6OmNy ZWF0ZSk6CisKIDIwMTEtMDYtMDcgIFJvYiBCdWlzICA8cmJ1aXNAcmltLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQkocmV2aXNpb24g ODgyMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQkod29ya2luZyBjb3B5KQpAQCAt NCw3ICs0LDcgQEAgaW5jbHVkZSguLi9jb21tb24ucHJpKQogaW5jbHVkZShmZWF0dXJlcy5wcmkp CiAKICMgV2UgZW5hYmxlIFRleHR1cmVNYXBwZXIgYnkgZGVmYXVsdDsgcmVtb3ZlIHRoaXMgbGlu ZSB0byBlbmFibGUgR3JhcGhpY3NMYXllclF0LgotbWFjfHVuaXg6IXN5bWJpYW46Q09ORklHICs9 IHRleG1hcAorQ09ORklHICs9IHRleG1hcAogCiBRVCAqPSBuZXR3b3JrCiAKQEAgLTI4NCw3ICsy ODQsOCBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfV0VCR0w9MSkgewogCiBjb250YWlucyhD T05GSUcsIHRleG1hcCkgewogICAgIERFRklORVMgKz0gV1RGX1VTRV9URVhUVVJFX01BUFBFUj0x Ci0gICAgY29udGFpbnMoUVRfQ09ORklHLCBvcGVuZ2wpIHsKKyAgICAhc3ltYmlhbjohd2luMzIt Kjpjb250YWlucyhRVF9DT05GSUcsIG9wZW5nbCkgeworICAgICAgICBERUZJTkVTICs9IFdURl9V U0VfVEVYVFVSRV9NQVBQRVJfR0wKICAgICAgICAgUVQgKj0gb3BlbmdsCiAgICAgfQogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvV2ViQ29yZS5wcm8JKHJldmlzaW9uIDg4MjM3KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTM1NjEsNyArMzU2MSw3IEBAIGNvbnRhaW5zKENPTkZJ RywgdGV4bWFwKSB7CiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyTm9kZS5jcHAgXAogICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXIuY3BwCiAKLSAgICBjb250YWlucyhRVF9DT05GSUcsIG9wZW5nbCkg eworICAgICFzeW1iaWFuOiF3aW4zMi0qOmNvbnRhaW5zKFFUX0NPTkZJRywgb3BlbmdsKSB7CiAg ICAgICAgIEhFQURFUlMgKz0gcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVNYXBwZXJH TC5oCiAgICAgICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVN YXBwZXJHTC5jcHAKICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAkocmV2aXNpb24g ODgyMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHQzRFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNyBAQAogI2luY2x1ZGUg PHd0Zi9VbnVzZWRQYXJhbS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQUEVSKQorI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQUEVSKSAmJiBV U0UoVEVYVFVSRV9NQVBQRVJfR0wpCiAjaW5jbHVkZSA8b3BlbmdsL1RleHR1cmVNYXBwZXJHTC5o PgogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1Rl eHR1cmVNYXBwZXJRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvVGV4dHVyZU1hcHBlclF0LmNwcAkocmV2aXNpb24gODgyMzcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9UZXh0dXJlTWFwcGVyUXQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNCw3ICsyNCw3IEBACiAjaW5jbHVkZSA8UXRHdWkvcXBhaW50ZW5naW5l Lmg+CiAjaW5jbHVkZSA8UXRHdWkvcXBpeG1hcC5oPgogCi0jaWZkZWYgUVRfT1BFTkdMX0xJQgor I2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKICMgaW5jbHVkZSAib3BlbmdsL1RleHR1cmVNYXBw ZXJHTC5oIgogI2VuZGlmCiAKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJR dDo6ZHJhd1RleHR1cmUoY29uc3QgCiAKIFBhc3NPd25QdHI8VGV4dHVyZU1hcHBlcj4gVGV4dHVy ZU1hcHBlcjo6Y3JlYXRlKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCkKIHsKLSNpZmRlZiBRVF9P UEVOR0xfTElCCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQogICAgIGlmIChjb250ZXh0ICYm IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5wYWludEVuZ2luZSgpLT50eXBlKCkgPT0gUVBh aW50RW5naW5lOjpPcGVuR0wyKQogICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFRleHR1cmVN YXBwZXJHTCk7CiAjZW5kaWYKQEAgLTIxMyw3ICsyMTMsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJR dDo6ZW5kUGFpbnRpbmcoKQogICAgIG1fcGFpbnRlci0+cmVzdG9yZSgpOwogfQogCi0jaWZkZWYg UVRfT1BFTkdMX0xJQgorI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKIGNsYXNzIFJHQkEzMlBy ZW11bHRpbXBsaWVkQnVmZmVyUXQgOiBwdWJsaWMgUkdCQTMyUHJlbXVsdGltcGxpZWRCdWZmZXIg ewogcHVibGljOgogICAgIHZpcnR1YWwgUGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIGJlZ2luUGFp bnQoY29uc3QgSW50UmVjdCYgcmVjdCwgYm9vbCBvcGFxdWUpCkluZGV4OiBTb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwko cmV2aXNpb24gODgyNjcpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTA2LTA3ICBOb2FtIFJvc2VudGhhbCAgPG5vYW0u cm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbVGV4bWFwXVtRdF0gRW5hYmxlIFRleHR1cmVNYXBwZXIgYnkgZGVmYXVs dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE3NDAK KworICAgICAgICBFbmFibGUgVGV4dHVyZU1hcHBlciBvbiBXaW5kb3dzK1N5bWJpYW4sIGRpc2Fi bGluZyB0aGUgZGlyZWN0IE9wZW5HTCBwYXRoLiBUaGlzIHdvdWxkIG1lYW4gdGhhdAorICAgICAg ICBmb3Igbm93IFF0V2ViS2l0IG9uIFdpbmRvd3MvU3ltYmlhbiB3b3VsZCB1c2UgdGhlIFF0IGJh Y2tlbmQgZm9yIFRleHR1cmVNYXBwZXIuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdl Q2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNsaWVudFFHcmFwaGljc1dpZGdl dDo6c2V0Um9vdEdyYXBoaWNzTGF5ZXIpOgorCiAyMDExLTA2LTA3ICBBcmF2aW5kIEFrZWxsYSAg PGFyYXZpbmQuYWtlbGxhQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBMYXN6bG8g R29tYm9zLgpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50 UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFn ZUNsaWVudFF0LmNwcAkocmV2aXNpb24gODgyMzcpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDcg QEAKICNpbmNsdWRlICJUZXh0dXJlTWFwcGVyUXQuaCIKICNpbmNsdWRlICJ0ZXhtYXAvVGV4dHVy ZU1hcHBlck5vZGUuaCIKIAotI2lmZGVmIFFUX09QRU5HTF9MSUIKKyNpZiBVU0UoVEVYVFVSRV9N QVBQRVJfR0wpCiAjaW5jbHVkZSAib3BlbmdsL1RleHR1cmVNYXBwZXJHTC5oIgogI2VuZGlmCiAj ZW5kaWYKQEAgLTI2NSw3ICsyNjUsNyBAQCB2b2lkIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OnNldFJvb3RHCiB7CiAgICAgaWYgKGxheWVyKSB7CiAgICAgICAgIHRleHR1cmVNYXBwZXJOb2Rl Q2xpZW50ID0gYWRvcHRQdHIobmV3IFRleHR1cmVNYXBwZXJOb2RlQ2xpZW50UXQocGFnZS0+bWFp bkZyYW1lKCksIGxheWVyKSk7Ci0jaWZkZWYgUVRfT1BFTkdMX0xJQgorI2lmIFVTRShURVhUVVJF X01BUFBFUl9HTCkKICAgICAgICAgUUdyYXBoaWNzVmlldyogZ3JhcGhpY3NWaWV3ID0gdmlldy0+ c2NlbmUoKS0+dmlld3MoKVswXTsKICAgICAgICAgaWYgKGdyYXBoaWNzVmlldyAmJiBncmFwaGlj c1ZpZXctPnZpZXdwb3J0KCkgJiYgZ3JhcGhpY3NWaWV3LT52aWV3cG9ydCgpLT5pbmhlcml0cygi UUdMV2lkZ2V0IikpIHsKICAgICAgICAgICAgIHRleHR1cmVNYXBwZXJOb2RlQ2xpZW50LT5zZXRU ZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXJHTDo6Y3JlYXRlKCkpOwo=