[Services with UI] Action menu does not appear if selection includes both text and...

https://bugs.webkit.org/show_bug.cgi?id=135731
<rdar://problem/17837491>

Reviewed by Dean Jackson.

* UIProcess/WebContext.cpp:
(WebKit::WebContext::createNewWebProcess):
Initialize hasRichContentServices with the cached value.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172322 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f70a398737678aaeb21847117df04d547b676bf5..548b3d09adb0d4b7183bb6366c2cbd81ac9b958c 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-07  Tim Horton  <timothy_horton@apple.com>
+
+        [Services with UI] Action menu does not appear if selection includes both text and an image
+        https://bugs.webkit.org/show_bug.cgi?id=135731
+        <rdar://problem/17837491>
+
+        Reviewed by Dean Jackson.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::createNewWebProcess):
+        Initialize hasRichContentServices with the cached value.
+
 2014-08-07  Benjamin Poulain  <bpoulain@apple.com>
 
         Get rid of SCRIPTED_SPEECH

diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 675339acf02941e3c18f69900ceaf214c061b090..447a684ce15f5e1867e9fb0b874d9edd0b1751c8 100644 (file)
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -681,6 +681,7 @@ WebProcessProxy& WebContext::createNewWebProcess()
 #if ENABLE(SERVICE_CONTROLS)
     parameters.hasImageServices = ServicesController::shared().hasImageServices();
     parameters.hasSelectionServices = ServicesController::shared().hasSelectionServices();
+    parameters.hasRichContentServices = ServicesController::shared().hasRichContentServices();
     ServicesController::shared().refreshExistingServices(this);
 #endif