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

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

Issue 11638044: Revert 138207 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 8 years 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) 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 5641 matching lines...) Expand 10 before | Expand all | Expand 10 after
5652 #else 5652 #else
5653 UNUSED_PARAM(handler); 5653 UNUSED_PARAM(handler);
5654 #endif 5654 #endif
5655 } 5655 }
5656 5656
5657 #if ENABLE(TOUCH_EVENTS) 5657 #if ENABLE(TOUCH_EVENTS)
5658 void Document::didRemoveEventTargetNode(Node* handler) 5658 void Document::didRemoveEventTargetNode(Node* handler)
5659 { 5659 {
5660 if (m_touchEventTargets.get()) 5660 if (m_touchEventTargets.get())
5661 m_touchEventTargets->removeAll(handler); 5661 m_touchEventTargets->removeAll(handler);
5662 if (handler == this)
5663 if (Document* parentDocument = this->parentDocument())
5664 parentDocument->didRemoveEventTargetNode(this);
5662 } 5665 }
5663 #endif 5666 #endif
5664 5667
5665 HTMLIFrameElement* Document::seamlessParentIFrame() const 5668 HTMLIFrameElement* Document::seamlessParentIFrame() const
5666 { 5669 {
5667 if (!shouldDisplaySeamlesslyWithParent()) 5670 if (!shouldDisplaySeamlesslyWithParent())
5668 return 0; 5671 return 0;
5669 5672
5670 HTMLFrameOwnerElement* ownerElement = this->ownerElement(); 5673 HTMLFrameOwnerElement* ownerElement = this->ownerElement();
5671 ASSERT(ownerElement->hasTagName(iframeTag)); 5674 ASSERT(ownerElement->hasTagName(iframeTag));
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
5971 m_templateContentsOwnerDocument = HTMLDocument::create(0, blankURL() ); 5974 m_templateContentsOwnerDocument = HTMLDocument::create(0, blankURL() );
5972 else 5975 else
5973 m_templateContentsOwnerDocument = Document::create(0, blankURL()); 5976 m_templateContentsOwnerDocument = Document::create(0, blankURL());
5974 } 5977 }
5975 5978
5976 return m_templateContentsOwnerDocument.get(); 5979 return m_templateContentsOwnerDocument.get();
5977 } 5980 }
5978 #endif 5981 #endif
5979 5982
5980 } // namespace WebCore 5983 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/events/touch/touch-handler-count-expected.txt ('k') | Source/WebCore/page/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698