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

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

Issue 277563004: [SVG2] overflow should be ignored in img and background-image. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add comment Created 6 years, 7 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 | « LayoutTests/svg/as-image/resources/overflow-hidden.svg ('k') | no next file » | 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 { 526 {
527 // Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats 527 // Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats
528 // overflow:hidden and overflow:scroll on <body> as applying to the document 's 528 // overflow:hidden and overflow:scroll on <body> as applying to the document 's
529 // scrollbars. The CSS2.1 draft states that HTML UAs should use the <html> or <body> element and XML/XHTML UAs should 529 // scrollbars. The CSS2.1 draft states that HTML UAs should use the <html> or <body> element and XML/XHTML UAs should
530 // use the root element. 530 // use the root element.
531 531
532 EOverflow overflowX = o->style()->overflowX(); 532 EOverflow overflowX = o->style()->overflowX();
533 EOverflow overflowY = o->style()->overflowY(); 533 EOverflow overflowY = o->style()->overflowY();
534 534
535 if (o->isSVGRoot()) { 535 if (o->isSVGRoot()) {
536 // Don't allow overflow to affect <img> and css backgrounds
537 if (toRenderSVGRoot(o)->isEmbeddedThroughSVGImage())
538 return;
539
536 // FIXME: evaluate if we can allow overflow for these cases too. 540 // FIXME: evaluate if we can allow overflow for these cases too.
537 // Overflow is always hidden when stand-alone SVG documents are embedded . 541 // Overflow is always hidden when stand-alone SVG documents are embedded .
538 if (toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) { 542 if (toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) {
539 overflowX = OHIDDEN; 543 overflowX = OHIDDEN;
540 overflowY = OHIDDEN; 544 overflowY = OHIDDEN;
541 } 545 }
542 } 546 }
543 547
544 bool ignoreOverflowHidden = false; 548 bool ignoreOverflowHidden = false;
545 if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->is MainFrame()) 549 if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->is MainFrame())
(...skipping 2711 matching lines...) Expand 10 before | Expand all | Expand 10 after
3257 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3261 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3258 { 3262 {
3259 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3263 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3260 if (AXObjectCache* cache = axObjectCache()) { 3264 if (AXObjectCache* cache = axObjectCache()) {
3261 cache->remove(scrollbar); 3265 cache->remove(scrollbar);
3262 cache->handleScrollbarUpdate(this); 3266 cache->handleScrollbarUpdate(this);
3263 } 3267 }
3264 } 3268 }
3265 3269
3266 } // namespace WebCore 3270 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/svg/as-image/resources/overflow-hidden.svg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698