Revert "fix: session.getBlobData never resolves with blob sizes > 655…

…36 (electron#35277)" This reverts commit e3efa16.
Pink021 · Sep 8, 2022 · 7659a69 · 7659a69
1 parent e3efa16
commit 7659a69
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 48 deletions.
diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -86,11 +86,8 @@ class DataPipeReader {
     if (result == MOJO_RESULT_OK) {  // success
       remaining_size_ -= length;
       head_ += length;
-      if (remaining_size_ == 0) {
+      if (remaining_size_ == 0)
         OnSuccess();
-      } else {
-        handle_watcher_.ArmOrNotify();
-      }
     } else if (result == MOJO_RESULT_SHOULD_WAIT) {  // IO pending
       handle_watcher_.ArmOrNotify();
     } else {  // error

diff --git a/spec/api-session-spec.ts b/spec/api-session-spec.ts
@@ -529,50 +529,6 @@ describe('session module', () => {
     });
   });
 
-  describe('ses.getBlobData2()', () => {
-    const scheme = 'cors-blob';
-    const protocol = session.defaultSession.protocol;
-    const url = `${scheme}://host`;
-    after(async () => {
-      await protocol.unregisterProtocol(scheme);
-    });
-    afterEach(closeAllWindows);
-
-    it('returns blob data for uuid', (done) => {
-      const content = `<html>
-                       <script>
-                       let fd = new FormData();
-                       fd.append("data", new Blob(new Array(65_537).fill('a')));
-                       fetch('${url}', {method:'POST', body: fd });
-                       </script>
-                       </html>`;
-
-      protocol.registerStringProtocol(scheme, (request, callback) => {
-        try {
-          if (request.method === 'GET') {
-            callback({ data: content, mimeType: 'text/html' });
-          } else if (request.method === 'POST') {
-            const uuid = request.uploadData![1].blobUUID;
-            expect(uuid).to.be.a('string');
-            session.defaultSession.getBlobData(uuid!).then(result => {
-              try {
-                const data = new Array(65_537).fill('a');
-                expect(result.toString()).to.equal(data.join(''));
-                done();
-              } catch (e) {
-                done(e);
-              }
-            });
-          }
-        } catch (e) {
-          done(e);
-        }
-      });
-      const w = new BrowserWindow({ show: false });
-      w.loadURL(url);
-    });
-  });
-
   describe('ses.setCertificateVerifyProc(callback)', () => {
     let server: http.Server;