Title: [90991] trunk/Source/WebCore
- Revision
- 90991
- Author
- [email protected]
- Date
- 2011-07-14 04:05:36 -0700 (Thu, 14 Jul 2011)
Log Message
[Qt][V8] Build fix after r90830.
Reviewed by Csaba Osztrogonác.
The histogramEnumeration() function isn't available from the Qt port's
PlatformBridge.h because this function is Chromium specific.
Since the http://trac.webkit.org/changeset/90830 change we need to
guard the usage of the histogramEnumeration() function.
No new tests needed.
* bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
(WebCore::V8InspectorFrontendHost::recordActionTakenCallback):
(WebCore::V8InspectorFrontendHost::recordPanelShownCallback):
(WebCore::V8InspectorFrontendHost::recordSettingChangedCallback):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90990 => 90991)
--- trunk/Source/WebCore/ChangeLog 2011-07-14 10:06:43 UTC (rev 90990)
+++ trunk/Source/WebCore/ChangeLog 2011-07-14 11:05:36 UTC (rev 90991)
@@ -1,3 +1,21 @@
+2011-07-14 Peter Varga <[email protected]>
+
+ [Qt][V8] Build fix after r90830.
+
+ Reviewed by Csaba Osztrogonác.
+
+ The histogramEnumeration() function isn't available from the Qt port's
+ PlatformBridge.h because this function is Chromium specific.
+ Since the http://trac.webkit.org/changeset/90830 change we need to
+ guard the usage of the histogramEnumeration() function.
+
+ No new tests needed.
+
+ * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
+ (WebCore::V8InspectorFrontendHost::recordActionTakenCallback):
+ (WebCore::V8InspectorFrontendHost::recordPanelShownCallback):
+ (WebCore::V8InspectorFrontendHost::recordSettingChangedCallback):
+
2011-07-14 Yury Semikhatsky <[email protected]>
Web Inspector: show only Console and Scripts panels in shared worker inspector front-end
Modified: trunk/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp (90990 => 90991)
--- trunk/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp 2011-07-14 10:06:43 UTC (rev 90990)
+++ trunk/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp 2011-07-14 11:05:36 UTC (rev 90991)
@@ -35,7 +35,9 @@
#include "InspectorController.h"
#include "InspectorFrontendClient.h"
#include "InspectorFrontendHost.h"
+#if !PLATFORM(QT)
#include "PlatformBridge.h"
+#endif
#include "PlatformString.h"
#include "V8Binding.h"
@@ -115,6 +117,7 @@
return v8::Undefined();
}
+#if !PLATFORM(QT)
static v8::Handle<v8::Value> histogramEnumeration(const char* name, const v8::Arguments& args, int boundaryValue)
{
if (args.Length() < 1 || !args[0]->IsInt32())
@@ -126,20 +129,33 @@
return v8::Undefined();
}
+#endif
v8::Handle<v8::Value> V8InspectorFrontendHost::recordActionTakenCallback(const v8::Arguments& args)
{
+#if !PLATFORM(QT)
return histogramEnumeration("DevTools.ActionTaken", args, 100);
+#else
+ return v8::Undefined();
+#endif
}
v8::Handle<v8::Value> V8InspectorFrontendHost::recordPanelShownCallback(const v8::Arguments& args)
{
+#if !PLATFORM(QT)
return histogramEnumeration("DevTools.PanelShown", args, 20);
+#else
+ return v8::Undefined();
+#endif
}
v8::Handle<v8::Value> V8InspectorFrontendHost::recordSettingChangedCallback(const v8::Arguments& args)
{
+#if !PLATFORM(QT)
return histogramEnumeration("DevTools.SettingChanged", args, 100);
+#else
+ return v8::Undefined();
+#endif
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
