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

Side by Side Diff: Source/core/loader/ImageLoader.cpp

Issue 1111173002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporating Review Comments Created 5 years, 7 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
« no previous file with comments | « Source/core/loader/FrameLoaderClient.h ('k') | Source/core/loader/LinkLoader.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 static ImageLoader::BypassMainWorldBehavior shouldBypassMainWorldCSP(ImageLoader * loader) 64 static ImageLoader::BypassMainWorldBehavior shouldBypassMainWorldCSP(ImageLoader * loader)
65 { 65 {
66 ASSERT(loader); 66 ASSERT(loader);
67 ASSERT(loader->element()); 67 ASSERT(loader->element());
68 if (loader->element()->document().frame() && loader->element()->document().f rame()->script().shouldBypassMainWorldCSP()) 68 if (loader->element()->document().frame() && loader->element()->document().f rame()->script().shouldBypassMainWorldCSP())
69 return ImageLoader::BypassMainWorldCSP; 69 return ImageLoader::BypassMainWorldCSP;
70 return ImageLoader::DoNotBypassMainWorldCSP; 70 return ImageLoader::DoNotBypassMainWorldCSP;
71 } 71 }
72 72
73 class ImageLoader::Task : public blink::WebThread::Task { 73 class ImageLoader::Task : public WebThread::Task {
74 public: 74 public:
75 static PassOwnPtr<Task> create(ImageLoader* loader, UpdateFromElementBehavio r updateBehavior) 75 static PassOwnPtr<Task> create(ImageLoader* loader, UpdateFromElementBehavio r updateBehavior)
76 { 76 {
77 return adoptPtr(new Task(loader, updateBehavior)); 77 return adoptPtr(new Task(loader, updateBehavior));
78 } 78 }
79 79
80 Task(ImageLoader* loader, UpdateFromElementBehavior updateBehavior) 80 Task(ImageLoader* loader, UpdateFromElementBehavior updateBehavior)
81 : m_loader(loader) 81 : m_loader(loader)
82 , m_shouldBypassMainWorldCSP(shouldBypassMainWorldCSP(loader)) 82 , m_shouldBypassMainWorldCSP(shouldBypassMainWorldCSP(loader))
83 , m_updateBehavior(updateBehavior) 83 , m_updateBehavior(updateBehavior)
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 #endif 612 #endif
613 } 613 }
614 614
615 #if ENABLE(OILPAN) 615 #if ENABLE(OILPAN)
616 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 616 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
617 { 617 {
618 m_loader.willRemoveClient(m_client); 618 m_loader.willRemoveClient(m_client);
619 } 619 }
620 #endif 620 #endif
621 } 621 }
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoaderClient.h ('k') | Source/core/loader/LinkLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698