| 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. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2009 Google Inc. All rights reserved. | 8 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 1908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1919 // Don't check for paint invalidation here; we need to wait until the layer | 1919 // Don't check for paint invalidation here; we need to wait until the layer |
| 1920 // has been updated by subclasses before we know if we have to invalidate | 1920 // has been updated by subclasses before we know if we have to invalidate |
| 1921 // paints (in setStyle()). | 1921 // paints (in setStyle()). |
| 1922 | 1922 |
| 1923 if (old_style && !AreCursorsEqual(old_style, Style())) { | 1923 if (old_style && !AreCursorsEqual(old_style, Style())) { |
| 1924 if (LocalFrame* frame = this->GetFrame()) { | 1924 if (LocalFrame* frame = this->GetFrame()) { |
| 1925 // Cursor update scheduling is done by the local root, which is the main | 1925 // Cursor update scheduling is done by the local root, which is the main |
| 1926 // frame if there are no RemoteFrame ancestors in the frame tree. Use of | 1926 // frame if there are no RemoteFrame ancestors in the frame tree. Use of |
| 1927 // localFrameRoot() is discouraged but will change when cursor update | 1927 // localFrameRoot() is discouraged but will change when cursor update |
| 1928 // scheduling is moved from EventHandler to PageEventHandler. | 1928 // scheduling is moved from EventHandler to PageEventHandler. |
| 1929 frame->LocalFrameRoot()->GetEventHandler().ScheduleCursorUpdate(); | 1929 frame->LocalFrameRoot().GetEventHandler().ScheduleCursorUpdate(); |
| 1930 } | 1930 } |
| 1931 } | 1931 } |
| 1932 | 1932 |
| 1933 if (diff.NeedsFullPaintInvalidation() && old_style) { | 1933 if (diff.NeedsFullPaintInvalidation() && old_style) { |
| 1934 if (ResolveColor(*old_style, CSSPropertyBackgroundColor) != | 1934 if (ResolveColor(*old_style, CSSPropertyBackgroundColor) != |
| 1935 ResolveColor(CSSPropertyBackgroundColor) || | 1935 ResolveColor(CSSPropertyBackgroundColor) || |
| 1936 old_style->BackgroundLayers() != StyleRef().BackgroundLayers()) | 1936 old_style->BackgroundLayers() != StyleRef().BackgroundLayers()) |
| 1937 SetBackgroundChangedSinceLastPaintInvalidation(); | 1937 SetBackgroundChangedSinceLastPaintInvalidation(); |
| 1938 } | 1938 } |
| 1939 | 1939 |
| (...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3635 const blink::LayoutObject* root = object1; | 3635 const blink::LayoutObject* root = object1; |
| 3636 while (root->Parent()) | 3636 while (root->Parent()) |
| 3637 root = root->Parent(); | 3637 root = root->Parent(); |
| 3638 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3638 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3639 } else { | 3639 } else { |
| 3640 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3640 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3641 } | 3641 } |
| 3642 } | 3642 } |
| 3643 | 3643 |
| 3644 #endif | 3644 #endif |
| OLD | NEW |