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

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

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "SecurityPolicy.h" 153 #include "SecurityPolicy.h"
154 #include "SegmentedString.h" 154 #include "SegmentedString.h"
155 #include "SelectorQuery.h" 155 #include "SelectorQuery.h"
156 #include "Settings.h" 156 #include "Settings.h"
157 #include "ShadowRoot.h" 157 #include "ShadowRoot.h"
158 #include "StaticHashSetNodeList.h" 158 #include "StaticHashSetNodeList.h"
159 #include "StylePropertySet.h" 159 #include "StylePropertySet.h"
160 #include "StyleResolver.h" 160 #include "StyleResolver.h"
161 #include "StyleSheetContents.h" 161 #include "StyleSheetContents.h"
162 #include "StyleSheetList.h" 162 #include "StyleSheetList.h"
163 #include "TextAutosizer.h"
163 #include "TextResourceDecoder.h" 164 #include "TextResourceDecoder.h"
164 #include "Timer.h" 165 #include "Timer.h"
165 #include "TransformSource.h" 166 #include "TransformSource.h"
166 #include "TreeWalker.h" 167 #include "TreeWalker.h"
167 #include "UserActionElementSet.h" 168 #include "UserActionElementSet.h"
168 #include "UserContentURLPattern.h" 169 #include "UserContentURLPattern.h"
169 #include "VisitedLinkState.h" 170 #include "VisitedLinkState.h"
170 #include "WebCoreMemoryInstrumentation.h" 171 #include "WebCoreMemoryInstrumentation.h"
171 #include "WebKitNamedFlow.h" 172 #include "WebKitNamedFlow.h"
172 #include "XMLDocumentParser.h" 173 #include "XMLDocumentParser.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 231
231 #if ENABLE(MICRODATA) 232 #if ENABLE(MICRODATA)
232 #include "MicroDataItemList.h" 233 #include "MicroDataItemList.h"
233 #include "NodeRareData.h" 234 #include "NodeRareData.h"
234 #endif 235 #endif
235 236
236 #if ENABLE(LINK_PRERENDER) 237 #if ENABLE(LINK_PRERENDER)
237 #include "Prerenderer.h" 238 #include "Prerenderer.h"
238 #endif 239 #endif
239 240
240 #if ENABLE(TEXT_AUTOSIZING)
241 #include "TextAutosizer.h"
242 #endif
243
244 #if ENABLE(CSP_NEXT) 241 #if ENABLE(CSP_NEXT)
245 #include "DOMSecurityPolicy.h" 242 #include "DOMSecurityPolicy.h"
246 #endif 243 #endif
247 244
248 #if PLATFORM(CHROMIUM) 245 #if PLATFORM(CHROMIUM)
249 #include "TraceEvent.h" 246 #include "TraceEvent.h"
250 #endif 247 #endif
251 248
252 #if ENABLE(VIDEO_TRACK) 249 #if ENABLE(VIDEO_TRACK)
253 #include "CaptionUserPreferences.h" 250 #include "CaptionUserPreferences.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 512
516 if (m_frame) 513 if (m_frame)
517 m_cachedResourceLoader = m_frame->loader()->activeDocumentLoader()->cach edResourceLoader(); 514 m_cachedResourceLoader = m_frame->loader()->activeDocumentLoader()->cach edResourceLoader();
518 if (!m_cachedResourceLoader) 515 if (!m_cachedResourceLoader)
519 m_cachedResourceLoader = CachedResourceLoader::create(0); 516 m_cachedResourceLoader = CachedResourceLoader::create(0);
520 m_cachedResourceLoader->setDocument(this); 517 m_cachedResourceLoader->setDocument(this);
521 518
522 #if ENABLE(LINK_PRERENDER) 519 #if ENABLE(LINK_PRERENDER)
523 m_prerenderer = Prerenderer::create(this); 520 m_prerenderer = Prerenderer::create(this);
524 #endif 521 #endif
525 #if ENABLE(TEXT_AUTOSIZING)
526 m_textAutosizer = TextAutosizer::create(this); 522 m_textAutosizer = TextAutosizer::create(this);
527 #endif
528 m_visuallyOrdered = false; 523 m_visuallyOrdered = false;
529 m_bParsing = false; 524 m_bParsing = false;
530 m_wellFormed = false; 525 m_wellFormed = false;
531 526
532 m_textColor = Color::black; 527 m_textColor = Color::black;
533 m_listenerTypes = 0; 528 m_listenerTypes = 0;
534 m_inStyleRecalc = false; 529 m_inStyleRecalc = false;
535 m_closeAfterStyleRecalc = false; 530 m_closeAfterStyleRecalc = false;
536 531
537 m_gotoAnchorNeededAfterStylesheetsLoad = false; 532 m_gotoAnchorNeededAfterStylesheetsLoad = false;
(...skipping 5551 matching lines...) Expand 10 before | Expand all | Expand 10 after
6089 info.addMember(m_viewportArguments, "viewportArguments"); 6084 info.addMember(m_viewportArguments, "viewportArguments");
6090 info.addMember(m_documentTiming, "documentTiming"); 6085 info.addMember(m_documentTiming, "documentTiming");
6091 info.addMember(m_mediaQueryMatcher, "mediaQueryMatcher"); 6086 info.addMember(m_mediaQueryMatcher, "mediaQueryMatcher");
6092 #if ENABLE(TOUCH_EVENTS) 6087 #if ENABLE(TOUCH_EVENTS)
6093 info.addMember(m_touchEventTargets, "touchEventTargets"); 6088 info.addMember(m_touchEventTargets, "touchEventTargets");
6094 #endif 6089 #endif
6095 #if ENABLE(REQUEST_ANIMATION_FRAME) 6090 #if ENABLE(REQUEST_ANIMATION_FRAME)
6096 info.addMember(m_scriptedAnimationController, "scriptedAnimationController") ; 6091 info.addMember(m_scriptedAnimationController, "scriptedAnimationController") ;
6097 #endif 6092 #endif
6098 info.addMember(m_pendingTasksTimer, "pendingTasksTimer"); 6093 info.addMember(m_pendingTasksTimer, "pendingTasksTimer");
6099 #if ENABLE(TEXT_AUTOSIZING)
6100 info.addMember(m_textAutosizer, "textAutosizer"); 6094 info.addMember(m_textAutosizer, "textAutosizer");
6101 #endif
6102 info.addMember(m_visualUpdatesSuppressionTimer, "visualUpdatesSuppressionTim er"); 6095 info.addMember(m_visualUpdatesSuppressionTimer, "visualUpdatesSuppressionTim er");
6103 info.addMember(m_namedFlows, "namedFlows"); 6096 info.addMember(m_namedFlows, "namedFlows");
6104 #if ENABLE(CSP_NEXT) 6097 #if ENABLE(CSP_NEXT)
6105 info.addMember(m_domSecurityPolicy, "domSecurityPolicy"); 6098 info.addMember(m_domSecurityPolicy, "domSecurityPolicy");
6106 #endif 6099 #endif
6107 info.addMember(m_sharedObjectPoolClearTimer, "sharedObjectPoolClearTimer"); 6100 info.addMember(m_sharedObjectPoolClearTimer, "sharedObjectPoolClearTimer");
6108 info.addMember(m_sharedObjectPool, "sharedObjectPool"); 6101 info.addMember(m_sharedObjectPool, "sharedObjectPool");
6109 info.addMember(m_localeCache, "localeCache"); 6102 info.addMember(m_localeCache, "localeCache");
6110 info.addMember(m_templateDocument, "templateDocument"); 6103 info.addMember(m_templateDocument, "templateDocument");
6111 info.addMember(m_templateDocumentHost, "templateDocumentHost"); 6104 info.addMember(m_templateDocumentHost, "templateDocumentHost");
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
6168 return; 6161 return;
6169 6162
6170 Vector<RefPtr<Element> > associatedFormControls; 6163 Vector<RefPtr<Element> > associatedFormControls;
6171 copyToVector(m_associatedFormControls, associatedFormControls); 6164 copyToVector(m_associatedFormControls, associatedFormControls);
6172 6165
6173 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls); 6166 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls);
6174 m_associatedFormControls.clear(); 6167 m_associatedFormControls.clear();
6175 } 6168 }
6176 6169
6177 } // namespace WebCore 6170 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698