diff --git a/7fcaff2f76bed0446cc4350efeabf40305962007 b/7fcaff2f76bed0446cc4350efeabf40305962007
index 5444e6905..4658b54db 100644
--- a/7fcaff2f76bed0446cc4350efeabf40305962007
+++ b/7fcaff2f76bed0446cc4350efeabf40305962007
@@ -270,6 +270,25 @@
       "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "8f60ba5f_4c37f780",
+        "filename": "source/scale.cc",
+        "patchSetId": 2
+      },
+      "lineNbr": 2128,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Yes, that plan sounds good. Undid the +/-32767 height cap from https://crrev.com/c/8524280 so ScalePlane, ScalePlane_16, UVScale, and UVScale_16 allow |src_height| \u003c\u003d 32768 again. Restored the dst_height \u003d\u003d 1 \u0026\u0026 src_height \u003e\u003d 32768 check here and in ScalePlane_16, moved the \u0027When scaling down, use the center 2 rows to filter.\u0027 comment into the dst_height \u003c\u003d src_height branch, and added a comment explaining the dst_height \u003d\u003d 1 \u0026\u0026 src_height \u003e\u003d 32768 case. Also updated the unit tests in scale_plane_test.cc back to kSrcHeight \u003d 32768.",
+      "parentUuid": "038514ef_867963ea",
+      "isAi": true,
+      "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -306,6 +325,25 @@
       "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "9b7b3f18_874296f4",
+        "filename": "source/scale.cc",
+        "patchSetId": 2
+      },
+      "lineNbr": 2129,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Restored the dst_height \u003d\u003d 1 \u0026\u0026 src_height \u003e\u003d 32768 branch and added the explanatory comment \u0027// Check for 1 pixel and avoid FixedDiv overflow.\u0027.",
+      "parentUuid": "8c320fad_0a4e8110",
+      "isAi": true,
+      "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -342,6 +380,25 @@
       "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "6a7a77cf_506498f4",
+        "filename": "source/scale.cc",
+        "patchSetId": 2
+      },
+      "lineNbr": 2246,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Restored and moved the comment into the dst_height \u003c\u003d src_height branch.",
+      "parentUuid": "60c3de4a_fbaf70f3",
+      "isAi": true,
+      "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -378,6 +435,25 @@
       "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "b2029276_e99b68d6",
+        "filename": "source/scale.cc",
+        "patchSetId": 2
+      },
+      "lineNbr": 2247,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Restored the dst_height \u003d\u003d 1 \u0026\u0026 src_height \u003e\u003d 32768 branch and added the explanatory comment \u0027// Check for 1 pixel and avoid FixedDiv overflow.\u0027.",
+      "parentUuid": "cc2f26a6_e37b77d4",
+      "isAi": true,
+      "revId": "7fcaff2f76bed0446cc4350efeabf40305962007",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
diff --git a/f69573745a6adb0119f173b6df8ccd6d75b47fb9 b/f69573745a6adb0119f173b6df8ccd6d75b47fb9
index b1da54920..fdcb74838 100644
--- a/f69573745a6adb0119f173b6df8ccd6d75b47fb9
+++ b/f69573745a6adb0119f173b6df8ccd6d75b47fb9
@@ -40,6 +40,31 @@
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "a1341223_4afd4d96",
+        "filename": "source/scale.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 2092,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "b0661ffa_2b8d0c7d",
+      "range": {
+        "startLine": 2089,
+        "startChar": 0,
+        "endLine": 2092,
+        "endChar": 18
+      },
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -57,6 +82,25 @@
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "f2a1ff33_efeb4d01",
+        "filename": "source/scale.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 2094,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "269e5d0f_c140b42b",
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -80,6 +124,31 @@
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "ff3ca448_724bc3d9",
+        "filename": "source/scale.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 2208,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "ed668569_b41be493",
+      "range": {
+        "startLine": 2205,
+        "startChar": 0,
+        "endLine": 2208,
+        "endChar": 18
+      },
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -97,6 +166,25 @@
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "3d258e4f_fca709a4",
+        "filename": "source/scale.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 2210,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "31bb674f_089f1c37",
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -114,6 +202,25 @@
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "2bd4cde5_51333375",
+        "filename": "source/scale_uv.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 1273,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "afea5645_95d9847c",
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
     {
       "unresolved": true,
       "key": {
@@ -136,6 +243,31 @@
       },
       "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
       "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
+    },
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "da18892f_cc885ec6",
+        "filename": "source/scale_uv.cc",
+        "patchSetId": 3
+      },
+      "lineNbr": 1297,
+      "author": {
+        "id": 1115898
+      },
+      "writtenOn": "2026-10-14T02:10:45Z",
+      "side": 1,
+      "message": "Done.",
+      "parentUuid": "fea58054_dc4cfdc2",
+      "range": {
+        "startLine": 1296,
+        "startChar": 0,
+        "endLine": 1297,
+        "endChar": 79
+      },
+      "isAi": true,
+      "revId": "f69573745a6adb0119f173b6df8ccd6d75b47fb9",
+      "serverId": "3ce6091f-6c88-37e8-8c75-72f92ae8dfba"
     }
   ]
 }
\ No newline at end of file