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

Side by Side Diff: Source/core/html/PluginDocument.cpp

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 years, 8 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
« no previous file with comments | « Source/core/html/NumberInputType.cpp ('k') | Source/core/html/PublicURLManager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 19 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
20 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "PluginDocument.h" 26 #include "PluginDocument.h"
27 27
28 #include "ExceptionCodePlaceholder.h"
29 #include "HTMLEmbedElement.h" 28 #include "HTMLEmbedElement.h"
30 #include "HTMLHtmlElement.h" 29 #include "HTMLHtmlElement.h"
31 #include "HTMLNames.h" 30 #include "HTMLNames.h"
32 #include "NodeList.h" 31 #include "core/dom/ExceptionCodePlaceholder.h"
33 #include "RawDataDocumentParser.h" 32 #include "core/dom/NodeList.h"
33 #include "core/dom/RawDataDocumentParser.h"
34 #include "core/loader/DocumentLoader.h" 34 #include "core/loader/DocumentLoader.h"
35 #include "core/loader/FrameLoader.h" 35 #include "core/loader/FrameLoader.h"
36 #include "core/loader/FrameLoaderClient.h" 36 #include "core/loader/FrameLoaderClient.h"
37 #include "core/page/Frame.h" 37 #include "core/page/Frame.h"
38 #include "core/page/FrameView.h" 38 #include "core/page/FrameView.h"
39 #include "core/page/Page.h" 39 #include "core/page/Page.h"
40 #include "core/page/Settings.h" 40 #include "core/page/Settings.h"
41 #include "core/rendering/RenderEmbeddedObject.h" 41 #include "core/rendering/RenderEmbeddedObject.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // with how many times we call beforeload on object elements. <rdar://proble m/8441094>. 177 // with how many times we call beforeload on object elements. <rdar://proble m/8441094>.
178 if (!shouldLoadPluginManually()) 178 if (!shouldLoadPluginManually())
179 return; 179 return;
180 180
181 DocumentLoader* documentLoader = frame()->loader()->activeDocumentLoader(); 181 DocumentLoader* documentLoader = frame()->loader()->activeDocumentLoader();
182 documentLoader->cancelMainResourceLoad(frame()->loader()->cancelledError(doc umentLoader->request())); 182 documentLoader->cancelMainResourceLoad(frame()->loader()->cancelledError(doc umentLoader->request()));
183 setShouldLoadPluginManually(false); 183 setShouldLoadPluginManually(false);
184 } 184 }
185 185
186 } 186 }
OLDNEW
« no previous file with comments | « Source/core/html/NumberInputType.cpp ('k') | Source/core/html/PublicURLManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698