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

Backed out changeset 5f9c7cd773a5 (bug 1096093) for bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-04-23 17:18:52 +02:00
parent b7b7100fa7
commit 7fb0bc78c5
9 changed files with 2 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/ContentChild.cpp
View File

@ -23,7 +23,6 @@
#ifdef ACCESSIBILITY
#include "mozilla/a11y/DocAccessibleChild.h"
#endif
#include "mozilla/LookAndFeel.h"
#include "mozilla/Preferences.h"
#include "mozilla/ProcessHangMonitorIPC.h"
#include "mozilla/docshell/OfflineCacheUpdateChild.h"
@ -54,7 +53,6 @@
#include "mozilla/net/NeckoChild.h"
#include "mozilla/plugins/PluginInstanceParent.h"
#include "mozilla/plugins/PluginModuleParent.h"
#include "mozilla/widget/WidgetMessageUtils.h"
#if defined(MOZ_CONTENT_SANDBOX)
#if defined(XP_WIN)

9
dom/ipc/ContentParent.cpp
View File

@ -76,7 +76,6 @@
#include "mozilla/layers/CompositorParent.h"
#include "mozilla/layers/ImageBridgeParent.h"
#include "mozilla/layers/SharedBufferManagerParent.h"
#include "mozilla/LookAndFeel.h"
#include "mozilla/net/NeckoParent.h"
#include "mozilla/plugins/PluginBridge.h"
#include "mozilla/Preferences.h"
@ -2888,7 +2887,6 @@ ContentParent::RecvAddNewProcess(const uint32_t& aPid,
InfallibleTArray<nsString> unusedDictionaries;
ClipboardCapabilities clipboardCaps;
DomainPolicyClone domainPolicy;
RecvGetXPCOMProcessAttributes(&isOffline, &isLangRTL, &unusedDictionaries,
&clipboardCaps, &domainPolicy);
mozilla::unused << content->SendSetOffline(isOffline);
@ -4039,13 +4037,6 @@ ContentParent::RecvGetSystemMemory(const uint64_t& aGetterId)
return true;
}
bool
ContentParent::RecvGetLookAndFeelCache(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache)
{
aLookAndFeelIntCache = LookAndFeel::GetIntCache();
return true;
}
bool
ContentParent::RecvIsSecureURI(const uint32_t& type,
const URIParams& uri,

5
dom/ipc/ContentParent.h
View File

@ -543,7 +543,8 @@ private:
bool* aIsLangRTL,
InfallibleTArray<nsString>* dictionaries,
ClipboardCapabilities* clipboardCaps,
DomainPolicyClone* domainPolicy) override;
DomainPolicyClone* domainPolicy)
override;
virtual bool DeallocPJavaScriptParent(mozilla::jsipc::PJavaScriptParent*) override;
@ -755,8 +756,6 @@ private:
const bool& aHidden) override;
virtual bool RecvGetSystemMemory(const uint64_t& getterId) override;
virtual bool RecvGetLookAndFeelCache(nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache) override;
virtual bool RecvDataStoreGetStores(
const nsString& aName,
const nsString& aOwner,

3
dom/ipc/PContent.ipdl
View File

@ -87,7 +87,6 @@ using mozilla::hal::ProcessPriority from "mozilla/HalTypes.h";
using gfxIntSize from "nsSize.h";
using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
using mozilla::dom::ContentParentId from "mozilla/dom/ipc/IdType.h";
using struct LookAndFeelInt from "mozilla/widget/WidgetMessageUtils.h";
union ChromeRegistryItem
{
@ -691,8 +690,6 @@ parent:
sync IsSecureURI(uint32_t type, URIParams uri, uint32_t flags)
returns (bool isSecureURI);
sync GetLookAndFeelCache(LookAndFeelInt[] lookAndFeelIntCache);
PHal();
PIcc(uint32_t serviceId);

13
widget/LookAndFeel.h
View File

@ -15,12 +15,6 @@
struct gfxFontStyle;
struct LookAndFeelInt
{
int32_t id;
int32_t value;
};
namespace mozilla {
class LookAndFeel
@ -589,13 +583,6 @@ public:
* cached data would be released.
*/
static void Refresh();
/**
* If the implementation is caching values, these accessors allow the
* cache to be exported and imported.
*/
static nsTArray<LookAndFeelInt> GetIntCache();
static void SetIntCache(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache);
};
} // namespace mozilla

39
widget/WidgetMessageUtils.h
View File

@ -1,39 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_WidgetMessageUtils_h
#define mozilla_WidgetMessageUtils_h
#include "ipc/IPCMessageUtils.h"
#include "mozilla/LookAndFeel.h"
namespace IPC {
template<>
struct ParamTraits<LookAndFeelInt>
{
typedef LookAndFeelInt paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, aParam.id);
WriteParam(aMsg, aParam.value);
}
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
int32_t id, value;
if (ReadParam(aMsg, aIter, &id) &&
ReadParam(aMsg, aIter, &value)) {
aResult->id = id;
aResult->value = value;
return true;
}
return false;
}
};
} // namespace IPC
#endif // WidgetMessageUtils_h

1
widget/moz.build
View File

@ -133,7 +133,6 @@ EXPORTS.mozilla += [
EXPORTS.mozilla.widget += [
'PuppetBidiKeyboard.h',
'WidgetMessageUtils.h',
]
UNIFIED_SOURCES += [

30
widget/nsXPLookAndFeel.cpp
View File

@ -13,7 +13,6 @@
#include "nsFont.h"
#include "mozilla/Preferences.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/widget/WidgetMessageUtils.h"
#include "gfxPlatform.h"
#include "qcms.h"
@ -454,15 +453,6 @@ nsXPLookAndFeel::Init()
if (NS_SUCCEEDED(Preferences::GetBool("ui.use_native_colors", &val))) {
sUseNativeColors = val;
}
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mozilla::dom::ContentChild* cc =
mozilla::dom::ContentChild::GetSingleton();
nsTArray<LookAndFeelInt> lookAndFeelIntCache;
cc->SendGetLookAndFeelCache(lookAndFeelIntCache);
LookAndFeel::SetIntCache(lookAndFeelIntCache);
}
}
nsXPLookAndFeel::~nsXPLookAndFeel()
@ -713,12 +703,6 @@ nsXPLookAndFeel::RefreshImpl()
sCachedColorBits[i] = 0;
}
nsTArray<LookAndFeelInt>
nsXPLookAndFeel::GetIntCacheImpl()
{
return nsTArray<LookAndFeelInt>();
}
namespace mozilla {
// static
@ -779,18 +763,4 @@ LookAndFeel::Refresh()
nsLookAndFeel::GetInstance()->RefreshImpl();
}
// static
nsTArray<LookAndFeelInt>
LookAndFeel::GetIntCache()
{
return nsLookAndFeel::GetInstance()->GetIntCacheImpl();
}
// static
void
LookAndFeel::SetIntCache(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache)
{
return nsLookAndFeel::GetInstance()->SetIntCacheImpl(aLookAndFeelIntCache);
}
} // namespace mozilla

4
widget/nsXPLookAndFeel.h
View File

@ -7,7 +7,6 @@
#define __nsXPLookAndFeel
#include "mozilla/LookAndFeel.h"
#include "nsTArray.h"
class nsLookAndFeel;
@ -80,9 +79,6 @@ public:
return 600;
}
virtual nsTArray<LookAndFeelInt> GetIntCacheImpl();
virtual void SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache) {}
protected:
nsXPLookAndFeel();