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
/
dom
/
RenderTreeBuilder.cpp
diff --git
a/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
b/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
index
974a1fa
..
2157cd3
100644
(file)
--- a/
src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
+++ b/
src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
@@
-39,7
+39,7
@@
#include "core/svg/SVGElement.h"
#include "platform/RuntimeEnabledFeatures.h"
#include "core/svg/SVGElement.h"
#include "platform/RuntimeEnabledFeatures.h"
-namespace
WebCore
{
+namespace
blink
{
RenderObject* RenderTreeBuilder::nextRenderer() const
{
RenderObject* RenderTreeBuilder::nextRenderer() const
{
@@
-132,7
+132,7
@@
void RenderTreeBuilder::createRendererForElementIfNeeded()
element->setRenderer(newRenderer);
newRenderer->setStyle(&style); // setStyle() can depend on renderer() already being set.
element->setRenderer(newRenderer);
newRenderer->setStyle(&style); // setStyle() can depend on renderer() already being set.
- if (FullscreenElementStack::isActiveFullScreenElement(element)) {
+ if (FullscreenElementStack::isActiveFullScreenElement(
*
element)) {
newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, &element->document());
if (!newRenderer)
return;
newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, &element->document());
if (!newRenderer)
return;