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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 201403002: Use new is*Element() helper functions more in core/ code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/fetch/FontResource.cpp ('k') | Source/core/frame/SmartClip.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 void FrameView::init() 270 void FrameView::init()
271 { 271 {
272 reset(); 272 reset();
273 273
274 m_size = LayoutSize(); 274 m_size = LayoutSize();
275 275
276 // Propagate the marginwidth/height and scrolling modes to the view. 276 // Propagate the marginwidth/height and scrolling modes to the view.
277 Element* ownerElement = m_frame->ownerElement(); 277 Element* ownerElement = m_frame->ownerElement();
278 if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->has TagName(iframeTag))) { 278 if (ownerElement && (isHTMLFrameElement(*ownerElement) || isHTMLIFrameElemen t(*ownerElement))) {
279 HTMLFrameElementBase* frameElt = toHTMLFrameElementBase(ownerElement); 279 HTMLFrameElementBase* frameElt = toHTMLFrameElementBase(ownerElement);
280 if (frameElt->scrollingMode() == ScrollbarAlwaysOff) 280 if (frameElt->scrollingMode() == ScrollbarAlwaysOff)
281 setCanHaveScrollbars(false); 281 setCanHaveScrollbars(false);
282 } 282 }
283 } 283 }
284 284
285 void FrameView::prepareForDetach() 285 void FrameView::prepareForDetach()
286 { 286 {
287 RELEASE_ASSERT(!isInPerformLayout()); 287 RELEASE_ASSERT(!isInPerformLayout());
288 288
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 hMode = ScrollbarAuto; 587 hMode = ScrollbarAuto;
588 vMode = ScrollbarAuto; 588 vMode = ScrollbarAuto;
589 } else { 589 } else {
590 hMode = ScrollbarAlwaysOff; 590 hMode = ScrollbarAlwaysOff;
591 vMode = ScrollbarAlwaysOff; 591 vMode = ScrollbarAlwaysOff;
592 } 592 }
593 593
594 if (!isSubtreeLayout()) { 594 if (!isSubtreeLayout()) {
595 Document* document = m_frame->document(); 595 Document* document = m_frame->document();
596 Node* body = document->body(); 596 Node* body = document->body();
597 if (body && body->renderer() && body->hasTagName(framesetTag)) { 597 if (isHTMLFrameSetElement(body) && body->renderer()) {
598 vMode = ScrollbarAlwaysOff; 598 vMode = ScrollbarAlwaysOff;
599 hMode = ScrollbarAlwaysOff; 599 hMode = ScrollbarAlwaysOff;
600 } else if (Element* viewportElement = document->viewportDefiningElement( )) { 600 } else if (Element* viewportElement = document->viewportDefiningElement( )) {
601 if (RenderObject* viewportRenderer = viewportElement->renderer()) { 601 if (RenderObject* viewportRenderer = viewportElement->renderer()) {
602 if (viewportRenderer->style()) 602 if (viewportRenderer->style())
603 applyOverflowToViewportAndSetRenderer(viewportRenderer, hMod e, vMode); 603 applyOverflowToViewportAndSetRenderer(viewportRenderer, hMod e, vMode);
604 } 604 }
605 } 605 }
606 } 606 }
607 } 607 }
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 FontCachePurgePreventer fontCachePurgePreventer; 896 FontCachePurgePreventer fontCachePurgePreventer;
897 RenderLayer* layer; 897 RenderLayer* layer;
898 { 898 {
899 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false); 899 TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
900 900
901 m_nestedLayoutCount++; 901 m_nestedLayoutCount++;
902 if (!inSubtreeLayout) { 902 if (!inSubtreeLayout) {
903 Document* document = m_frame->document(); 903 Document* document = m_frame->document();
904 Node* body = document->body(); 904 Node* body = document->body();
905 if (body && body->renderer()) { 905 if (body && body->renderer()) {
906 if (body->hasTagName(framesetTag)) { 906 if (isHTMLFrameSetElement(*body)) {
907 body->renderer()->setChildNeedsLayout(); 907 body->renderer()->setChildNeedsLayout();
908 } else if (body->hasTagName(bodyTag)) { 908 } else if (isHTMLBodyElement(*body)) {
909 if (!m_firstLayout && m_size.height() != layoutSize().height () && body->renderer()->enclosingBox()->stretchesToViewport()) 909 if (!m_firstLayout && m_size.height() != layoutSize().height () && body->renderer()->enclosingBox()->stretchesToViewport())
910 body->renderer()->setChildNeedsLayout(); 910 body->renderer()->setChildNeedsLayout();
911 } 911 }
912 } 912 }
913 } 913 }
914 updateCounters(); 914 updateCounters();
915 autoSizeIfEnabled(); 915 autoSizeIfEnabled();
916 916
917 ScrollbarMode hMode; 917 ScrollbarMode hMode;
918 ScrollbarMode vMode; 918 ScrollbarMode vMode;
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 1180
1181 for (size_t i = 0; i < widgets.size() && renderView(); ++i) 1181 for (size_t i = 0; i < widgets.size() && renderView(); ++i)
1182 widgets[i]->widgetPositionsUpdated(); 1182 widgets[i]->widgetPositionsUpdated();
1183 } 1183 }
1184 1184
1185 void FrameView::addWidgetToUpdate(RenderEmbeddedObject& object) 1185 void FrameView::addWidgetToUpdate(RenderEmbeddedObject& object)
1186 { 1186 {
1187 ASSERT(isInPerformLayout()); 1187 ASSERT(isInPerformLayout());
1188 // Tell the DOM element that it needs a widget update. 1188 // Tell the DOM element that it needs a widget update.
1189 Node* node = object.node(); 1189 Node* node = object.node();
1190 if (node->hasTagName(objectTag) || node->hasTagName(embedTag)) 1190 ASSERT(node);
1191 if (isHTMLObjectElement(*node) || isHTMLEmbedElement(*node))
1191 toHTMLPlugInElement(node)->setNeedsWidgetUpdate(true); 1192 toHTMLPlugInElement(node)->setNeedsWidgetUpdate(true);
1192 1193
1193 m_widgetUpdateSet.add(&object); 1194 m_widgetUpdateSet.add(&object);
1194 } 1195 }
1195 1196
1196 void FrameView::setMediaType(const AtomicString& mediaType) 1197 void FrameView::setMediaType(const AtomicString& mediaType)
1197 { 1198 {
1198 ASSERT(m_frame->document()); 1199 ASSERT(m_frame->document());
1199 m_frame->document()->mediaQueryAffectingValueChanged(); 1200 m_frame->document()->mediaQueryAffectingValueChanged();
1200 m_mediaType = mediaType; 1201 m_mediaType = mediaType;
(...skipping 2012 matching lines...) Expand 10 before | Expand all | Expand 10 after
3213 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3214 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3214 { 3215 {
3215 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3216 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3216 if (AXObjectCache* cache = axObjectCache()) { 3217 if (AXObjectCache* cache = axObjectCache()) {
3217 cache->remove(scrollbar); 3218 cache->remove(scrollbar);
3218 cache->handleScrollbarUpdate(this); 3219 cache->handleScrollbarUpdate(this);
3219 } 3220 }
3220 } 3221 }
3221 3222
3222 } // namespace WebCore 3223 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/fetch/FontResource.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698