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

Side by Side Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 1077473002: Stop rendering text inside flex boxes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: make p default to display: paragraph Created 5 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
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderParagraph.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 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 1294
1295 // Don't check for paint invalidation here; we need to wait until the layer has been 1295 // Don't check for paint invalidation here; we need to wait until the layer has been
1296 // updated by subclasses before we know if we have to invalidate paints (in setStyle()). 1296 // updated by subclasses before we know if we have to invalidate paints (in setStyle()).
1297 1297
1298 if (oldStyle && !areCursorsEqual(oldStyle, style())) { 1298 if (oldStyle && !areCursorsEqual(oldStyle, style())) {
1299 if (LocalFrame* frame = this->frame()) 1299 if (LocalFrame* frame = this->frame())
1300 frame->eventHandler().scheduleCursorUpdate(); 1300 frame->eventHandler().scheduleCursorUpdate();
1301 } 1301 }
1302 } 1302 }
1303 1303
1304 void RenderObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly)
1305 {
1306 // FIXME: We could save this call when the change only affected non-inherite d properties.
1307 for (RenderObject* child = slowFirstChild(); child; child = child->nextSibli ng()) {
1308 if (!child->isAnonymous())
1309 continue;
1310
1311 if (blockChildrenOnly && !child->isRenderBlock())
1312 continue;
1313
1314 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisp lay(style(), child->style()->display());
1315 updateAnonymousChildStyle(child, newStyle.get());
1316 child->setStyle(newStyle.release());
1317 }
1318 }
1319
1320 void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer& newLayers) 1304 void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer& newLayers)
1321 { 1305 {
1322 // Optimize the common case 1306 // Optimize the common case
1323 if (oldLayers && !oldLayers->next() && !newLayers.next() && (oldLayers->imag e() == newLayers.image())) 1307 if (oldLayers && !oldLayers->next() && !newLayers.next() && (oldLayers->imag e() == newLayers.image()))
1324 return; 1308 return;
1325 1309
1326 // Go through the new layers and addClients first, to avoid removing all cli ents of an image. 1310 // Go through the new layers and addClients first, to avoid removing all cli ents of an image.
1327 for (const FillLayer* currNew = &newLayers; currNew; currNew = currNew->next ()) { 1311 for (const FillLayer* currNew = &newLayers; currNew; currNew = currNew->next ()) {
1328 if (currNew->image()) 1312 if (currNew->image())
1329 currNew->image()->addClient(this); 1313 currNew->image()->addClient(this);
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1969 { 1953 {
1970 if (object1) { 1954 if (object1) {
1971 const blink::RenderObject* root = object1; 1955 const blink::RenderObject* root = object1;
1972 while (root->parent()) 1956 while (root->parent())
1973 root = root->parent(); 1957 root = root->parent();
1974 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 1958 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
1975 } 1959 }
1976 } 1960 }
1977 1961
1978 #endif 1962 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderParagraph.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698