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

Side by Side Diff: Source/WebCore/loader/ImageLoader.h

Issue 11342010: Merge 131670 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 1 month 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
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, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2009 Apple Inc. All rights reserved.
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 static void dispatchPendingErrorEvents(); 75 static void dispatchPendingErrorEvents();
76 76
77 protected: 77 protected:
78 virtual void notifyFinished(CachedResource*); 78 virtual void notifyFinished(CachedResource*);
79 79
80 private: 80 private:
81 Document* document(); 81 Document* document();
82 virtual void dispatchLoadEvent() = 0; 82 virtual void dispatchLoadEvent() = 0;
83 virtual String sourceURI(const AtomicString&) const = 0; 83 virtual String sourceURI(const AtomicString&) const = 0;
84 84
85 void updatedHasPendingLoadEvent(); 85 void updatedHasPendingEvent();
86 86
87 void dispatchPendingBeforeLoadEvent(); 87 void dispatchPendingBeforeLoadEvent();
88 void dispatchPendingLoadEvent(); 88 void dispatchPendingLoadEvent();
89 void dispatchPendingErrorEvent(); 89 void dispatchPendingErrorEvent();
90 90
91 RenderImageResource* renderImageResource(); 91 RenderImageResource* renderImageResource();
92 void updateRenderer(); 92 void updateRenderer();
93 93
94 void setImageWithoutConsideringPendingLoadEvent(CachedImage*); 94 void setImageWithoutConsideringPendingLoadEvent(CachedImage*);
95 95
96 ImageLoaderClient* m_client; 96 ImageLoaderClient* m_client;
97 CachedResourceHandle<CachedImage> m_image; 97 CachedResourceHandle<CachedImage> m_image;
98 AtomicString m_failedLoadURL; 98 AtomicString m_failedLoadURL;
99 bool m_hasPendingBeforeLoadEvent : 1; 99 bool m_hasPendingBeforeLoadEvent : 1;
100 bool m_hasPendingLoadEvent : 1; 100 bool m_hasPendingLoadEvent : 1;
101 bool m_hasPendingErrorEvent : 1; 101 bool m_hasPendingErrorEvent : 1;
102 bool m_imageComplete : 1; 102 bool m_imageComplete : 1;
103 bool m_loadManually : 1; 103 bool m_loadManually : 1;
104 bool m_elementIsProtected : 1; 104 bool m_elementIsProtected : 1;
105 }; 105 };
106 106
107 } 107 }
108 108
109 #endif 109 #endif
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt ('k') | Source/WebCore/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698