)]}' { "commit": "2d4f959d7a7c9f17e57411a7bc5c8b3ffdb34d18", "tree": "30005c44f67637ddd9aa1d0d2a2fa5c4152e6337", "parents": [ "b7fc7a4677104ba8f8d556e2ae75e38b5cdaaa00" ], "author": { "name": "John Stiles", "email": "johnstiles@google.com", "time": "Fri Oct 30 10:29:12 2020 -0400" }, "committer": { "name": "Skia Commit-Bot", "email": "skia-commit-bot@chromium.org", "time": "Fri Oct 30 14:59:10 2020 +0000" }, "message": "Reland \"Moved SkSL data back into node classes\"\n\nThis is a reland of f71e0be970978f04b4670b41c12ad0baffbb7fcd\n\nOriginal change\u0027s description:\n\u003e Moved SkSL data back into node classes\n\u003e\n\u003e The original goal of this rearchitecture had been to move all of the\n\u003e data into IRNode so that we could manage IRNode objects directly rather\n\u003e than std::unique_ptr\u003cIRNode\u003e. Other changes have rendered that original\n\u003e goal obsolete, so this is undoing most of the work that was done during\n\u003e this rearchitecture.\n\u003e\n\u003e Change-Id: Ic56ffb17bb013c8b4884d710215f5345a481468a\n\u003e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330297\n\u003e Commit-Queue: Ethan Nicholas \u003cethannicholas@google.com\u003e\n\u003e Commit-Queue: John Stiles \u003cjohnstiles@google.com\u003e\n\u003e Reviewed-by: John Stiles \u003cjohnstiles@google.com\u003e\n\nChange-Id: Ifec4777a42ef0f95f6edc418dcd46fd38c856fa5\nReviewed-on: https://skia-review.googlesource.com/c/skia/+/330739\nCommit-Queue: John Stiles \u003cjohnstiles@google.com\u003e\nCommit-Queue: Ethan Nicholas \u003cethannicholas@google.com\u003e\nAuto-Submit: John Stiles \u003cjohnstiles@google.com\u003e\nReviewed-by: Ethan Nicholas \u003cethannicholas@google.com\u003e\n", "tree_diff": [ { "type": "modify", "old_id": "e47593e14efe306c895a2b6861e751086441e338", "old_mode": 33188, "old_path": "gn/sksl.gni", "new_id": "8e2a331d3c0d605f0b2d9f8589b1606340bc220f", "new_mode": 33188, "new_path": "gn/sksl.gni" }, { "type": "modify", "old_id": "0fe64b83f7b050b8544557919677a2c1646efc5e", "old_mode": 33188, "old_path": "src/sksl/SkSLAnalysis.cpp", "new_id": "468db172ea9acd9a136a43150d1d2733b4901a7e", "new_mode": 33188, "new_path": "src/sksl/SkSLAnalysis.cpp" }, { "type": "modify", "old_id": "649c9db4938c49cee1dbc29cf796766ee7543d31", "old_mode": 33188, "old_path": "src/sksl/SkSLByteCodeGenerator.cpp", "new_id": "f24f0a51673ff62bd36221d79d71f33a36a53c51", "new_mode": 33188, "new_path": "src/sksl/SkSLByteCodeGenerator.cpp" }, { "type": "modify", "old_id": "540490da2d0d704578c42434eaf6518d42a49ca6", "old_mode": 33188, "old_path": "src/sksl/SkSLCFGGenerator.cpp", "new_id": "0b1e49373b248ca57b54f0a0e3116aec3335050e", "new_mode": 33188, "new_path": "src/sksl/SkSLCFGGenerator.cpp" }, { "type": "modify", "old_id": "d13870cd8489dc5eab474272041eca7fc0d31e65", "old_mode": 33188, "old_path": "src/sksl/SkSLCPPCodeGenerator.cpp", "new_id": "f122a5c6900586b40567191687b8eb124ffe0cd0", "new_mode": 33188, "new_path": "src/sksl/SkSLCPPCodeGenerator.cpp" }, { "type": "modify", "old_id": "331b086462b26150e36ca6a04598518f0eb834b2", "old_mode": 33188, "old_path": "src/sksl/SkSLCompiler.cpp", "new_id": "de0e5b5db53b79dffb4f5c9e3d5190ef194bff3e", "new_mode": 33188, "new_path": "src/sksl/SkSLCompiler.cpp" }, { "type": "modify", "old_id": "663b57bdf25c22a30eb54a4e671f82621e797e52", "old_mode": 33188, "old_path": "src/sksl/SkSLDehydrator.cpp", "new_id": "728429e5aa1f15da0562a5078d8a9deea0e2c27e", "new_mode": 33188, "new_path": "src/sksl/SkSLDehydrator.cpp" }, { "type": "modify", "old_id": "aac27ca38cbefd59d103daa358f109a7ef907196", "old_mode": 33188, "old_path": "src/sksl/SkSLExternalValue.h", "new_id": "4e9be24ce81fd3f70e546357e50eb0101cac1451", "new_mode": 33188, "new_path": "src/sksl/SkSLExternalValue.h" }, { "type": "modify", "old_id": "f6d4d61e5d2050bda1539467a2958290d62c5d72", "old_mode": 33188, "old_path": "src/sksl/SkSLGLSLCodeGenerator.cpp", "new_id": "3e0e9bd5740738c5583309a5deed18fb14129b49", "new_mode": 33188, "new_path": "src/sksl/SkSLGLSLCodeGenerator.cpp" }, { "type": "modify", "old_id": "3964773e84c2f5ce0a7059230f1ab82f5d36fc79", "old_mode": 33188, "old_path": "src/sksl/SkSLIRGenerator.h", "new_id": "38e254afb665ce76e3b3f1daad608d2fa56f0c2c", "new_mode": 33188, "new_path": "src/sksl/SkSLIRGenerator.h" }, { "type": "modify", "old_id": "3b013b611a3146cfdf031562a62abd4e92ab0dbb", "old_mode": 33188, "old_path": "src/sksl/SkSLInliner.cpp", "new_id": "6f80c20d2388f892154af4e84aa45c317b3f8dcc", "new_mode": 33188, "new_path": "src/sksl/SkSLInliner.cpp" }, { "type": "modify", "old_id": "c8ef96a0159d6aa0e650c1243b2e906d59db5aaf", "old_mode": 33188, "old_path": "src/sksl/SkSLMetalCodeGenerator.cpp", "new_id": "22a9cab33fcca5ffa708fd1ca1e37eed6d566799", "new_mode": 33188, "new_path": "src/sksl/SkSLMetalCodeGenerator.cpp" }, { "type": "modify", "old_id": "5e5ddb64aff4c41be1447819c4494157918960d2", "old_mode": 33188, "old_path": "src/sksl/SkSLSPIRVCodeGenerator.cpp", "new_id": "440800c35d0acfe7da08429551de43ec88a18745", "new_mode": 33188, "new_path": "src/sksl/SkSLSPIRVCodeGenerator.cpp" }, { "type": "modify", "old_id": "c393fdd3bf57861fc1e063f5ee70962afbe96118", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLBinaryExpression.h", "new_id": "bf59cf9e823788f67772a3587b8c45ddedffbc61", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLBinaryExpression.h" }, { "type": "modify", "old_id": "faefd7eae108a0acfeb97466172a9a894c7c2bbb", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLBlock.h", "new_id": "b916a5b9bb21b2f3ea5361576ab1e38ddef02366", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLBlock.h" }, { "type": "modify", "old_id": "0bb660ce8d85125b0d7dcb0184591df2b80a8912", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLBoolLiteral.h", "new_id": "38c51c74231644a6c90508c473b049143701ff55", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLBoolLiteral.h" }, { "type": "modify", "old_id": "103e4d637fc116197e02c876bf8823866956b56f", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLConstructor.h", "new_id": "25240b770b1a12bf94a8419edbc71c51e5ab280c", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLConstructor.h" }, { "type": "modify", "old_id": "39636d716702a6868e98b7adf30a27c687568269", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLDoStatement.h", "new_id": "231abbac02ce0509dd8239b6303dc8a9bc92253b", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLDoStatement.h" }, { "type": "modify", "old_id": "a0614b1a0dab32d715d0e1f56548c0c2ec5d267d", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLExpression.h", "new_id": "6a69e2f2d561819a484de130d2dea89181e3d08e", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLExpression.h" }, { "type": "modify", "old_id": "8b98ccb6123261b7607ba92d86bb7500079ea85e", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLExpressionStatement.h", "new_id": "b14964f78ad885ecd5cccbbe5e1341955da05d50", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLExpressionStatement.h" }, { "type": "modify", "old_id": "f06b4216d2f0ba2d320093c88a78739b1f50eac7", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLExtension.h", "new_id": "d0293d2b4dd877647c197f05eef898d9e3866dec", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLExtension.h" }, { "type": "modify", "old_id": "bb54ae5b3a2b392637f2cf83d8fc67c5f527e1fe", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLExternalFunctionCall.h", "new_id": "05eede241c57e1dbbf140e826cc1db382c3025eb", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLExternalFunctionCall.h" }, { "type": "modify", "old_id": "ace35ff2304a6e9a060f242d7cf3d99cf7c35aeb", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLExternalValueReference.h", "new_id": "5c42c6a6fc2043b53de4fd61b69ca02c0d0d4836", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLExternalValueReference.h" }, { "type": "modify", "old_id": "f1dde076fc18809fe93bedf13c124c28717ae4ec", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLFieldAccess.h", "new_id": "3291c1107a44ee1dc720610574120a213426d4ee", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLFieldAccess.h" }, { "type": "modify", "old_id": "81f85ef39bc5140c0d068aec78fbb253020378d3", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLFloatLiteral.h", "new_id": "87329b13678abbbde2ea0c11d5d69e1bc3e5b5b7", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLFloatLiteral.h" }, { "type": "modify", "old_id": "8afd092edd8cb4a36913a9e1cbcdc19c8b1fde73", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLForStatement.h", "new_id": "8aaafec450294a09614f1c084833b71ef4bc7ba2", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLForStatement.h" }, { "type": "modify", "old_id": "f8d83aa8a6da79ef38a260425592b802509c632c", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLFunctionCall.h", "new_id": "08ece8fe9144f1907366fa9beae757b2df9505c7", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLFunctionCall.h" }, { "type": "modify", "old_id": "2638e3634168af2befcce87baca9157db38b66b7", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLFunctionDefinition.h", "new_id": "419d5cff949a7c127dba12eb0787960b74890b70", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLFunctionDefinition.h" }, { "type": "modify", "old_id": "e26c5170cac9902d668e8dfc9ab5daebb7b832fc", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLFunctionReference.h", "new_id": "c9f7c1b037195c045c039ce099fd9d3ac2c981c8", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLFunctionReference.h" }, { "type": "delete", "old_id": "9b1817da4183d854089ede05252cd88aa9772630", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLIRNode.cpp", "new_id": "0000000000000000000000000000000000000000", "new_mode": 0, "new_path": "/dev/null" }, { "type": "modify", "old_id": "c94bcd513ad13fcb1ee2483dde6d579e8c6d6190", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLIRNode.h", "new_id": "be20c8011cee1b76d1bfc2bf473b5d28a44de16f", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLIRNode.h" }, { "type": "modify", "old_id": "15145ed296595ca6955415cb9c7bf4ce52ea5622", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLIfStatement.h", "new_id": "56aaab99c0c94390a9119da14ae4b85bd8c68bbc", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLIfStatement.h" }, { "type": "modify", "old_id": "0816975b6475ff54eb13924beef38f8f5e21ff7a", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLIndexExpression.h", "new_id": "4151173f84e092328df189f7e4b34c3b1283edd2", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLIndexExpression.h" }, { "type": "modify", "old_id": "bce27d7a80adcd3301d66540c74ae953abb4e946", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLInlineMarker.h", "new_id": "45f4680004294412af682e96aa3eac502bb3456b", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLInlineMarker.h" }, { "type": "modify", "old_id": "9554e967f074d51be7344df94ff57e455a1b8ce1", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLIntLiteral.h", "new_id": "74d45912f3bd2eb94839b7072ac4489da247d24f", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLIntLiteral.h" }, { "type": "modify", "old_id": "60b4ff738d199ab625ac61c8581ea5245681796c", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLInterfaceBlock.h", "new_id": "6353d7f7cfaedffd6588752b7099957e4c41f439", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLInterfaceBlock.h" }, { "type": "modify", "old_id": "a9ef296c217e426ccf50b75266fe98ae1d9ba0d8", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLModifiersDeclaration.h", "new_id": "25433ffe1547498f39b4e8503b1668b016f5e49d", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLModifiersDeclaration.h" }, { "type": "modify", "old_id": "a9b7fbfce5ad1006d7df6c25a18a6aef0cc4cb88", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLPostfixExpression.h", "new_id": "6b61f75832f6a5fb2ac8306361a003ce6de2875a", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLPostfixExpression.h" }, { "type": "modify", "old_id": "2db1c9420d669c170090c75c901ec6f4c1bf5b1c", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLPrefixExpression.h", "new_id": "11d64eec25a49002bdaa4060ed7114059346ecd2", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLPrefixExpression.h" }, { "type": "modify", "old_id": "27997a29502cb2482f2101089a66655f7d9399ac", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLProgramElement.h", "new_id": "e14415a72937bd3cce8e6ec5c454d295ef343cf2", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLProgramElement.h" }, { "type": "modify", "old_id": "9b40e513caf38a37c1952cbb05a6ffe4f8415b38", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLReturnStatement.h", "new_id": "d44f0490b476f95b652c19d6859221a690b0c255", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLReturnStatement.h" }, { "type": "modify", "old_id": "76f0af0a4fa620e46b4e9655bc42b3e89442c634", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSetting.h", "new_id": "f4bcee5519100e3a58c7a8af8867bc6193a35714", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSetting.h" }, { "type": "modify", "old_id": "b4d26a1b905d8dc2fefdcadd0804f07b2859a637", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLStatement.h", "new_id": "6ffb4e52da2e9ca0d721c16caf465e30542ec1c7", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLStatement.h" }, { "type": "modify", "old_id": "841af529f0717f55b5cbb304a06fb1c748e02837", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSwitchCase.h", "new_id": "3d5ac7098f2ebec2c635d90feea8d96a7ccbfce6", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSwitchCase.h" }, { "type": "modify", "old_id": "0ca17ddeeeaaf138dfacbaa5aa8717a96121b7fe", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSwitchStatement.h", "new_id": "916a8d59cf845edff03e236490771d13814cada6", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSwitchStatement.h" }, { "type": "modify", "old_id": "aea1e7a0cc371bf5693b78d6d499c8aab591c23e", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSwizzle.h", "new_id": "30ac5a5592f464ae430ab02c0a1806ef811e65c5", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSwizzle.h" }, { "type": "modify", "old_id": "8ca599bbe1c39a8a269e33d9b8f3b1184fa31dd5", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSymbol.h", "new_id": "a8908919d00c2ddffd2c76c2d235d7c73cc23920", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSymbol.h" }, { "type": "modify", "old_id": "6651d39e08f1e7d93e8f889fb98a0940b919c01d", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLSymbolAlias.h", "new_id": "310856af88faf9d1ec659d4bfde9ac10b23ad0eb", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLSymbolAlias.h" }, { "type": "modify", "old_id": "ab73c4fe21af6ee0cfe28508c510200c785957a3", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLTernaryExpression.h", "new_id": "25006cf45a927b0e12defe35414209ad89050e5e", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLTernaryExpression.h" }, { "type": "modify", "old_id": "0ba682f407e8bf521acd7fa4e6a893027ac61efa", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLType.h", "new_id": "59b7ef0841fd0a756ee12e88d61ce59442374bad", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLType.h" }, { "type": "modify", "old_id": "5d37621f28abdcd504c48dc4fc3c1133e37bbd60", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLTypeReference.h", "new_id": "9fc5baef231ad962498dc4072b189d9e84ce8e1d", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLTypeReference.h" }, { "type": "modify", "old_id": "a4d44d763c69a2368eb7345a807edf5a4cf72ba5", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLUnresolvedFunction.h", "new_id": "f1aad74203c6ca3fb0cf67a4b11fb32f38d58696", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLUnresolvedFunction.h" }, { "type": "modify", "old_id": "0ba7dc29533ec268e1dc3d7e2a3c96402f6f3431", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLVarDeclarations.h", "new_id": "c82dd5fdef85356e0fe3434dbcee4828247ce068", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLVarDeclarations.h" }, { "type": "modify", "old_id": "b9610f0a9c91cacca1f7b4bd78757e745186562a", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLVariableReference.cpp", "new_id": "8e7686aabc18ee2221887a59ac4781c40af9265b", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLVariableReference.cpp" }, { "type": "modify", "old_id": "48b13a4d02dbaa80617e1d7e93424e684ddb8e90", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLVariableReference.h", "new_id": "87a180b2f90a6b1342b8c04cd366d8bd145a8b7d", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLVariableReference.h" }, { "type": "modify", "old_id": "59146db60856f1d94299b4d90636e33458caee94", "old_mode": 33188, "old_path": "src/sksl/ir/SkSLWhileStatement.h", "new_id": "7fd1bf40bfba924267c10384dd0b79f89707da99", "new_mode": 33188, "new_path": "src/sksl/ir/SkSLWhileStatement.h" } ] }