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

Side by Side Diff: Source/core/page/PageSerializer.cpp

Issue 557613002: Remove a part of type checking predicates of HTMLInputElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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/page/EventHandler.cpp ('k') | Source/core/rendering/RenderFileUploadControl.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/page/PageSerializer.h" 32 #include "core/page/PageSerializer.h"
33 33
34 #include "core/HTMLNames.h" 34 #include "core/HTMLNames.h"
35 #include "core/InputTypeNames.h"
35 #include "core/css/CSSFontFaceRule.h" 36 #include "core/css/CSSFontFaceRule.h"
36 #include "core/css/CSSFontFaceSrcValue.h" 37 #include "core/css/CSSFontFaceSrcValue.h"
37 #include "core/css/CSSImageValue.h" 38 #include "core/css/CSSImageValue.h"
38 #include "core/css/CSSImportRule.h" 39 #include "core/css/CSSImportRule.h"
39 #include "core/css/CSSStyleDeclaration.h" 40 #include "core/css/CSSStyleDeclaration.h"
40 #include "core/css/CSSStyleRule.h" 41 #include "core/css/CSSStyleRule.h"
41 #include "core/css/CSSValueList.h" 42 #include "core/css/CSSValueList.h"
42 #include "core/css/StylePropertySet.h" 43 #include "core/css/StylePropertySet.h"
43 #include "core/css/StyleRule.h" 44 #include "core/css/StyleRule.h"
44 #include "core/css/StyleSheetContents.h" 45 #include "core/css/StyleSheetContents.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 if (element.isStyledElement()) 225 if (element.isStyledElement())
225 retrieveResourcesForProperties(element.inlineStyle(), document); 226 retrieveResourcesForProperties(element.inlineStyle(), document);
226 227
227 if (isHTMLImageElement(element)) { 228 if (isHTMLImageElement(element)) {
228 HTMLImageElement& imageElement = toHTMLImageElement(element); 229 HTMLImageElement& imageElement = toHTMLImageElement(element);
229 KURL url = document.completeURL(imageElement.getAttribute(HTMLNames: :srcAttr)); 230 KURL url = document.completeURL(imageElement.getAttribute(HTMLNames: :srcAttr));
230 ImageResource* cachedImage = imageElement.cachedImage(); 231 ImageResource* cachedImage = imageElement.cachedImage();
231 addImageToResources(cachedImage, imageElement.renderer(), url); 232 addImageToResources(cachedImage, imageElement.renderer(), url);
232 } else if (isHTMLInputElement(element)) { 233 } else if (isHTMLInputElement(element)) {
233 HTMLInputElement& inputElement = toHTMLInputElement(element); 234 HTMLInputElement& inputElement = toHTMLInputElement(element);
234 if (inputElement.isImageButton() && inputElement.hasImageLoader()) { 235 if (inputElement.type() == InputTypeNames::image && inputElement.has ImageLoader()) {
235 KURL url = inputElement.src(); 236 KURL url = inputElement.src();
236 ImageResource* cachedImage = inputElement.imageLoader()->image() ; 237 ImageResource* cachedImage = inputElement.imageLoader()->image() ;
237 addImageToResources(cachedImage, inputElement.renderer(), url); 238 addImageToResources(cachedImage, inputElement.renderer(), url);
238 } 239 }
239 } else if (isHTMLLinkElement(element)) { 240 } else if (isHTMLLinkElement(element)) {
240 HTMLLinkElement& linkElement = toHTMLLinkElement(element); 241 HTMLLinkElement& linkElement = toHTMLLinkElement(element);
241 if (CSSStyleSheet* sheet = linkElement.sheet()) { 242 if (CSSStyleSheet* sheet = linkElement.sheet()) {
242 KURL url = document.completeURL(linkElement.getAttribute(HTMLNam es::hrefAttr)); 243 KURL url = document.completeURL(linkElement.getAttribute(HTMLNam es::hrefAttr));
243 serializeCSSStyleSheet(*sheet, url); 244 serializeCSSStyleSheet(*sheet, url);
244 ASSERT(m_resourceURLs.contains(url)); 245 ASSERT(m_resourceURLs.contains(url));
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 if (iter != m_blankFrameURLs.end()) 383 if (iter != m_blankFrameURLs.end())
383 return iter->value; 384 return iter->value;
384 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); 385 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
385 KURL fakeURL(ParsedURLString, url); 386 KURL fakeURL(ParsedURLString, url);
386 m_blankFrameURLs.add(frame, fakeURL); 387 m_blankFrameURLs.add(frame, fakeURL);
387 388
388 return fakeURL; 389 return fakeURL;
389 } 390 }
390 391
391 } 392 }
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/rendering/RenderFileUploadControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698