170928 2017-04-17 19:03:07 -0700 [WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods 2017-04-17 20:21:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 170851 1 fujii fujii bfulgham buildbot cmarcelo commit-queue koivisto kondapallykalyan luiz noam simon.fraser zalan oldest_to_newest 1298134 0 fujii 2017-04-17 19:03:07 -0700 [WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods Since http://trac.webkit.org/changeset/215410 > FAILED: Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/texmap/TextureMapperLayer.cpp.obj > "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64\cl.exe" /nologo /TP @Source\WebCore\CMakeFiles\WebCore.dir\platform\graphics\texmap\TextureMapperLayer.cpp.obj.rsp /showIncludes /FoSource\WebCore\CMakeFiles\WebCore.dir\platform\graphics\texmap\TextureMapperLayer.cpp.obj /Fdlib64\WebCore.pdb /FS -c C:\WebKit-BuildSlave\win-cairo-release\build\Source\WebCore\platform\graphics\texmap\TextureMapperLayer.cpp > c:\webkit-buildslave\win-cairo-release\build\source\webcore\platform\graphics\texmap\GraphicsLayerTextureMapper.h(86): error C3668: 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods 1298139 1 307333 fujii 2017-04-17 19:20:44 -0700 Created attachment 307333 Patch 1298140 2 307333 simon.fraser 2017-04-17 19:26:34 -0700 Comment on attachment 307333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=307333&action=review > Source/WebCore/ChangeLog:11 > + (WebCore::GraphicsLayerTextureMapper::flushCompositingState): Added the second arguent. "arguent" 1298141 3 307333 fujii 2017-04-17 19:27:13 -0700 Comment on attachment 307333 Patch >Subversion Revision: 215441 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index c84582531b1db89a981fb6288c045152f2175d7a..3305e2ab6d3443e9600c7470b5589e8e2444913e 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,16 @@ >+2017-04-17 Fujii Hironori <Hironori.Fujii@sony.com> >+ >+ [WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods >+ https://bugs.webkit.org/show_bug.cgi?id=170928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Apply the same change of CoordinatedGraphicsLayer.{cpp,h} of r215410 to GraphicsLayerTextureMapper.{cpp,h}. >+ >+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp: >+ (WebCore::GraphicsLayerTextureMapper::flushCompositingState): Added the second arguent. >+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h: Ditto. >+ > 2017-04-17 Alex Christensen <achristensen@webkit.org> > > Fix CMake build. >diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp >index 78a0246f7f550882c30d5fd06a24222eec80ac04..8f467822b4e38961d8a71c6314aa014de9ed4982 100644 >--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp >+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp >@@ -497,7 +497,7 @@ void GraphicsLayerTextureMapper::commitLayerChanges() > m_changeMask = NoChanges; > } > >-void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect) >+void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect, FlushScope) > { > if (!m_layer.textureMapper()) > return; >diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h >index 42ed713d3e633a4c12bc874ccb5b45f5391311ad..71bfe61e0c693300af5bd3b613b10e74b4862968 100644 >--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h >+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h >@@ -83,7 +83,7 @@ public: > void setDebugBorder(const Color&, float width) override; > void setShowRepaintCounter(bool) override; > >- void flushCompositingState(const FloatRect&) override; >+ void flushCompositingState(const FloatRect&, FlushScope) override; > void flushCompositingStateForThisLayerOnly() override; > > void updateBackingStoreIncludingSubLayers(); 1298142 4 307334 fujii 2017-04-17 19:30:36 -0700 Created attachment 307334 Patch 1298153 5 307334 commit-queue 2017-04-17 20:21:40 -0700 Comment on attachment 307334 Patch Clearing flags on attachment: 307334 Committed r215447: <http://trac.webkit.org/changeset/215447> 1298154 6 commit-queue 2017-04-17 20:21:43 -0700 All reviewed patches have been landed. Closing bug. 307333 2017-04-17 19:20:44 -0700 2017-04-17 19:28:29 -0700 Patch bug-170928-20170418112043.patch text/plain 2554 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg0NTgyNTMxYjFkYjg5 YTk4MWZiNjI4OGMwNDUxNTJmMjE3NWQ3YS4uMzMwNWUyYWI2ZDM0NDNlOTYwMGM3NDcwYjU1ODll OGUyNDQ0OTEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA0LTE3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gJ1dlYkNvcmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpmbHVzaENvbXBvc2l0aW5n U3RhdGVkJzogbWV0aG9kIHdpdGggb3ZlcnJpZGUgc3BlY2lmaWVyICdvdmVycmlkZScgZGlkIG5v dCBvdmVycmlkZSBhbnkgYmFzZSBjbGFzcyBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgc2FtZSBjaGFuZ2Ugb2YgQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyLntjcHAsaH0gb2YgcjIxNTQxMCB0byBHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlci57Y3BwLGh9LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGUpOiBBZGRlZCB0aGUg c2Vjb25kIGFyZ3VlbnQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmg6IERpdHRvLgorCiAyMDE3LTA0LTE3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IENNYWtlIGJ1 aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKaW5kZXggNzhh MDI0NmY3ZjU1MDg4MmMzMGQ1ZmQwNmEyNDIyMmVlYzgwYWMwNC4uOGY0Njc4MjJiNGUzODk2MWQ4 YTcxYzYzMTRhYTAxNGRlOWVkNDk4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXIuY3BwCkBAIC00OTcsNyArNDk3LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlcjo6Y29tbWl0TGF5ZXJDaGFuZ2VzKCkKICAgICBtX2NoYW5nZU1hc2sgPSBOb0NoYW5n ZXM7CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OmZsdXNoQ29tcG9zaXRp bmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmIHJlY3QpCit2b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBGbHVz aFNjb3BlKQogewogICAgIGlmICghbV9sYXllci50ZXh0dXJlTWFwcGVyKCkpCiAgICAgICAgIHJl dHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKaW5kZXggNDJlZDcx M2QzZTYzM2E0YzEyYmM4NzRjY2I1YjQ1ZjUzOTEzMTFhZC4uNzFiZmU2MWUwYzY5MzMwMGFmNWJk M2I2MTNiMTBlNzRiNDg2Mjk2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFw cGVyLmgKQEAgLTgzLDcgKzgzLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGVidWdCb3JkZXIo Y29uc3QgQ29sb3ImLCBmbG9hdCB3aWR0aCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXRTaG93UmVw YWludENvdW50ZXIoYm9vbCkgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIGZsdXNoQ29tcG9zaXRpbmdT dGF0ZShjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKKyAgICB2b2lkIGZsdXNoQ29tcG9zaXRp bmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmLCBGbHVzaFNjb3BlKSBvdmVycmlkZTsKICAgICB2b2lk IGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKSBvdmVycmlkZTsKIAogICAg IHZvaWQgdXBkYXRlQmFja2luZ1N0b3JlSW5jbHVkaW5nU3ViTGF5ZXJzKCk7Cg== 307334 2017-04-17 19:30:36 -0700 2017-04-17 20:21:40 -0700 Patch bug-170928-20170418113035.patch text/plain 2555 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg0NTgyNTMxYjFkYjg5 YTk4MWZiNjI4OGMwNDUxNTJmMjE3NWQ3YS4uMmZhOTMwMTJkYjIxOWY0MjEyMjM5ZTVlZTJiZjhj ODQ1NTM5ZmIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA0LTE3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gJ1dlYkNvcmU6OkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpmbHVzaENvbXBvc2l0aW5n U3RhdGVkJzogbWV0aG9kIHdpdGggb3ZlcnJpZGUgc3BlY2lmaWVyICdvdmVycmlkZScgZGlkIG5v dCBvdmVycmlkZSBhbnkgYmFzZSBjbGFzcyBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgc2FtZSBjaGFuZ2Ugb2YgQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyLntjcHAsaH0gb2YgcjIxNTQxMCB0byBHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlci57Y3BwLGh9LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGUpOiBBZGRlZCB0aGUg c2Vjb25kIGFyZ3VtZW50LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlci5oOiBEaXR0by4KKwogMjAxNy0wNC0xNyAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBDTWFrZSBi dWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCmluZGV4IDc4 YTAyNDZmN2Y1NTA4ODJjMzBkNWZkMDZhMjQyMjJlZWM4MGFjMDQuLjhmNDY3ODIyYjRlMzg5NjFk OGE3MWM2MzE0YWEwMTRkZTllZDQ5ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyLmNwcApAQCAtNDk3LDcgKzQ5Nyw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXI6OmNvbW1pdExheWVyQ2hhbmdlcygpCiAgICAgbV9jaGFuZ2VNYXNrID0gTm9DaGFu Z2VzOwogfQogCi12b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpmbHVzaENvbXBvc2l0 aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0JiByZWN0KQordm9pZCBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgRmx1 c2hTY29wZSkKIHsKICAgICBpZiAoIW1fbGF5ZXIudGV4dHVyZU1hcHBlcigpKQogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCmluZGV4IDQyZWQ3 MTNkM2U2MzNhNGMxMmJjODc0Y2NiNWI0NWY1MzkxMzExYWQuLjcxYmZlNjFlMGM2OTMzMDBhZjVi ZDNiNjEzYjEwZTc0YjQ4NjI5NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCkBAIC04Myw3ICs4Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERlYnVnQm9yZGVy KGNvbnN0IENvbG9yJiwgZmxvYXQgd2lkdGgpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0U2hvd1Jl cGFpbnRDb3VudGVyKGJvb2wpIG92ZXJyaWRlOwogCi0gICAgdm9pZCBmbHVzaENvbXBvc2l0aW5n U3RhdGUoY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdm9pZCBmbHVzaENvbXBvc2l0 aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0JiwgRmx1c2hTY29wZSkgb3ZlcnJpZGU7CiAgICAgdm9p ZCBmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCkgb3ZlcnJpZGU7CiAKICAg ICB2b2lkIHVwZGF0ZUJhY2tpbmdTdG9yZUluY2x1ZGluZ1N1YkxheWVycygpOwo=