| OLD | NEW |
| 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 | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights |
| 5 * reserved. | 5 * reserved. |
| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "platform/weborigin/SecurityOrigin.h" | 50 #include "platform/weborigin/SecurityOrigin.h" |
| 51 #include "platform/weborigin/SecurityPolicy.h" | 51 #include "platform/weborigin/SecurityPolicy.h" |
| 52 #include "public/platform/WebCachePolicy.h" | 52 #include "public/platform/WebCachePolicy.h" |
| 53 #include "public/platform/WebURLRequest.h" | 53 #include "public/platform/WebURLRequest.h" |
| 54 #include "wtf/PtrUtil.h" | 54 #include "wtf/PtrUtil.h" |
| 55 #include <memory> | 55 #include <memory> |
| 56 | 56 |
| 57 namespace blink { | 57 namespace blink { |
| 58 | 58 |
| 59 static ImageEventSender& loadEventSender() { | 59 static ImageEventSender& loadEventSender() { |
| 60 ALLOW_UNSAFE_SINGLETON() |
| 60 DEFINE_STATIC_LOCAL(ImageEventSender, sender, | 61 DEFINE_STATIC_LOCAL(ImageEventSender, sender, |
| 61 (ImageEventSender::create(EventTypeNames::load))); | 62 (ImageEventSender::create(EventTypeNames::load))); |
| 62 return sender; | 63 return sender; |
| 63 } | 64 } |
| 64 | 65 |
| 65 static ImageEventSender& errorEventSender() { | 66 static ImageEventSender& errorEventSender() { |
| 67 ALLOW_UNSAFE_SINGLETON() |
| 66 DEFINE_STATIC_LOCAL(ImageEventSender, sender, | 68 DEFINE_STATIC_LOCAL(ImageEventSender, sender, |
| 67 (ImageEventSender::create(EventTypeNames::error))); | 69 (ImageEventSender::create(EventTypeNames::error))); |
| 68 return sender; | 70 return sender; |
| 69 } | 71 } |
| 70 | 72 |
| 71 static inline bool pageIsBeingDismissed(Document* document) { | 73 static inline bool pageIsBeingDismissed(Document* document) { |
| 72 return document->pageDismissalEventBeingDispatched() != Document::NoDismissal; | 74 return document->pageDismissalEventBeingDispatched() != Document::NoDismissal; |
| 73 } | 75 } |
| 74 | 76 |
| 75 static ImageLoader::BypassMainWorldBehavior shouldBypassMainWorldCSP( | 77 static ImageLoader::BypassMainWorldBehavior shouldBypassMainWorldCSP( |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 } | 636 } |
| 635 | 637 |
| 636 void ImageLoader::elementDidMoveToNewDocument() { | 638 void ImageLoader::elementDidMoveToNewDocument() { |
| 637 if (m_loadDelayCounter) | 639 if (m_loadDelayCounter) |
| 638 m_loadDelayCounter->documentChanged(m_element->document()); | 640 m_loadDelayCounter->documentChanged(m_element->document()); |
| 639 clearFailedLoadURL(); | 641 clearFailedLoadURL(); |
| 640 setImage(0); | 642 setImage(0); |
| 641 } | 643 } |
| 642 | 644 |
| 643 } // namespace blink | 645 } // namespace blink |
| OLD | NEW |