Title: [171463] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171463
- Author
- [email protected]
- Date
- 2014-07-23 01:26:56 -0700 (Wed, 23 Jul 2014)
Log Message
Merged r171373. <rdar://problem/17654369>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171462 => 171463)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:23:28 UTC (rev 171462)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:26:56 UTC (rev 171463)
@@ -1,5 +1,18 @@
2014-07-23 Lucas Forschler <[email protected]>
+ Merge r171373
+
+ 2014-07-22 Jinwoo Song <[email protected]>
+
+ Unreviewed build fix on EFL port after r171356.
+
+ Implement a dummy platformMediaCacheDirectory() to avoid undefined reference error.
+
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::platformMediaCacheDirectory):
+
+2014-07-23 Lucas Forschler <[email protected]>
+
Merge r171356
2014-07-22 Oliver Hunt <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (171462 => 171463)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-07-23 08:23:28 UTC (rev 171462)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-07-23 08:26:56 UTC (rev 171463)
@@ -138,6 +138,12 @@
return String();
}
+String WebContext::platformMediaCacheDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
{
notImplemented();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
