third_party/WebKit/Source/core/loader/resource/ImageResource.h - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/WebKit/Source/core/loader/resource/ImageResource.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: More fixes - things build fine at this point. Created 3 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

« no previous file with comments | « third_party/WebKit/Source/core/loader/resource/FontResource.h ('k') | third_party/WebKit/Source/core/loader/resource/ScriptResource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)	2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)

3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>	3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>

4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)	4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)

5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.	5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights 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 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
166 // Show placeholder and reload.	166 // Show placeholder and reload.

167 ShowAndReloadPlaceholderAlways,	167 ShowAndReloadPlaceholderAlways,

168 };	168 };

169 PlaceholderOption m_placeholderOption;	169 PlaceholderOption m_placeholderOption;

170	170

171 Timer<ImageResource> m_flushTimer;	171 Timer<ImageResource> m_flushTimer;

172 double m_lastFlushTime = 0.;	172 double m_lastFlushTime = 0.;

173 };	173 };

174	174

175 DEFINE_RESOURCE_TYPE_CASTS(Image);	175 DEFINE_RESOURCE_TYPE_CASTS(Image);

	176 /* DO NOT SUBMIT - Conflict resolution helper:

	177 * Above we should have Image, not kImage */

176	178

177 } // namespace blink	179 } // namespace blink

178	180

179 #endif	181 #endif

OLD	NEW