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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove now unused segmentIsEmpty 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
« no previous file with comments | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/RenderView.h » ('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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1930 1930
1931 RefPtr<RenderStyle> oldStyle = m_style.release(); 1931 RefPtr<RenderStyle> oldStyle = m_style.release();
1932 setStyleInternal(style); 1932 setStyleInternal(style);
1933 1933
1934 updateFillImages(oldStyle ? oldStyle->backgroundLayers() : 0, m_style ? m_st yle->backgroundLayers() : 0); 1934 updateFillImages(oldStyle ? oldStyle->backgroundLayers() : 0, m_style ? m_st yle->backgroundLayers() : 0);
1935 updateFillImages(oldStyle ? oldStyle->maskLayers() : 0, m_style ? m_style->m askLayers() : 0); 1935 updateFillImages(oldStyle ? oldStyle->maskLayers() : 0, m_style ? m_style->m askLayers() : 0);
1936 1936
1937 updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style ? m_styl e->borderImage().image() : 0); 1937 updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style ? m_styl e->borderImage().image() : 0);
1938 updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style ? m_sty le->maskBoxImage().image() : 0); 1938 updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style ? m_sty le->maskBoxImage().image() : 0);
1939 1939
1940 updateShapeImage(oldStyle ? oldStyle->shapeInside() : 0, m_style ? m_style-> shapeInside() : 0);
1941 updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style ? m_style- >shapeOutside() : 0); 1940 updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style ? m_style- >shapeOutside() : 0);
1942 1941
1943 bool doesNotNeedLayout = !m_parent || isText(); 1942 bool doesNotNeedLayout = !m_parent || isText();
1944 1943
1945 styleDidChange(diff, oldStyle.get()); 1944 styleDidChange(diff, oldStyle.get());
1946 1945
1947 // FIXME: |this| might be destroyed here. This can currently happen for a Re nderTextFragment when 1946 // FIXME: |this| might be destroyed here. This can currently happen for a Re nderTextFragment when
1948 // its first-letter block gets an update in RenderTextFragment::styleDidChan ge. For RenderTextFragment(s), 1947 // its first-letter block gets an update in RenderTextFragment::styleDidChan ge. For RenderTextFragment(s),
1949 // we will safely bail out with the doesNotNeedLayout flag. We might want to broaden this condition 1948 // we will safely bail out with the doesNotNeedLayout flag. We might want to broaden this condition
1950 // in the future as we move renderer changes out of layout and into style ch anges. 1949 // in the future as we move renderer changes out of layout and into style ch anges.
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 if (StyleImage* maskImage = maskLayer->image()) 2745 if (StyleImage* maskImage = maskLayer->image())
2747 maskImage->removeClient(this); 2746 maskImage->removeClient(this);
2748 } 2747 }
2749 2748
2750 if (StyleImage* borderImage = m_style->borderImage().image()) 2749 if (StyleImage* borderImage = m_style->borderImage().image())
2751 borderImage->removeClient(this); 2750 borderImage->removeClient(this);
2752 2751
2753 if (StyleImage* maskBoxImage = m_style->maskBoxImage().image()) 2752 if (StyleImage* maskBoxImage = m_style->maskBoxImage().image())
2754 maskBoxImage->removeClient(this); 2753 maskBoxImage->removeClient(this);
2755 2754
2756 removeShapeImageClient(m_style->shapeInside());
2757 removeShapeImageClient(m_style->shapeOutside()); 2755 removeShapeImageClient(m_style->shapeOutside());
2758 } 2756 }
2759 2757
2760 delete this; 2758 delete this;
2761 } 2759 }
2762 2760
2763 PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&) 2761 PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
2764 { 2762 {
2765 return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM); 2763 return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
2766 } 2764 }
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
3408 { 3406 {
3409 if (object1) { 3407 if (object1) {
3410 const WebCore::RenderObject* root = object1; 3408 const WebCore::RenderObject* root = object1;
3411 while (root->parent()) 3409 while (root->parent())
3412 root = root->parent(); 3410 root = root->parent();
3413 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3411 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3414 } 3412 }
3415 } 3413 }
3416 3414
3417 #endif 3415 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698