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

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

Issue 9963061: Merge 112184 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/bindings/v8/V8Utilities.cpp ('k') | Source/WebCore/dom/Document.cpp » ('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, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 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) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 const KURL& baseURLOverride() const { return m_baseURLOverride; } 605 const KURL& baseURLOverride() const { return m_baseURLOverride; }
606 const String& baseTarget() const { return m_baseTarget; } 606 const String& baseTarget() const { return m_baseTarget; }
607 void processBaseElement(); 607 void processBaseElement();
608 608
609 KURL completeURL(const String&) const; 609 KURL completeURL(const String&) const;
610 610
611 virtual String userAgent(const KURL&) const; 611 virtual String userAgent(const KURL&) const;
612 612
613 virtual void disableEval(); 613 virtual void disableEval();
614 614
615 bool canNavigate(Frame* targetFrame);
616
615 CSSStyleSheet* pageUserSheet(); 617 CSSStyleSheet* pageUserSheet();
616 void clearPageUserSheet(); 618 void clearPageUserSheet();
617 void updatePageUserSheet(); 619 void updatePageUserSheet();
618 620
619 const Vector<RefPtr<CSSStyleSheet> >* pageGroupUserSheets() const; 621 const Vector<RefPtr<CSSStyleSheet> >* pageGroupUserSheets() const;
620 void clearPageGroupUserSheets(); 622 void clearPageGroupUserSheets();
621 void updatePageGroupUserSheets(); 623 void updatePageGroupUserSheets();
622 624
623 void addUserSheet(PassRefPtr<CSSStyleSheet> userSheet); 625 void addUserSheet(PassRefPtr<CSSStyleSheet> userSheet);
624 626
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 if (document) 1475 if (document)
1474 document->guardRef(); 1476 document->guardRef();
1475 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS) 1477 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
1476 trackForDebugging(); 1478 trackForDebugging();
1477 #endif 1479 #endif
1478 } 1480 }
1479 1481
1480 } // namespace WebCore 1482 } // namespace WebCore
1481 1483
1482 #endif // Document_h 1484 #endif // Document_h
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/v8/V8Utilities.cpp ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698