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

Side by Side Diff: Source/WebCore/dom/Document.cpp

Issue 13646006: Remove the ENABLE_IFRAME_SEAMLESS compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 5735 matching lines...) Expand 10 before | Expand all | Expand 10 after
5746 if (!shouldDisplaySeamlesslyWithParent()) 5746 if (!shouldDisplaySeamlesslyWithParent())
5747 return 0; 5747 return 0;
5748 5748
5749 HTMLFrameOwnerElement* ownerElement = this->ownerElement(); 5749 HTMLFrameOwnerElement* ownerElement = this->ownerElement();
5750 ASSERT(ownerElement->hasTagName(iframeTag)); 5750 ASSERT(ownerElement->hasTagName(iframeTag));
5751 return static_cast<HTMLIFrameElement*>(ownerElement); 5751 return static_cast<HTMLIFrameElement*>(ownerElement);
5752 } 5752 }
5753 5753
5754 bool Document::shouldDisplaySeamlesslyWithParent() const 5754 bool Document::shouldDisplaySeamlesslyWithParent() const
5755 { 5755 {
5756 #if ENABLE(IFRAME_SEAMLESS)
5757 if (!RuntimeEnabledFeatures::seamlessIFramesEnabled()) 5756 if (!RuntimeEnabledFeatures::seamlessIFramesEnabled())
5758 return false; 5757 return false;
5759 HTMLFrameOwnerElement* ownerElement = this->ownerElement(); 5758 HTMLFrameOwnerElement* ownerElement = this->ownerElement();
5760 if (!ownerElement) 5759 if (!ownerElement)
5761 return false; 5760 return false;
5762 return m_mayDisplaySeamlesslyWithParent && ownerElement->hasTagName(iframeTa g) && ownerElement->fastHasAttribute(seamlessAttr); 5761 return m_mayDisplaySeamlesslyWithParent && ownerElement->hasTagName(iframeTa g) && ownerElement->fastHasAttribute(seamlessAttr);
5763 #else
5764 return false;
5765 #endif
5766 } 5762 }
5767 5763
5768 DocumentLoader* Document::loader() const 5764 DocumentLoader* Document::loader() const
5769 { 5765 {
5770 if (!m_frame) 5766 if (!m_frame)
5771 return 0; 5767 return 0;
5772 5768
5773 DocumentLoader* loader = m_frame->loader()->documentLoader(); 5769 DocumentLoader* loader = m_frame->loader()->documentLoader();
5774 if (!loader) 5770 if (!loader)
5775 return 0; 5771 return 0;
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
6165 return; 6161 return;
6166 6162
6167 Vector<RefPtr<Element> > associatedFormControls; 6163 Vector<RefPtr<Element> > associatedFormControls;
6168 copyToVector(m_associatedFormControls, associatedFormControls); 6164 copyToVector(m_associatedFormControls, associatedFormControls);
6169 6165
6170 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls); 6166 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls);
6171 m_associatedFormControls.clear(); 6167 m_associatedFormControls.clear();
6172 } 6168 }
6173 6169
6174 } // namespace WebCore 6170 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698