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

Side by Side Diff: Source/WebCore/html/HTMLObjectElement.cpp

Issue 10918284: Merge 128654 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/html/HTMLEmbedElement.cpp ('k') | Source/WebCore/html/HTMLVideoElement.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 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 { 98 {
99 if (attribute.name() == formAttr) 99 if (attribute.name() == formAttr)
100 formAttributeChanged(); 100 formAttributeChanged();
101 else if (attribute.name() == typeAttr) { 101 else if (attribute.name() == typeAttr) {
102 m_serviceType = attribute.value().lower(); 102 m_serviceType = attribute.value().lower();
103 size_t pos = m_serviceType.find(";"); 103 size_t pos = m_serviceType.find(";");
104 if (pos != notFound) 104 if (pos != notFound)
105 m_serviceType = m_serviceType.left(pos); 105 m_serviceType = m_serviceType.left(pos);
106 if (renderer()) 106 if (renderer())
107 setNeedsWidgetUpdate(true); 107 setNeedsWidgetUpdate(true);
108 if (!isImageType() && m_imageLoader)
109 m_imageLoader.clear();
110 } else if (attribute.name() == dataAttr) { 108 } else if (attribute.name() == dataAttr) {
111 m_url = stripLeadingAndTrailingHTMLSpaces(attribute.value()); 109 m_url = stripLeadingAndTrailingHTMLSpaces(attribute.value());
112 if (renderer()) { 110 if (renderer()) {
113 setNeedsWidgetUpdate(true); 111 setNeedsWidgetUpdate(true);
114 if (isImageType()) { 112 if (isImageType()) {
115 if (!m_imageLoader) 113 if (!m_imageLoader)
116 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 114 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
117 m_imageLoader->updateFromElementIgnoringPreviousError(); 115 m_imageLoader->updateFromElementIgnoringPreviousError();
118 } 116 }
119 } 117 }
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 return getURLAttribute(dataAttr); 511 return getURLAttribute(dataAttr);
514 } 512 }
515 513
516 void HTMLObjectElement::setItemValueText(const String& value, ExceptionCode&) 514 void HTMLObjectElement::setItemValueText(const String& value, ExceptionCode&)
517 { 515 {
518 setAttribute(dataAttr, value); 516 setAttribute(dataAttr, value);
519 } 517 }
520 #endif 518 #endif
521 519
522 } 520 }
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLEmbedElement.cpp ('k') | Source/WebCore/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698