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

Unified Diff: Source/core/rendering/style/RenderStyle.h

Issue 463123003: Cleanup namespace usage in Source/core/rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/FillLayer.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.h
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
index 392457d26d6c3d83fb02dd1fee92f1df76091868..218bfdf7127177b37fbdb6f10d2bfc01d57213e5 100644
--- a/Source/core/rendering/style/RenderStyle.h
+++ b/Source/core/rendering/style/RenderStyle.h
@@ -948,8 +948,8 @@ public:
const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
- blink::WebBlendMode blendMode() const;
- void setBlendMode(blink::WebBlendMode v);
+ WebBlendMode blendMode() const;
+ void setBlendMode(WebBlendMode v);
bool hasBlendMode() const;
EIsolation isolation() const;
@@ -1726,7 +1726,7 @@ public:
static ETextSecurity initialTextSecurity() { return TSNONE; }
static Color initialTapHighlightColor();
static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
- static blink::WebBlendMode initialBlendMode() { return blink::WebBlendModeNormal; }
+ static WebBlendMode initialBlendMode() { return WebBlendModeNormal; }
static EIsolation initialIsolation() { return IsolationAuto; }
private:
void setVisitedLinkColor(const Color&);
« no previous file with comments | « Source/core/rendering/style/FillLayer.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698