Bustage fix for the bustage fix for bug 626602. Namespace statement is required, so just ifdef it for IPC builds. r+a=bustage fix
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 09 Feb 2011 09:40:26 +0000
changeset 62221 280e978fc6fb4c731728255a8bc9c70ded2adbea
parent 62220 8e550551c79c3c3b829e618360a9c8a66fb94ec2
child 62222 731505d8842290e7e288f09591dfe3b0e37a0456
push id18648
push userbugzilla@standard8.plus.com
push dateWed, 09 Feb 2011 09:41:07 +0000
treeherdermozilla-central@280e978fc6fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs626602
milestone2.0b12pre
first release with
nightly win64
280e978fc6fb / 4.0b12pre / 20110209030202 / files
nightly linux32
nightly linux64
nightly mac
nightly win32
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win64
Bustage fix for the bustage fix for bug 626602. Namespace statement is required, so just ifdef it for IPC builds. r+a=bustage fix
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -234,16 +234,19 @@ using mozilla::DefaultXDisplay;
 static PRLogModuleInfo *nsObjectFrameLM = PR_NewLogModule("nsObjectFrame");
 #endif /* PR_LOGGING */
 
 #if defined(XP_MACOSX) && !defined(NP_NO_CARBON)
 #define MAC_CARBON_PLUGINS
 #endif
 
 using namespace mozilla;
+#ifdef MOZ_IPC
+using namespace mozilla::plugins;
+#endif
 using namespace mozilla::layers;
 
 // special class for handeling DOM context menu events because for
 // some reason it starves other mouse events if implemented on the
 // same class
 class nsPluginDOMContextMenuListener : public nsIDOMContextMenuListener
 {
 public: