projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
rendering
/
style
/
StyleDeprecatedFlexibleBoxData.cpp
diff --git
a/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.cpp
b/src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.cpp
index
2c030fc
..
9d40288
100644
(file)
--- a/
src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.cpp
+++ b/
src/third_party/WebKit/Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.cpp
@@
-24,7
+24,7
@@
#include "core/rendering/style/RenderStyle.h"
#include "core/rendering/style/RenderStyle.h"
-namespace
WebCore
{
+namespace
blink
{
StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData()
: flex(RenderStyle::initialBoxFlex())
StyleDeprecatedFlexibleBoxData::StyleDeprecatedFlexibleBoxData()
: flex(RenderStyle::initialBoxFlex())
@@
-54,4
+54,4
@@
bool StyleDeprecatedFlexibleBoxData::operator==(const StyleDeprecatedFlexibleBox
return flex == o.flex && flexGroup == o.flexGroup && ordinalGroup == o.ordinalGroup && align == o.align && pack == o.pack && orient == o.orient && lines == o.lines;
}
return flex == o.flex && flexGroup == o.flexGroup && ordinalGroup == o.ordinalGroup && align == o.align && pack == o.pack && orient == o.orient && lines == o.lines;
}
-} // namespace
WebCore
+} // namespace
blink