Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 2549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2560 } | 2560 } |
| 2561 if (decorations & TextDecorationLineThrough) { | 2561 if (decorations & TextDecorationLineThrough) { |
| 2562 linethrough.color = resultColor; | 2562 linethrough.color = resultColor; |
| 2563 linethrough.style = resultStyle; | 2563 linethrough.style = resultStyle; |
| 2564 } | 2564 } |
| 2565 } | 2565 } |
| 2566 } | 2566 } |
| 2567 | 2567 |
| 2568 bool RenderObject::willRenderImage(ImageResource*) | 2568 bool RenderObject::willRenderImage(ImageResource*) |
| 2569 { | 2569 { |
| 2570 // FIXME(sky): Do we want to keep this? | |
| 2570 // We will not render a new image when Active DOM is suspended | 2571 // We will not render a new image when Active DOM is suspended |
| 2571 if (document().activeDOMObjectsAreSuspended()) | 2572 return !document().activeDOMObjectsAreSuspended(); |
|
abarth-chromium
2014/10/29 16:49:17
active DOM object cannot ever be suspended in Sky.
| |
| 2572 return false; | |
| 2573 | |
| 2574 // If we're not in a window (i.e., we're dormant from being in a background tab) | |
| 2575 // then we don't want to render either. | |
| 2576 return document().view()->isVisible(); | |
| 2577 } | 2573 } |
| 2578 | 2574 |
| 2579 int RenderObject::caretMinOffset() const | 2575 int RenderObject::caretMinOffset() const |
| 2580 { | 2576 { |
| 2581 return 0; | 2577 return 0; |
| 2582 } | 2578 } |
| 2583 | 2579 |
| 2584 int RenderObject::caretMaxOffset() const | 2580 int RenderObject::caretMaxOffset() const |
| 2585 { | 2581 { |
| 2586 if (isReplaced()) | 2582 if (isReplaced()) |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2856 { | 2852 { |
| 2857 if (object1) { | 2853 if (object1) { |
| 2858 const blink::RenderObject* root = object1; | 2854 const blink::RenderObject* root = object1; |
| 2859 while (root->parent()) | 2855 while (root->parent()) |
| 2860 root = root->parent(); | 2856 root = root->parent(); |
| 2861 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2857 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2862 } | 2858 } |
| 2863 } | 2859 } |
| 2864 | 2860 |
| 2865 #endif | 2861 #endif |
| OLD | NEW |