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

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

Issue 1050243002: Revert Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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/core/dom/Document.h ('k') | Source/core/frame/Settings.in » ('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 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 e = Element::create(qName, this); 1074 e = Element::create(qName, this);
1075 1075
1076 if (e->prefix() != qName.prefix()) 1076 if (e->prefix() != qName.prefix())
1077 e->setTagNameForCreateElementNS(qName); 1077 e->setTagNameForCreateElementNS(qName);
1078 1078
1079 ASSERT(qName == e->tagQName()); 1079 ASSERT(qName == e->tagQName());
1080 1080
1081 return e.release(); 1081 return e.release();
1082 } 1082 }
1083 1083
1084 bool Document::regionBasedColumnsEnabled() const
1085 {
1086 return settings() && settings()->regionBasedColumnsEnabled();
1087 }
1088
1084 String Document::readyState() const 1089 String Document::readyState() const
1085 { 1090 {
1086 DEFINE_STATIC_LOCAL(const String, loading, ("loading")); 1091 DEFINE_STATIC_LOCAL(const String, loading, ("loading"));
1087 DEFINE_STATIC_LOCAL(const String, interactive, ("interactive")); 1092 DEFINE_STATIC_LOCAL(const String, interactive, ("interactive"));
1088 DEFINE_STATIC_LOCAL(const String, complete, ("complete")); 1093 DEFINE_STATIC_LOCAL(const String, complete, ("complete"));
1089 1094
1090 switch (m_readyState) { 1095 switch (m_readyState) {
1091 case Loading: 1096 case Loading:
1092 return loading; 1097 return loading;
1093 case Interactive: 1098 case Interactive:
(...skipping 4605 matching lines...) Expand 10 before | Expand all | Expand 10 after
5699 #ifndef NDEBUG 5704 #ifndef NDEBUG
5700 using namespace blink; 5705 using namespace blink;
5701 void showLiveDocumentInstances() 5706 void showLiveDocumentInstances()
5702 { 5707 {
5703 WeakDocumentSet& set = liveDocumentSet(); 5708 WeakDocumentSet& set = liveDocumentSet();
5704 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5709 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5705 for (Document* document : set) 5710 for (Document* document : set)
5706 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5711 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5707 } 5712 }
5708 #endif 5713 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/frame/Settings.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698