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

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: Rebaseline. 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
« no previous file with comments | « Source/WebCore/css/html.css ('k') | Source/WebCore/html/HTMLIFrameElement.idl » ('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) 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 5718 matching lines...) Expand 10 before | Expand all | Expand 10 after
5729 if (!shouldDisplaySeamlesslyWithParent()) 5729 if (!shouldDisplaySeamlesslyWithParent())
5730 return 0; 5730 return 0;
5731 5731
5732 HTMLFrameOwnerElement* ownerElement = this->ownerElement(); 5732 HTMLFrameOwnerElement* ownerElement = this->ownerElement();
5733 ASSERT(ownerElement->hasTagName(iframeTag)); 5733 ASSERT(ownerElement->hasTagName(iframeTag));
5734 return static_cast<HTMLIFrameElement*>(ownerElement); 5734 return static_cast<HTMLIFrameElement*>(ownerElement);
5735 } 5735 }
5736 5736
5737 bool Document::shouldDisplaySeamlesslyWithParent() const 5737 bool Document::shouldDisplaySeamlesslyWithParent() const
5738 { 5738 {
5739 #if ENABLE(IFRAME_SEAMLESS)
5740 if (!RuntimeEnabledFeatures::seamlessIFramesEnabled()) 5739 if (!RuntimeEnabledFeatures::seamlessIFramesEnabled())
5741 return false; 5740 return false;
5742 HTMLFrameOwnerElement* ownerElement = this->ownerElement(); 5741 HTMLFrameOwnerElement* ownerElement = this->ownerElement();
5743 if (!ownerElement) 5742 if (!ownerElement)
5744 return false; 5743 return false;
5745 return m_mayDisplaySeamlesslyWithParent && ownerElement->hasTagName(iframeTa g) && ownerElement->fastHasAttribute(seamlessAttr); 5744 return m_mayDisplaySeamlesslyWithParent && ownerElement->hasTagName(iframeTa g) && ownerElement->fastHasAttribute(seamlessAttr);
5746 #else
5747 return false;
5748 #endif
5749 } 5745 }
5750 5746
5751 DocumentLoader* Document::loader() const 5747 DocumentLoader* Document::loader() const
5752 { 5748 {
5753 if (!m_frame) 5749 if (!m_frame)
5754 return 0; 5750 return 0;
5755 5751
5756 DocumentLoader* loader = m_frame->loader()->documentLoader(); 5752 DocumentLoader* loader = m_frame->loader()->documentLoader();
5757 if (!loader) 5753 if (!loader)
5758 return 0; 5754 return 0;
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
6144 return; 6140 return;
6145 6141
6146 Vector<RefPtr<Element> > associatedFormControls; 6142 Vector<RefPtr<Element> > associatedFormControls;
6147 copyToVector(m_associatedFormControls, associatedFormControls); 6143 copyToVector(m_associatedFormControls, associatedFormControls);
6148 6144
6149 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls); 6145 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls);
6150 m_associatedFormControls.clear(); 6146 m_associatedFormControls.clear();
6151 } 6147 }
6152 6148
6153 } // namespace WebCore 6149 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/css/html.css ('k') | Source/WebCore/html/HTMLIFrameElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698