| 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 16 matching lines...) Expand all Loading... |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/rendering/RenderObject.h" | 28 #include "core/rendering/RenderObject.h" |
| 29 | 29 |
| 30 #include "core/css/resolver/StyleResolver.h" | 30 #include "core/css/resolver/StyleResolver.h" |
| 31 #include "core/dom/ElementTraversal.h" | 31 #include "core/dom/ElementTraversal.h" |
| 32 #include "core/dom/StyleEngine.h" | 32 #include "core/dom/StyleEngine.h" |
| 33 #include "core/dom/shadow/ShadowRoot.h" | 33 #include "core/dom/shadow/ShadowRoot.h" |
| 34 #include "core/editing/EditingBoundary.h" | 34 #include "core/editing/EditingBoundary.h" |
| 35 #include "core/editing/FrameSelection.h" | 35 #include "core/editing/FrameSelection.h" |
| 36 #include "core/editing/htmlediting.h" | 36 #include "core/editing/htmlediting.h" |
| 37 #include "core/fetch/ResourceLoadPriorityOptimizer.h" | |
| 38 #include "core/fetch/ResourceLoader.h" | 37 #include "core/fetch/ResourceLoader.h" |
| 39 #include "core/frame/FrameView.h" | 38 #include "core/frame/FrameView.h" |
| 40 #include "core/frame/LocalFrame.h" | 39 #include "core/frame/LocalFrame.h" |
| 41 #include "core/html/HTMLAnchorElement.h" | 40 #include "core/html/HTMLAnchorElement.h" |
| 42 #include "core/html/HTMLElement.h" | 41 #include "core/html/HTMLElement.h" |
| 43 #include "core/page/AutoscrollController.h" | 42 #include "core/page/AutoscrollController.h" |
| 44 #include "core/page/EventHandler.h" | 43 #include "core/page/EventHandler.h" |
| 45 #include "core/page/Page.h" | 44 #include "core/page/Page.h" |
| 46 #include "core/frame/Settings.h" | 45 #include "core/frame/Settings.h" |
| 47 #include "core/frame/UseCounter.h" | 46 #include "core/frame/UseCounter.h" |
| (...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 if (StyleImage* maskImage = maskLayer->image()) | 2265 if (StyleImage* maskImage = maskLayer->image()) |
| 2267 maskImage->removeClient(this); | 2266 maskImage->removeClient(this); |
| 2268 } | 2267 } |
| 2269 | 2268 |
| 2270 if (StyleImage* borderImage = m_style->borderImage().image()) | 2269 if (StyleImage* borderImage = m_style->borderImage().image()) |
| 2271 borderImage->removeClient(this); | 2270 borderImage->removeClient(this); |
| 2272 | 2271 |
| 2273 if (StyleImage* maskBoxImage = m_style->maskBoxImage().image()) | 2272 if (StyleImage* maskBoxImage = m_style->maskBoxImage().image()) |
| 2274 maskBoxImage->removeClient(this); | 2273 maskBoxImage->removeClient(this); |
| 2275 } | 2274 } |
| 2276 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRender
Object(this); | |
| 2277 #if !ENABLE(OILPAN) | |
| 2278 delete this; | 2275 delete this; |
| 2279 #endif | |
| 2280 } | 2276 } |
| 2281 | 2277 |
| 2282 PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&) | 2278 PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&) |
| 2283 { | 2279 { |
| 2284 return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM); | 2280 return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM); |
| 2285 } | 2281 } |
| 2286 | 2282 |
| 2287 CompositingState RenderObject::compositingState() const | 2283 CompositingState RenderObject::compositingState() const |
| 2288 { | 2284 { |
| 2289 return hasLayer() ? toRenderLayerModelObject(this)->layer()->compositingStat
e() : NotComposited; | 2285 return hasLayer() ? toRenderLayerModelObject(this)->layer()->compositingStat
e() : NotComposited; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2700 { | 2696 { |
| 2701 if (object1) { | 2697 if (object1) { |
| 2702 const blink::RenderObject* root = object1; | 2698 const blink::RenderObject* root = object1; |
| 2703 while (root->parent()) | 2699 while (root->parent()) |
| 2704 root = root->parent(); | 2700 root = root->parent(); |
| 2705 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2701 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2706 } | 2702 } |
| 2707 } | 2703 } |
| 2708 | 2704 |
| 2709 #endif | 2705 #endif |
| OLD | NEW |