Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: Source/WebKit/chromium/src/WebFrameImpl.cpp

Issue 16848005: Remove support for multipart/x-mixed-replace (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 if (replace && !unreachableURL.isEmpty()) 981 if (replace && !unreachableURL.isEmpty())
982 request = frame()->loader()->originalRequest(); 982 request = frame()->loader()->originalRequest();
983 request.setURL(baseURL); 983 request.setURL(baseURL);
984 984
985 FrameLoadRequest frameRequest(frame(), request, SubstituteData(data, mimeTyp e, textEncoding, unreachableURL)); 985 FrameLoadRequest frameRequest(frame(), request, SubstituteData(data, mimeTyp e, textEncoding, unreachableURL));
986 ASSERT(frameRequest.substituteData().isValid()); 986 ASSERT(frameRequest.substituteData().isValid());
987 frame()->loader()->load(frameRequest); 987 frame()->loader()->load(frameRequest);
988 if (replace) { 988 if (replace) {
989 // Do this to force WebKit to treat the load as replacing the currently 989 // Do this to force WebKit to treat the load as replacing the currently
990 // loaded page. 990 // loaded page.
991 // FIXME: Can we use lock history instead?
darin (slow to review) 2013/06/12 22:55:06 nit: unrelated change?
abarth-chromium 2013/06/12 23:20:24 I can remove this part of the change if you like.
991 frame()->loader()->setReplacing(); 992 frame()->loader()->setReplacing();
992 } 993 }
993 } 994 }
994 995
995 void WebFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseURL, co nst WebURL& unreachableURL, bool replace) 996 void WebFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseURL, co nst WebURL& unreachableURL, bool replace)
996 { 997 {
997 ASSERT(frame()); 998 ASSERT(frame());
998 loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8" ), baseURL, unreachableURL, replace); 999 loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8" ), baseURL, unreachableURL, replace);
999 } 1000 }
1000 1001
(...skipping 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after
2504 2505
2505 // There is a possibility that the frame being detached was the only 2506 // There is a possibility that the frame being detached was the only
2506 // pending one. We need to make sure final replies can be sent. 2507 // pending one. We need to make sure final replies can be sent.
2507 flushCurrentScopingEffort(m_findRequestIdentifier); 2508 flushCurrentScopingEffort(m_findRequestIdentifier);
2508 2509
2509 cancelPendingScopingEffort(); 2510 cancelPendingScopingEffort();
2510 } 2511 }
2511 } 2512 }
2512 2513
2513 } // namespace WebKit 2514 } // namespace WebKit
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/multipart/win-boundary-crash-expected.txt ('k') | Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698