Gardening: fix broken build on Windows.
https://bugs.webkit.org/show_bug.cgi?id=123174.

Not reviewed.

No new tests.

* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Fix build failures after r157842.

* WebProcess/WebProcess.h: Don't try to #include a file that was deleted.
It won't work.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157846 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[EFL] Remove HAVE_GLX macro
https://bugs.webkit.org/show_bug.cgi?id=123191

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsEfl.cmake: Removed unnecessary HAVE_GLX macro

Source/WebCore:

Since r138313, HAVE(GLX) was replaced to USE(GLX) except in GraphicsSurfaceToken.h.

* platform/graphics/surfaces/GraphicsSurfaceToken.h:
Replace HAVE(GLX) to USE(GLX)


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Unreviewed, rolling out r157826.
http://trac.webkit.org/changeset/157826
https://bugs.webkit.org/show_bug.cgi?id=123197

Caused some regions tests to assert (Requested by smfr on
#webkit).

* dom/Document.cpp:
(WebCore::Document::styleForElementIgnoringPendingStylesheets):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::styleForRenderer):
* dom/Element.h:
* dom/ElementRareData.h:
(WebCore::ElementRareData::setComputedStyle):
(WebCore::ElementRareData::resetComputedStyle):
* html/HTMLTitleElement.cpp:
(WebCore::HTMLTitleElement::textWithDirection):
* page/animation/AnimationController.cpp:
(WebCore::AnimationController::updateAnimations):
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::animate):
* page/animation/CompositeAnimation.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
* rendering/RenderElement.h:
(WebCore::RenderElement::setStyleInternal):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::setRegionObjectsRegionStyle):
(WebCore::RenderRegion::restoreRegionObjectsOriginalStyle):
(WebCore::RenderRegion::computeStyleInRegion):
(WebCore::RenderRegion::computeChildrenStyleInRegion):
(WebCore::RenderRegion::setObjectStyleInRegion):
* rendering/RenderRegion.h:
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveLocal):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157848 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Unreviewed build fix attempt on EFL port after r157842.

* Shared/soup/PlatformCertificateInfo.h: Removed message of merge confliction.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157849 268f45cc-cd09-0410-ab3c-d52691b4dbfc