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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

Issue 2680933005: Make static KURLs thread safe
Patch Set: :/ Created 3 years, 10 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
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 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 if (contentFrame()) 129 if (contentFrame())
130 document().frame()->loader().client()->didChangeFrameOwnerProperties(this); 130 document().frame()->loader().client()->didChangeFrameOwnerProperties(this);
131 } 131 }
132 132
133 void HTMLFrameElementBase::parseAttribute( 133 void HTMLFrameElementBase::parseAttribute(
134 const AttributeModificationParams& params) { 134 const AttributeModificationParams& params) {
135 const QualifiedName& name = params.name; 135 const QualifiedName& name = params.name;
136 const AtomicString& value = params.newValue; 136 const AtomicString& value = params.newValue;
137 if (name == srcdocAttr) { 137 if (name == srcdocAttr) {
138 if (!value.isNull()) { 138 if (!value.isNull()) {
139 setLocation(srcdocURL().getString()); 139 setLocation("about:srcdoc");
140 } else { 140 } else {
141 const AtomicString& srcValue = fastGetAttribute(srcAttr); 141 const AtomicString& srcValue = fastGetAttribute(srcAttr);
142 if (!srcValue.isNull()) 142 if (!srcValue.isNull())
143 setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue)); 143 setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue));
144 } 144 }
145 } else if (name == srcAttr && !fastHasAttribute(srcdocAttr)) { 145 } else if (name == srcAttr && !fastHasAttribute(srcdocAttr)) {
146 setLocation(stripLeadingAndTrailingHTMLSpaces(value)); 146 setLocation(stripLeadingAndTrailingHTMLSpaces(value));
147 } else if (name == idAttr) { 147 } else if (name == idAttr) {
148 // Important to call through to base for the id attribute so the hasID bit 148 // Important to call through to base for the id attribute so the hasID bit
149 // gets set. 149 // gets set.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 289
290 if (contentDocument()) { 290 if (contentDocument()) {
291 contentDocument()->willChangeFrameOwnerProperties( 291 contentDocument()->willChangeFrameOwnerProperties(
292 m_marginWidth, marginHeight, m_scrollingMode); 292 m_marginWidth, marginHeight, m_scrollingMode);
293 } 293 }
294 m_marginHeight = marginHeight; 294 m_marginHeight = marginHeight;
295 frameOwnerPropertiesChanged(); 295 frameOwnerPropertiesChanged();
296 } 296 }
297 297
298 } // namespace blink 298 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698