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

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
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/page/FrameView.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, 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 #include "SecurityPolicy.h" 155 #include "SecurityPolicy.h"
156 #include "SegmentedString.h" 156 #include "SegmentedString.h"
157 #include "SelectorQuery.h" 157 #include "SelectorQuery.h"
158 #include "Settings.h" 158 #include "Settings.h"
159 #include "ShadowRoot.h" 159 #include "ShadowRoot.h"
160 #include "StaticHashSetNodeList.h" 160 #include "StaticHashSetNodeList.h"
161 #include "StylePropertySet.h" 161 #include "StylePropertySet.h"
162 #include "StyleResolver.h" 162 #include "StyleResolver.h"
163 #include "StyleSheetContents.h" 163 #include "StyleSheetContents.h"
164 #include "StyleSheetList.h" 164 #include "StyleSheetList.h"
165 #include "TextAutosizer.h"
165 #include "TextResourceDecoder.h" 166 #include "TextResourceDecoder.h"
166 #include "Timer.h" 167 #include "Timer.h"
167 #include "TraceEvent.h" 168 #include "TraceEvent.h"
168 #include "TransformSource.h" 169 #include "TransformSource.h"
169 #include "TreeWalker.h" 170 #include "TreeWalker.h"
170 #include "UserActionElementSet.h" 171 #include "UserActionElementSet.h"
171 #include "UserContentURLPattern.h" 172 #include "UserContentURLPattern.h"
172 #include "VisitedLinkState.h" 173 #include "VisitedLinkState.h"
173 #include "WebCoreMemoryInstrumentation.h" 174 #include "WebCoreMemoryInstrumentation.h"
174 #include "WebKitNamedFlow.h" 175 #include "WebKitNamedFlow.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 230
230 #if ENABLE(MICRODATA) 231 #if ENABLE(MICRODATA)
231 #include "MicroDataItemList.h" 232 #include "MicroDataItemList.h"
232 #include "NodeRareData.h" 233 #include "NodeRareData.h"
233 #endif 234 #endif
234 235
235 #if ENABLE(LINK_PRERENDER) 236 #if ENABLE(LINK_PRERENDER)
236 #include "Prerenderer.h" 237 #include "Prerenderer.h"
237 #endif 238 #endif
238 239
239 #if ENABLE(TEXT_AUTOSIZING)
240 #include "TextAutosizer.h"
241 #endif
242
243 #if ENABLE(VIDEO_TRACK) 240 #if ENABLE(VIDEO_TRACK)
244 #include "CaptionUserPreferences.h" 241 #include "CaptionUserPreferences.h"
245 #endif 242 #endif
246 243
247 using namespace std; 244 using namespace std;
248 using namespace WTF; 245 using namespace WTF;
249 using namespace Unicode; 246 using namespace Unicode;
250 247
251 namespace WebCore { 248 namespace WebCore {
252 249
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 503
507 if (m_frame) 504 if (m_frame)
508 m_cachedResourceLoader = m_frame->loader()->activeDocumentLoader()->cach edResourceLoader(); 505 m_cachedResourceLoader = m_frame->loader()->activeDocumentLoader()->cach edResourceLoader();
509 if (!m_cachedResourceLoader) 506 if (!m_cachedResourceLoader)
510 m_cachedResourceLoader = CachedResourceLoader::create(0); 507 m_cachedResourceLoader = CachedResourceLoader::create(0);
511 m_cachedResourceLoader->setDocument(this); 508 m_cachedResourceLoader->setDocument(this);
512 509
513 #if ENABLE(LINK_PRERENDER) 510 #if ENABLE(LINK_PRERENDER)
514 m_prerenderer = Prerenderer::create(this); 511 m_prerenderer = Prerenderer::create(this);
515 #endif 512 #endif
516 #if ENABLE(TEXT_AUTOSIZING)
517 m_textAutosizer = TextAutosizer::create(this); 513 m_textAutosizer = TextAutosizer::create(this);
518 #endif
519 m_visuallyOrdered = false; 514 m_visuallyOrdered = false;
520 m_bParsing = false; 515 m_bParsing = false;
521 m_wellFormed = false; 516 m_wellFormed = false;
522 517
523 m_textColor = Color::black; 518 m_textColor = Color::black;
524 m_listenerTypes = 0; 519 m_listenerTypes = 0;
525 m_inStyleRecalc = false; 520 m_inStyleRecalc = false;
526 m_closeAfterStyleRecalc = false; 521 m_closeAfterStyleRecalc = false;
527 522
528 m_gotoAnchorNeededAfterStylesheetsLoad = false; 523 m_gotoAnchorNeededAfterStylesheetsLoad = false;
(...skipping 5508 matching lines...) Expand 10 before | Expand all | Expand 10 after
6037 info.addMember(m_viewportArguments, "viewportArguments"); 6032 info.addMember(m_viewportArguments, "viewportArguments");
6038 info.addMember(m_documentTiming, "documentTiming"); 6033 info.addMember(m_documentTiming, "documentTiming");
6039 info.addMember(m_mediaQueryMatcher, "mediaQueryMatcher"); 6034 info.addMember(m_mediaQueryMatcher, "mediaQueryMatcher");
6040 #if ENABLE(TOUCH_EVENTS) 6035 #if ENABLE(TOUCH_EVENTS)
6041 info.addMember(m_touchEventTargets, "touchEventTargets"); 6036 info.addMember(m_touchEventTargets, "touchEventTargets");
6042 #endif 6037 #endif
6043 #if ENABLE(REQUEST_ANIMATION_FRAME) 6038 #if ENABLE(REQUEST_ANIMATION_FRAME)
6044 info.addMember(m_scriptedAnimationController, "scriptedAnimationController") ; 6039 info.addMember(m_scriptedAnimationController, "scriptedAnimationController") ;
6045 #endif 6040 #endif
6046 info.addMember(m_pendingTasksTimer, "pendingTasksTimer"); 6041 info.addMember(m_pendingTasksTimer, "pendingTasksTimer");
6047 #if ENABLE(TEXT_AUTOSIZING)
6048 info.addMember(m_textAutosizer, "textAutosizer"); 6042 info.addMember(m_textAutosizer, "textAutosizer");
6049 #endif
6050 info.addMember(m_visualUpdatesSuppressionTimer, "visualUpdatesSuppressionTim er"); 6043 info.addMember(m_visualUpdatesSuppressionTimer, "visualUpdatesSuppressionTim er");
6051 info.addMember(m_namedFlows, "namedFlows"); 6044 info.addMember(m_namedFlows, "namedFlows");
6052 info.addMember(m_domSecurityPolicy, "domSecurityPolicy"); 6045 info.addMember(m_domSecurityPolicy, "domSecurityPolicy");
6053 info.addMember(m_sharedObjectPoolClearTimer, "sharedObjectPoolClearTimer"); 6046 info.addMember(m_sharedObjectPoolClearTimer, "sharedObjectPoolClearTimer");
6054 info.addMember(m_sharedObjectPool, "sharedObjectPool"); 6047 info.addMember(m_sharedObjectPool, "sharedObjectPool");
6055 info.addMember(m_localeCache, "localeCache"); 6048 info.addMember(m_localeCache, "localeCache");
6056 info.addMember(m_templateDocument, "templateDocument"); 6049 info.addMember(m_templateDocument, "templateDocument");
6057 info.addMember(m_templateDocumentHost, "templateDocumentHost"); 6050 info.addMember(m_templateDocumentHost, "templateDocumentHost");
6058 info.addMember(m_activeElement, "activeElement"); 6051 info.addMember(m_activeElement, "activeElement");
6059 } 6052 }
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
6114 return; 6107 return;
6115 6108
6116 Vector<RefPtr<Element> > associatedFormControls; 6109 Vector<RefPtr<Element> > associatedFormControls;
6117 copyToVector(m_associatedFormControls, associatedFormControls); 6110 copyToVector(m_associatedFormControls, associatedFormControls);
6118 6111
6119 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls); 6112 frame()->page()->chrome()->client()->didAssociateFormControls(associatedForm Controls);
6120 m_associatedFormControls.clear(); 6113 m_associatedFormControls.clear();
6121 } 6114 }
6122 6115
6123 } // namespace WebCore 6116 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698