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

Side by Side Diff: Source/core/editing/EditingStyle.cpp

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. 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 | Annotate | Revision Log
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "core/editing/ApplyStyleCommand.h" 49 #include "core/editing/ApplyStyleCommand.h"
50 #include "core/editing/Editor.h" 50 #include "core/editing/Editor.h"
51 #include "core/editing/FrameSelection.h" 51 #include "core/editing/FrameSelection.h"
52 #include "core/editing/HTMLInterchange.h" 52 #include "core/editing/HTMLInterchange.h"
53 #include "core/editing/htmlediting.h" 53 #include "core/editing/htmlediting.h"
54 #include "core/frame/LocalFrame.h" 54 #include "core/frame/LocalFrame.h"
55 #include "core/html/HTMLFontElement.h" 55 #include "core/html/HTMLFontElement.h"
56 #include "core/html/HTMLSpanElement.h" 56 #include "core/html/HTMLSpanElement.h"
57 #include "core/layout/LayoutBox.h" 57 #include "core/layout/LayoutBox.h"
58 #include "core/layout/LayoutObject.h" 58 #include "core/layout/LayoutObject.h"
59 #include "core/layout/style/ComputedStyle.h" 59 #include "core/style/ComputedStyle.h"
60 60
61 namespace blink { 61 namespace blink {
62 62
63 static const CSSPropertyID& textDecorationPropertyForEditing() 63 static const CSSPropertyID& textDecorationPropertyForEditing()
64 { 64 {
65 static const CSSPropertyID property = RuntimeEnabledFeatures::css3TextDecora tionsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration; 65 static const CSSPropertyID property = RuntimeEnabledFeatures::css3TextDecora tionsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration;
66 return property; 66 return property;
67 } 67 }
68 68
69 // Editing style properties must be preserved during editing operation. 69 // Editing style properties must be preserved during editing operation.
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 { 1679 {
1680 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { 1680 for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) {
1681 RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSCompu tedStyleDeclaration::create(ancestor); 1681 RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ancestorStyle = CSSCompu tedStyleDeclaration::create(ancestor);
1682 if (!hasTransparentBackgroundColor(ancestorStyle.get())) 1682 if (!hasTransparentBackgroundColor(ancestorStyle.get()))
1683 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor ); 1683 return ancestorStyle->getPropertyCSSValue(CSSPropertyBackgroundColor );
1684 } 1684 }
1685 return nullptr; 1685 return nullptr;
1686 } 1686 }
1687 1687
1688 } 1688 }
OLDNEW
« no previous file with comments | « Source/core/editing/ApplyBlockElementCommand.cpp ('k') | Source/core/editing/SimplifyMarkupCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698