wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 896138 patch 1: Move RestyleTracker and OverflowChangedTracker out of nested namespace mozilla::css (which shouldn't exist) into namespace mozilla. r=heycam

Browse Source
This commit is contained in:
L. David Baron 2013-07-20 12:14:24 -07:00
parent 6ea9673c4f
commit fd2d870c15
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/RestyleTracker.cpp
View File

@ -14,7 +14,6 @@
#include "GeckoProfiler.h"
namespace mozilla {
namespace css {
inline nsIDocument*
RestyleTracker::Document() const {
@ -290,6 +289,5 @@ RestyleTracker::GetRestyleData(Element* aElement, RestyleData* aData)
return true;
}
} // namespace css
} // namespace mozilla

8
layout/base/RestyleTracker.h
View File

@ -8,8 +8,8 @@
* of what nodes restyles need to happen on and so forth.
*/
#ifndef mozilla_css_RestyleTracker_h
#define mozilla_css_RestyleTracker_h
#ifndef mozilla_RestyleTracker_h
#define mozilla_RestyleTracker_h
#include "mozilla/dom/Element.h"
#include "nsDataHashtable.h"
@ -20,7 +20,6 @@
class nsCSSFrameConstructor;
namespace mozilla {
namespace css {
/**
* Helper class that collects a list of frames that need
@ -359,7 +358,6 @@ inline bool RestyleTracker::AddPendingRestyle(Element* aElement,
return hadRestyleLaterSiblings;
}
} // namespace css
} // namespace mozilla
#endif /* mozilla_css_RestyleTracker_h */
#endif /* mozilla_RestyleTracker_h */

6
layout/base/nsCSSFrameConstructor.h
View File

@ -59,8 +59,8 @@ class nsCSSFrameConstructor : public nsFrameManager
public:
typedef mozilla::dom::Element Element;
typedef mozilla::css::RestyleTracker RestyleTracker;
typedef mozilla::css::OverflowChangedTracker OverflowChangedTracker;
typedef mozilla::RestyleTracker RestyleTracker;
typedef mozilla::OverflowChangedTracker OverflowChangedTracker;
nsCSSFrameConstructor(nsIDocument *aDocument, nsIPresShell* aPresShell,
nsStyleSet* aStyleSet);
@ -251,7 +251,7 @@ public:
private:
friend class mozilla::css::RestyleTracker;
friend class mozilla::RestyleTracker;
void RestyleForEmptyChange(Element* aContainer);

4
layout/base/nsFrameManager.h
View File

@ -25,9 +25,7 @@
#include "nsFrameManagerBase.h"
namespace mozilla {
namespace css {
class RestyleTracker;
} // namespace css
} // namespace mozilla
struct TreeMatchContext;
@ -45,7 +43,7 @@ struct TreeMatchContext;
class nsFrameManager : public nsFrameManagerBase
{
typedef mozilla::css::RestyleTracker RestyleTracker;
typedef mozilla::RestyleTracker RestyleTracker;
typedef nsIFrame::ChildListID ChildListID;
public: