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

Side by Side Diff: Source/core/xml/XSLTProcessorLibxslt.cpp

Issue 24009002: Move synchronously fetching to ResourceFetcher, as well as most of the logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 * This file is part of the XSL implementation. 2 * This file is part of the XSL implementation.
3 * 3 *
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple, Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple, Inc. All rights reserved.
5 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@webkit.org>
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 xmlChar* base = xmlNodeGetBase(context->document->doc, context->node); 97 xmlChar* base = xmlNodeGetBase(context->document->doc, context->node);
98 KURL url(KURL(ParsedURLString, reinterpret_cast<const char*>(base)), rei nterpret_cast<const char*>(uri)); 98 KURL url(KURL(ParsedURLString, reinterpret_cast<const char*>(base)), rei nterpret_cast<const char*>(uri));
99 xmlFree(base); 99 xmlFree(base);
100 ResourceError error; 100 ResourceError error;
101 ResourceResponse response; 101 ResourceResponse response;
102 102
103 Vector<char> data; 103 Vector<char> data;
104 104
105 bool requestAllowed = globalResourceFetcher->frame() && globalResourceFe tcher->document()->securityOrigin()->canRequest(url); 105 bool requestAllowed = globalResourceFetcher->frame() && globalResourceFe tcher->document()->securityOrigin()->canRequest(url);
106 if (requestAllowed) { 106 if (requestAllowed) {
107 globalResourceFetcher->frame()->loader()->loadResourceSynchronously( url, AllowStoredCredentials, error, response, data); 107 globalResourceFetcher->fetchSynchronously(url, AllowStoredCredential s, error, response, data);
108 requestAllowed = globalResourceFetcher->document()->securityOrigin() ->canRequest(response.url()); 108 requestAllowed = globalResourceFetcher->document()->securityOrigin() ->canRequest(response.url());
109 } 109 }
110 if (!requestAllowed) { 110 if (!requestAllowed) {
111 data.clear(); 111 data.clear();
112 globalResourceFetcher->printAccessDeniedMessage(url); 112 globalResourceFetcher->printAccessDeniedMessage(url);
113 } 113 }
114 114
115 PageConsole* console = 0; 115 PageConsole* console = 0;
116 Frame* frame = globalProcessor->xslStylesheet()->ownerDocument()->frame( ); 116 Frame* frame = globalProcessor->xslStylesheet()->ownerDocument()->frame( );
117 if (frame && frame->page()) 117 if (frame && frame->page())
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 341
342 sheet->method = origMethod; 342 sheet->method = origMethod;
343 setXSLTLoadCallBack(0, 0, 0); 343 setXSLTLoadCallBack(0, 0, 0);
344 xsltFreeStylesheet(sheet); 344 xsltFreeStylesheet(sheet);
345 m_stylesheet = 0; 345 m_stylesheet = 0;
346 346
347 return success; 347 return success;
348 } 348 }
349 349
350 } // namespace WebCore 350 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698