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

Side by Side Diff: sky/engine/core/editing/EditingStyle.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc. 2 * Copyright (C) 2007, 2008, 2009 Apple Computer, Inc.
3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 10 matching lines...) Expand all
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/editing/EditingStyle.h" 28 #include "sky/engine/core/editing/EditingStyle.h"
29 29
30 #include "gen/sky/core/HTMLNames.h" 30 #include "gen/sky/core/HTMLNames.h"
31 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 31 #include "sky/engine/bindings2/exception_state_placeholder.h"
32 #include "sky/engine/core/css/CSSComputedStyleDeclaration.h" 32 #include "sky/engine/core/css/CSSComputedStyleDeclaration.h"
33 #include "sky/engine/core/css/CSSPropertyMetadata.h" 33 #include "sky/engine/core/css/CSSPropertyMetadata.h"
34 #include "sky/engine/core/css/CSSValueList.h" 34 #include "sky/engine/core/css/CSSValueList.h"
35 #include "sky/engine/core/css/CSSValuePool.h" 35 #include "sky/engine/core/css/CSSValuePool.h"
36 #include "sky/engine/core/css/FontSize.h" 36 #include "sky/engine/core/css/FontSize.h"
37 #include "sky/engine/core/css/StylePropertySet.h" 37 #include "sky/engine/core/css/StylePropertySet.h"
38 #include "sky/engine/core/css/StyleRule.h" 38 #include "sky/engine/core/css/StyleRule.h"
39 #include "sky/engine/core/css/parser/BisonCSSParser.h" 39 #include "sky/engine/core/css/parser/BisonCSSParser.h"
40 #include "sky/engine/core/css/resolver/StyleResolver.h" 40 #include "sky/engine/core/css/resolver/StyleResolver.h"
41 #include "sky/engine/core/dom/Document.h" 41 #include "sky/engine/core/dom/Document.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 { 578 {
579 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { 579 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {
580 RefPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSComputedStyleDecl aration::create(ancestor); 580 RefPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSComputedStyleDecl aration::create(ancestor);
581 if (!hasTransparentBackgroundColor(ancestorStyle.get())) 581 if (!hasTransparentBackgroundColor(ancestorStyle.get()))
582 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor ); 582 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor );
583 } 583 }
584 return nullptr; 584 return nullptr;
585 } 585 }
586 586
587 } 587 }
OLDNEW
« no previous file with comments | « sky/engine/core/editing/DeleteFromTextNodeCommand.cpp ('k') | sky/engine/core/editing/Editor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698