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

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 268803005: Replace SVGDocument by XMLDocument (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mentioned issues Created 6 years, 7 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) 2006, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 14 matching lines...) Expand all
25 #include "bindings/v8/ExceptionState.h" 25 #include "bindings/v8/ExceptionState.h"
26 #include "core/accessibility/AXObjectCache.h" 26 #include "core/accessibility/AXObjectCache.h"
27 #include "core/dom/ExceptionCode.h" 27 #include "core/dom/ExceptionCode.h"
28 #include "core/frame/FrameView.h" 28 #include "core/frame/FrameView.h"
29 #include "core/frame/LocalFrame.h" 29 #include "core/frame/LocalFrame.h"
30 #include "core/loader/FrameLoader.h" 30 #include "core/loader/FrameLoader.h"
31 #include "core/loader/FrameLoaderClient.h" 31 #include "core/loader/FrameLoaderClient.h"
32 #include "core/rendering/RenderLayer.h" 32 #include "core/rendering/RenderLayer.h"
33 #include "core/rendering/RenderPart.h" 33 #include "core/rendering/RenderPart.h"
34 #include "core/rendering/compositing/RenderLayerCompositor.h" 34 #include "core/rendering/compositing/RenderLayerCompositor.h"
35 #include "core/svg/SVGDocument.h"
36 #include "platform/weborigin/SecurityOrigin.h" 35 #include "platform/weborigin/SecurityOrigin.h"
37 #include "platform/weborigin/SecurityPolicy.h" 36 #include "platform/weborigin/SecurityPolicy.h"
38 37
39 namespace WebCore { 38 namespace WebCore {
40 39
41 typedef HashMap<RefPtr<Widget>, FrameView*> WidgetToParentMap; 40 typedef HashMap<RefPtr<Widget>, FrameView*> WidgetToParentMap;
42 static WidgetToParentMap& widgetNewParentMap() 41 static WidgetToParentMap& widgetNewParentMap()
43 { 42 {
44 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, ()); 43 DEFINE_STATIC_LOCAL(WidgetToParentMap, map, ());
45 return map; 44 return map;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 void HTMLFrameOwnerElement::setSandboxFlags(SandboxFlags flags) 162 void HTMLFrameOwnerElement::setSandboxFlags(SandboxFlags flags)
164 { 163 {
165 m_sandboxFlags = flags; 164 m_sandboxFlags = flags;
166 } 165 }
167 166
168 bool HTMLFrameOwnerElement::isKeyboardFocusable() const 167 bool HTMLFrameOwnerElement::isKeyboardFocusable() const
169 { 168 {
170 return m_contentFrame && HTMLElement::isKeyboardFocusable(); 169 return m_contentFrame && HTMLElement::isKeyboardFocusable();
171 } 170 }
172 171
173 SVGDocument* HTMLFrameOwnerElement::getSVGDocument(ExceptionState& exceptionStat e) const 172 Document* HTMLFrameOwnerElement::getSVGDocument(ExceptionState& exceptionState) const
174 { 173 {
175 Document* doc = contentDocument(); 174 Document* doc = contentDocument();
176 if (doc && doc->isSVGDocument()) 175 if (doc && doc->isSVGDocument())
177 return toSVGDocument(doc); 176 return doc;
178 return 0; 177 return 0;
179 } 178 }
180 179
181 void HTMLFrameOwnerElement::setWidget(PassRefPtr<Widget> widget) 180 void HTMLFrameOwnerElement::setWidget(PassRefPtr<Widget> widget)
182 { 181 {
183 if (widget == m_widget) 182 if (widget == m_widget)
184 return; 183 return;
185 184
186 if (m_widget) { 185 if (m_widget) {
187 if (m_widget->parent()) 186 if (m_widget->parent())
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 // FIXME: In this case the LocalFrame will have finished loading before 260 // FIXME: In this case the LocalFrame will have finished loading before
262 // it's being added to the child list. It would be a good idea to 261 // it's being added to the child list. It would be a good idea to
263 // create the child first, then invoke the loader separately. 262 // create the child first, then invoke the loader separately.
264 if (childFrame->loader().state() == FrameStateComplete && !childFrame->loade r().policyDocumentLoader()) 263 if (childFrame->loader().state() == FrameStateComplete && !childFrame->loade r().policyDocumentLoader())
265 childFrame->loader().checkCompleted(); 264 childFrame->loader().checkCompleted();
266 return true; 265 return true;
267 } 266 }
268 267
269 268
270 } // namespace WebCore 269 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698