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

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

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload Created 7 years, 2 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/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLSourceElement.cpp » ('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) 2008, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 13 matching lines...) Expand all
24 #include "core/dom/PostAttachCallbacks.h" 24 #include "core/dom/PostAttachCallbacks.h"
25 #include "core/dom/UserGestureIndicator.h" 25 #include "core/dom/UserGestureIndicator.h"
26 #include "core/html/HTMLImageLoader.h" 26 #include "core/html/HTMLImageLoader.h"
27 #include "core/html/PluginDocument.h" 27 #include "core/html/PluginDocument.h"
28 #include "core/loader/FrameLoader.h" 28 #include "core/loader/FrameLoader.h"
29 #include "core/loader/FrameLoaderClient.h" 29 #include "core/loader/FrameLoaderClient.h"
30 #include "core/page/ContentSecurityPolicy.h" 30 #include "core/page/ContentSecurityPolicy.h"
31 #include "core/page/Frame.h" 31 #include "core/page/Frame.h"
32 #include "core/page/Page.h" 32 #include "core/page/Page.h"
33 #include "core/page/Settings.h" 33 #include "core/page/Settings.h"
34 #include "core/platform/Logging.h" 34 #include "platform/Logging.h"
35 #include "core/platform/MIMETypeFromURL.h" 35 #include "core/platform/MIMETypeFromURL.h"
36 #include "core/platform/MIMETypeRegistry.h" 36 #include "core/platform/MIMETypeRegistry.h"
37 #include "core/platform/graphics/Image.h" 37 #include "core/platform/graphics/Image.h"
38 #include "core/plugins/PluginData.h" 38 #include "core/plugins/PluginData.h"
39 #include "core/rendering/RenderEmbeddedObject.h" 39 #include "core/rendering/RenderEmbeddedObject.h"
40 #include "core/rendering/RenderImage.h" 40 #include "core/rendering/RenderImage.h"
41 #include "weborigin/SecurityOrigin.h" 41 #include "weborigin/SecurityOrigin.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 321 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
322 return false; 322 return false;
323 } 323 }
324 324
325 if (frame->loader() && !frame->loader()->mixedContentChecker()->canRunInsecu reContent(document().securityOrigin(), url)) 325 if (frame->loader() && !frame->loader()->mixedContentChecker()->canRunInsecu reContent(document().securityOrigin(), url))
326 return false; 326 return false;
327 return true; 327 return true;
328 } 328 }
329 329
330 } // namespace WebCore 330 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLSourceElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698