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

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

Issue 2796183002: Introduce the nested namespace ::blink::cssvalue, start with CSSColorValue. (Closed)
Patch Set: Use the least possible namespace scoping when aliasing. Created 3 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
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "core/frame/LocalFrame.h" 58 #include "core/frame/LocalFrame.h"
59 #include "core/html/HTMLFontElement.h" 59 #include "core/html/HTMLFontElement.h"
60 #include "core/html/HTMLSpanElement.h" 60 #include "core/html/HTMLSpanElement.h"
61 #include "core/layout/LayoutBox.h" 61 #include "core/layout/LayoutBox.h"
62 #include "core/layout/LayoutObject.h" 62 #include "core/layout/LayoutObject.h"
63 #include "core/style/ComputedStyle.h" 63 #include "core/style/ComputedStyle.h"
64 #include "wtf/StdLibExtras.h" 64 #include "wtf/StdLibExtras.h"
65 65
66 namespace blink { 66 namespace blink {
67 67
68 using namespace cssvalue;
69
68 static const CSSPropertyID& textDecorationPropertyForEditing() { 70 static const CSSPropertyID& textDecorationPropertyForEditing() {
69 static const CSSPropertyID property = 71 static const CSSPropertyID property =
70 RuntimeEnabledFeatures::css3TextDecorationsEnabled() 72 RuntimeEnabledFeatures::css3TextDecorationsEnabled()
71 ? CSSPropertyTextDecorationLine 73 ? CSSPropertyTextDecorationLine
72 : CSSPropertyTextDecoration; 74 : CSSPropertyTextDecoration;
73 return property; 75 return property;
74 } 76 }
75 77
76 // Editing style properties must be preserved during editing operation. 78 // Editing style properties must be preserved during editing operation.
77 // e.g. when a user inserts a new paragraph, all properties listed here must be 79 // e.g. when a user inserts a new paragraph, all properties listed here must be
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1768 const CSSIdentifierValue& identifierValue = toCSSIdentifierValue(*value); 1770 const CSSIdentifierValue& identifierValue = toCSSIdentifierValue(*value);
1769 if (CSSValueXSmall <= identifierValue.getValueID() && 1771 if (CSSValueXSmall <= identifierValue.getValueID() &&
1770 identifierValue.getValueID() <= CSSValueWebkitXxxLarge) 1772 identifierValue.getValueID() <= CSSValueWebkitXxxLarge)
1771 return identifierValue.getValueID() - CSSValueXSmall + 1; 1773 return identifierValue.getValueID() - CSSValueXSmall + 1;
1772 } 1774 }
1773 1775
1774 return 0; 1776 return 0;
1775 } 1777 }
1776 1778
1777 } // namespace blink 1779 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698