Backed out changeset 8be952fedc1e (bug 966395) for build bustage

This commit is contained in:
Wes Kocher 2014-07-09 16:52:12 -07:00
Родитель a705db33f2
Коммит dc8799ae2d
14 изменённых файлов: 7 добавлений и 158 удалений

Просмотреть файл

@ -152,8 +152,6 @@
#include "mozilla/dom/time/DateCacheCleaner.h" #include "mozilla/dom/time/DateCacheCleaner.h"
#include "mozilla/net/NeckoMessageUtils.h" #include "mozilla/net/NeckoMessageUtils.h"
#include "PuppetBidiKeyboard.h"
using namespace base; using namespace base;
using namespace mozilla; using namespace mozilla;
using namespace mozilla::docshell; using namespace mozilla::docshell;
@ -168,7 +166,6 @@ using namespace mozilla::ipc;
using namespace mozilla::layers; using namespace mozilla::layers;
using namespace mozilla::net; using namespace mozilla::net;
using namespace mozilla::jsipc; using namespace mozilla::jsipc;
using namespace mozilla::widget;
#if defined(MOZ_WIDGET_GONK) #if defined(MOZ_WIDGET_GONK)
using namespace mozilla::system; using namespace mozilla::system;
#endif #endif
@ -677,9 +674,8 @@ ContentChild::InitXPCOM()
if (NS_FAILED(svc->RegisterListener(mConsoleListener))) if (NS_FAILED(svc->RegisterListener(mConsoleListener)))
NS_WARNING("Couldn't register console listener for child process"); NS_WARNING("Couldn't register console listener for child process");
bool isOffline, isLangRTL; bool isOffline;
SendGetXPCOMProcessAttributes(&isOffline, &isLangRTL); SendGetXPCOMProcessAttributes(&isOffline);
RecvBidiKeyboardNotify(isLangRTL);
RecvSetOffline(isOffline); RecvSetOffline(isOffline);
DebugOnly<FileUpdateDispatcher*> observer = FileUpdateDispatcher::GetSingleton(); DebugOnly<FileUpdateDispatcher*> observer = FileUpdateDispatcher::GetSingleton();
@ -941,18 +937,6 @@ ContentChild::RecvSpeakerManagerNotify()
return false; return false;
} }
bool
ContentChild::RecvBidiKeyboardNotify(const bool& aIsLangRTL)
{
// bidi is always of type PuppetBidiKeyboard* (because in the child, the only
// possible implementation of nsIBidiKeyboard is PuppetBidiKeyboard).
PuppetBidiKeyboard* bidi = static_cast<PuppetBidiKeyboard*>(nsContentUtils::GetBidiKeyboard());
if (bidi) {
bidi->SetIsLangRTL(aIsLangRTL);
}
return true;
}
static CancelableTask* sFirstIdleTask; static CancelableTask* sFirstIdleTask;
static void FirstIdle(void) static void FirstIdle(void)

Просмотреть файл

@ -242,8 +242,6 @@ public:
virtual bool RecvSpeakerManagerNotify() MOZ_OVERRIDE; virtual bool RecvSpeakerManagerNotify() MOZ_OVERRIDE;
virtual bool RecvBidiKeyboardNotify(const bool& isLangRTL) MOZ_OVERRIDE;
virtual bool RecvNotifyVisited(const URIParams& aURI) MOZ_OVERRIDE; virtual bool RecvNotifyVisited(const URIParams& aURI) MOZ_OVERRIDE;
// auto remove when alertfinished is received. // auto remove when alertfinished is received.
nsresult AddRemoteAlertObserver(const nsString& aData, nsIObserver* aObserver); nsresult AddRemoteAlertObserver(const nsString& aData, nsIObserver* aObserver);

Просмотреть файл

@ -123,8 +123,6 @@
#include "prio.h" #include "prio.h"
#include "private/pprio.h" #include "private/pprio.h"
#include "nsBidiKeyboard.h"
#if defined(ANDROID) || defined(LINUX) #if defined(ANDROID) || defined(LINUX)
#include "nsSystemInfo.h" #include "nsSystemInfo.h"
#endif #endif
@ -2602,20 +2600,13 @@ ContentParent::RecvGetProcessAttributes(uint64_t* aId,
} }
bool bool
ContentParent::RecvGetXPCOMProcessAttributes(bool* aIsOffline, bool* aIsLangRTL) ContentParent::RecvGetXPCOMProcessAttributes(bool* aIsOffline)
{ {
nsCOMPtr<nsIIOService> io(do_GetIOService()); nsCOMPtr<nsIIOService> io(do_GetIOService());
NS_ASSERTION(io, "No IO service?"); NS_ASSERTION(io, "No IO service?");
DebugOnly<nsresult> rv = io->GetOffline(aIsOffline); DebugOnly<nsresult> rv = io->GetOffline(aIsOffline);
NS_ASSERTION(NS_SUCCEEDED(rv), "Failed getting offline?"); NS_ASSERTION(NS_SUCCEEDED(rv), "Failed getting offline?");
nsIBidiKeyboard* bidi = nsContentUtils::GetBidiKeyboard();
*aIsLangRTL = false;
if (bidi) {
bidi->IsLangRTL(aIsLangRTL);
}
return true; return true;
} }

Просмотреть файл

@ -385,7 +385,7 @@ private:
virtual bool RecvGetProcessAttributes(uint64_t* aId, virtual bool RecvGetProcessAttributes(uint64_t* aId,
bool* aIsForApp, bool* aIsForApp,
bool* aIsForBrowser) MOZ_OVERRIDE; bool* aIsForBrowser) MOZ_OVERRIDE;
virtual bool RecvGetXPCOMProcessAttributes(bool* aIsOffline, bool* aIsLangRTL) MOZ_OVERRIDE; virtual bool RecvGetXPCOMProcessAttributes(bool* aIsOffline) MOZ_OVERRIDE;
virtual bool DeallocPJavaScriptParent(mozilla::jsipc::PJavaScriptParent*) MOZ_OVERRIDE; virtual bool DeallocPJavaScriptParent(mozilla::jsipc::PJavaScriptParent*) MOZ_OVERRIDE;

Просмотреть файл

@ -361,12 +361,6 @@ child:
async SpeakerManagerNotify(); async SpeakerManagerNotify();
/**
* Communication between the PuppetBidiKeyboard and the actual
* BidiKeyboard hosted by the parent
*/
async BidiKeyboardNotify(bool isLangRTL);
async DataStoreNotify(uint32_t aAppId, nsString aName, async DataStoreNotify(uint32_t aAppId, nsString aName,
nsString aManifestURL); nsString aManifestURL);
@ -459,7 +453,7 @@ parent:
sync GetProcessAttributes() sync GetProcessAttributes()
returns (uint64_t id, bool isForApp, bool isForBrowser); returns (uint64_t id, bool isForApp, bool isForBrowser);
sync GetXPCOMProcessAttributes() sync GetXPCOMProcessAttributes()
returns (bool isOffline, bool isLangRTL); returns (bool isOffline);
sync CreateChildProcess(IPCTabContext context, sync CreateChildProcess(IPCTabContext context,
ProcessPriority priority) ProcessPriority priority)

Просмотреть файл

@ -1116,8 +1116,6 @@ private:
// We cannot access to the NSInputManager during we aren't active, so, the // We cannot access to the NSInputManager during we aren't active, so, the
// focused handler can have an IME transaction even if we are deactive. // focused handler can have an IME transaction even if we are deactive.
static IMEInputHandler* sFocusedIMEHandler; static IMEInputHandler* sFocusedIMEHandler;
static bool sCachedIsForRTLLangage;
}; };
/** /**

Просмотреть файл

@ -24,8 +24,6 @@
#include "nsCocoaUtils.h" #include "nsCocoaUtils.h"
#include "WidgetUtils.h" #include "WidgetUtils.h"
#include "nsPrintfCString.h" #include "nsPrintfCString.h"
#include "mozilla/unused.h"
#include "mozilla/dom/ContentParent.h"
#ifdef __LP64__ #ifdef __LP64__
#include "ComplexTextInputPanel.h" #include "ComplexTextInputPanel.h"
@ -2232,7 +2230,6 @@ TextInputHandler::DoCommandBySelector(const char* aSelector)
******************************************************************************/ ******************************************************************************/
bool IMEInputHandler::sStaticMembersInitialized = false; bool IMEInputHandler::sStaticMembersInitialized = false;
bool IMEInputHandler::sCachedIsForRTLLangage = false;
CFStringRef IMEInputHandler::sLatestIMEOpenedModeInputSourceID = nullptr; CFStringRef IMEInputHandler::sLatestIMEOpenedModeInputSourceID = nullptr;
IMEInputHandler* IMEInputHandler::sFocusedIMEHandler = nullptr; IMEInputHandler* IMEInputHandler::sFocusedIMEHandler = nullptr;
@ -2321,20 +2318,6 @@ IMEInputHandler::OnCurrentTextInputSourceChange(CFNotificationCenterRef aCenter,
sLastTIS = newTIS; sLastTIS = newTIS;
} }
#endif // #ifdef PR_LOGGING #endif // #ifdef PR_LOGGING
/**
* When the direction is changed, all the children are notified.
* No need to treat the initial case separately because it is covered
* by the general case (sCachedIsForRTLLangage is initially false)
*/
if (sCachedIsForRTLLangage != tis.IsForRTLLanguage()) {
nsTArray<dom::ContentParent*> children;
dom::ContentParent::GetAll(children);
for (uint32_t i = 0; i < children.Length(); i++) {
unused << children[i]->SendBidiKeyboardNotify(tis.IsForRTLLanguage());
}
sCachedIsForRTLLangage = tis.IsForRTLLanguage();
}
} }
// static // static

Просмотреть файл

@ -12,7 +12,6 @@ XPIDL_MODULE = 'widget_cocoa'
EXPORTS += [ EXPORTS += [
'mozView.h', 'mozView.h',
'nsBidiKeyboard.h',
'nsChangeObserver.h', 'nsChangeObserver.h',
'nsCocoaFeatures.h', 'nsCocoaFeatures.h',
'nsCocoaUtils.h', 'nsCocoaUtils.h',

Просмотреть файл

@ -132,8 +132,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
{ &kNS_CLIPBOARDHELPER_CID, false, NULL, nsClipboardHelperConstructor }, { &kNS_CLIPBOARDHELPER_CID, false, NULL, nsClipboardHelperConstructor },
{ &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor, { &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor,
mozilla::Module::MAIN_PROCESS_ONLY }, mozilla::Module::MAIN_PROCESS_ONLY },
{ &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor, { &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor },
mozilla::Module::MAIN_PROCESS_ONLY },
{ &kNS_THEMERENDERER_CID, false, NULL, nsNativeThemeCocoaConstructor }, { &kNS_THEMERENDERER_CID, false, NULL, nsNativeThemeCocoaConstructor },
{ &kNS_SCREENMANAGER_CID, false, NULL, nsScreenManagerCocoaConstructor }, { &kNS_SCREENMANAGER_CID, false, NULL, nsScreenManagerCocoaConstructor },
{ &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecXConstructor, { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecXConstructor,
@ -171,8 +170,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
{ "@mozilla.org/widget/clipboardhelper;1", &kNS_CLIPBOARDHELPER_CID }, { "@mozilla.org/widget/clipboardhelper;1", &kNS_CLIPBOARDHELPER_CID },
{ "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID,
mozilla::Module::MAIN_PROCESS_ONLY }, mozilla::Module::MAIN_PROCESS_ONLY },
{ "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID, { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID },
mozilla::Module::MAIN_PROCESS_ONLY },
{ "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID }, { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID },
{ "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID }, { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID },
{ "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID, { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID,

Просмотреть файл

@ -104,9 +104,6 @@
#define NS_BIDIKEYBOARD_CID \ #define NS_BIDIKEYBOARD_CID \
{ 0x9f1800ab, 0xf428, 0x4207, { 0xb4, 0x0c, 0xe8, 0x32, 0xe7, 0x7b, 0x01, 0xfc } } { 0x9f1800ab, 0xf428, 0x4207, { 0xb4, 0x0c, 0xe8, 0x32, 0xe7, 0x7b, 0x01, 0xfc } }
#define PUPPETBIDIKEYBOARD_CID \
{ 0x689e2586, 0x0344, 0x40b2, {0x83, 0x75, 0x13, 0x67, 0x2d, 0x3b, 0x71, 0x9a } }
#define NS_SCREENMANAGER_CID \ #define NS_SCREENMANAGER_CID \
{ 0xc401eb80, 0xf9ea, 0x11d3, { 0xbb, 0x6f, 0xe7, 0x32, 0xb7, 0x3e, 0xbe, 0x7c } } { 0xc401eb80, 0xf9ea, 0x11d3, { 0xbb, 0x6f, 0xe7, 0x32, 0xb7, 0x3e, 0xbe, 0x7c } }

Просмотреть файл

@ -1,46 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* vim: sw=2 ts=8 et :
*/
/* 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/. */
#include "PuppetBidiKeyboard.h"
using namespace mozilla::widget;
NS_IMPL_ISUPPORTS(PuppetBidiKeyboard, nsIBidiKeyboard)
PuppetBidiKeyboard::PuppetBidiKeyboard() : nsIBidiKeyboard()
{
}
PuppetBidiKeyboard::~PuppetBidiKeyboard()
{
}
NS_IMETHODIMP
PuppetBidiKeyboard::Reset()
{
return NS_OK;
}
NS_IMETHODIMP
PuppetBidiKeyboard::IsLangRTL(bool* aIsRTL)
{
*aIsRTL = mIsLangRTL;
return NS_OK;
}
void
PuppetBidiKeyboard::SetIsLangRTL(bool aIsLangRTL)
{
mIsLangRTL = aIsLangRTL;
}
NS_IMETHODIMP
PuppetBidiKeyboard::GetHaveBidiKeyboards(bool* aResult)
{
// not implemented yet
return NS_ERROR_NOT_IMPLEMENTED;
}

Просмотреть файл

@ -1,35 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* vim: sw=2 ts=8 et :
*/
/* 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_widget_PuppetBidiKeyboard_h_
#define mozilla_widget_PuppetBidiKeyboard_h_
#include "nsIBidiKeyboard.h"
namespace mozilla {
namespace widget {
class PuppetBidiKeyboard MOZ_FINAL : public nsIBidiKeyboard
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIBIDIKEYBOARD
PuppetBidiKeyboard();
void SetIsLangRTL(bool aIsLangRTL);
private:
~PuppetBidiKeyboard();
bool mIsLangRTL;
};
} // namespace widget
} // namespace mozilla
#endif // mozilla_widget_PuppetBidiKeyboard_h_

Просмотреть файл

@ -11,10 +11,6 @@ EXPORTS += [
'GfxInfoCollector.h', 'GfxInfoCollector.h',
] ]
EXPORTS.mozilla.widget += [
'PuppetBidiKeyboard.h',
]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'ContentHelper.cpp', 'ContentHelper.cpp',
'GfxDriverInfo.cpp', 'GfxDriverInfo.cpp',
@ -40,7 +36,6 @@ UNIFIED_SOURCES += [
'nsPrintSettingsImpl.cpp', 'nsPrintSettingsImpl.cpp',
'nsTransferable.cpp', 'nsTransferable.cpp',
'nsXPLookAndFeel.cpp', 'nsXPLookAndFeel.cpp',
'PuppetBidiKeyboard.cpp',
'PuppetWidget.cpp', 'PuppetWidget.cpp',
'WidgetUtils.cpp', 'WidgetUtils.cpp',
] ]

Просмотреть файл

@ -10,22 +10,18 @@
#include "nsClipboardProxy.h" #include "nsClipboardProxy.h"
#include "nsColorPickerProxy.h" #include "nsColorPickerProxy.h"
#include "nsFilePickerProxy.h" #include "nsFilePickerProxy.h"
#include "PuppetBidiKeyboard.h"
using namespace mozilla; using namespace mozilla;
using namespace mozilla::widget;
#ifndef MOZ_B2G #ifndef MOZ_B2G
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardProxy)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPickerProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPickerProxy)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePickerProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePickerProxy)
NS_GENERIC_FACTORY_CONSTRUCTOR(PuppetBidiKeyboard)
NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID);
NS_DEFINE_NAMED_CID(NS_COLORPICKER_CID); NS_DEFINE_NAMED_CID(NS_COLORPICKER_CID);
NS_DEFINE_NAMED_CID(NS_FILEPICKER_CID); NS_DEFINE_NAMED_CID(NS_FILEPICKER_CID);
NS_DEFINE_NAMED_CID(PUPPETBIDIKEYBOARD_CID);
static const mozilla::Module::CIDEntry kWidgetCIDs[] = { static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
{ &kNS_CLIPBOARD_CID, false, nullptr, nsClipboardProxyConstructor, { &kNS_CLIPBOARD_CID, false, nullptr, nsClipboardProxyConstructor,
@ -34,8 +30,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
Module::CONTENT_PROCESS_ONLY }, Module::CONTENT_PROCESS_ONLY },
{ &kNS_FILEPICKER_CID, false, nullptr, nsFilePickerProxyConstructor, { &kNS_FILEPICKER_CID, false, nullptr, nsFilePickerProxyConstructor,
Module::CONTENT_PROCESS_ONLY }, Module::CONTENT_PROCESS_ONLY },
{ &kPUPPETBIDIKEYBOARD_CID, false, NULL, PuppetBidiKeyboardConstructor,
mozilla::Module::CONTENT_PROCESS_ONLY },
{ nullptr } { nullptr }
}; };
@ -43,7 +37,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
{ "@mozilla.org/widget/clipboard;1", &kNS_CLIPBOARD_CID, Module::CONTENT_PROCESS_ONLY }, { "@mozilla.org/widget/clipboard;1", &kNS_CLIPBOARD_CID, Module::CONTENT_PROCESS_ONLY },
{ "@mozilla.org/colorpicker;1", &kNS_COLORPICKER_CID, Module::CONTENT_PROCESS_ONLY }, { "@mozilla.org/colorpicker;1", &kNS_COLORPICKER_CID, Module::CONTENT_PROCESS_ONLY },
{ "@mozilla.org/filepicker;1", &kNS_FILEPICKER_CID, Module::CONTENT_PROCESS_ONLY }, { "@mozilla.org/filepicker;1", &kNS_FILEPICKER_CID, Module::CONTENT_PROCESS_ONLY },
{ "@mozilla.org/widget/bidikeyboard;1", &kPUPPETBIDIKEYBOARD_CID, Module::CONTENT_PROCESS_ONLY },
{ nullptr } { nullptr }
}; };