Title: [117920] trunk/Tools
- Revision
- 117920
- Author
- [email protected]
- Date
- 2012-05-22 00:13:52 -0700 (Tue, 22 May 2012)
Log Message
[chromium] WebViewHost should use ENABLE guards for some features.
https://bugs.webkit.org/show_bug.cgi?id=87087
Patch by Hao Zheng <[email protected]> on 2012-05-22
Reviewed by Kent Tamura.
These features are disabled on OS(ANDROID) and so shouldn't be
compiled when the feature is off.
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::reset):
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (117919 => 117920)
--- trunk/Tools/ChangeLog 2012-05-22 07:10:51 UTC (rev 117919)
+++ trunk/Tools/ChangeLog 2012-05-22 07:13:52 UTC (rev 117920)
@@ -1,3 +1,18 @@
+2012-05-22 Hao Zheng <[email protected]>
+
+ [chromium] WebViewHost should use ENABLE guards for some features.
+ https://bugs.webkit.org/show_bug.cgi?id=87087
+
+ Reviewed by Kent Tamura.
+
+ These features are disabled on OS(ANDROID) and so shouldn't be
+ compiled when the feature is off.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::reset):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-05-21 Christophe Dumez <[email protected]>
[EFL] EFL's DumpRenderTree does not print didReceiveTitle messages
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (117919 => 117920)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-05-22 07:10:51 UTC (rev 117919)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-05-22 07:13:52 UTC (rev 117920)
@@ -676,10 +676,12 @@
}
}
+#if ENABLE(NOTIFICATIONS)
WebNotificationPresenter* WebViewHost::notificationPresenter()
{
return m_shell->notificationPresenter();
}
+#endif
WebKit::WebGeolocationClient* WebViewHost::geolocationClient()
{
@@ -693,12 +695,14 @@
return m_geolocationClientMock.get();
}
+#if ENABLE(INPUT_SPEECH)
WebSpeechInputController* WebViewHost::speechInputController(WebKit::WebSpeechInputListener* listener)
{
if (!m_speechInputControllerMock)
m_speechInputControllerMock = MockWebSpeechInputController::create(listener);
return m_speechInputControllerMock.get();
}
+#endif
WebDeviceOrientationClientMock* WebViewHost::deviceOrientationClientMock()
{
@@ -1457,8 +1461,10 @@
if (m_geolocationClientMock.get())
m_geolocationClientMock->resetMock();
+#if ENABLE(INPUT_SPEECH)
if (m_speechInputControllerMock.get())
m_speechInputControllerMock->clearResults();
+#endif
m_currentCursor = WebCursorInfo();
m_windowRect = WebRect();
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (117919 => 117920)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-05-22 07:10:51 UTC (rev 117919)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-05-22 07:13:52 UTC (rev 117920)
@@ -111,7 +111,9 @@
WebKit::WebContextMenuData* lastContextMenuData() const;
void clearContextMenuData();
+#if ENABLE(INPUT_SPEECH)
MockWebSpeechInputController* speechInputControllerMock() { return m_speechInputControllerMock.get(); }
+#endif
#if ENABLE(POINTER_LOCK)
void didLosePointerLock();
@@ -162,9 +164,13 @@
virtual int historyBackListCount();
virtual int historyForwardListCount();
virtual void postAccessibilityNotification(const WebKit::WebAccessibilityObject&, WebKit::WebAccessibilityNotification);
+#if ENABLE(NOTIFICATIONS)
virtual WebKit::WebNotificationPresenter* notificationPresenter();
+#endif
virtual WebKit::WebGeolocationClient* geolocationClient();
+#if ENABLE(INPUT_SPEECH)
virtual WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);
+#endif
virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
#if ENABLE(MEDIA_STREAM)
virtual WebKit::WebUserMediaClient* userMediaClient();
@@ -397,7 +403,9 @@
OwnPtr<WebKit::WebGeolocationClientMock> m_geolocationClientMock;
OwnPtr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationClientMock;
+#if ENABLE(INPUT_SPEECH)
OwnPtr<MockWebSpeechInputController> m_speechInputControllerMock;
+#endif
#if ENABLE(MEDIA_STREAM)
OwnPtr<WebKit::WebUserMediaClientMock> m_userMediaClientMock;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
