Title: [188078] branches/safari-601.1-branch/Source/WebKit/win
- Revision
- 188078
- Author
- dburk...@apple.com
- Date
- 2015-08-06 16:09:43 -0700 (Thu, 06 Aug 2015)
Log Message
Merge r187894. rdar://problem/15779101
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/win/ChangeLog (188077 => 188078)
--- branches/safari-601.1-branch/Source/WebKit/win/ChangeLog 2015-08-06 23:09:42 UTC (rev 188077)
+++ branches/safari-601.1-branch/Source/WebKit/win/ChangeLog 2015-08-06 23:09:43 UTC (rev 188078)
@@ -1,5 +1,16 @@
2015-08-06 Dana Burkart <dburk...@apple.com>
+ Merge r187894. rdar://problem/15779101
+
+ 2015-08-04 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows build after r187886.
+
+ * Plugins/PluginStream.h:
+ Befriend PluginView.
+
+2015-08-06 Dana Burkart <dburk...@apple.com>
+
Merge r187886. rdar://problem/15779101
2015-08-04 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h (188077 => 188078)
--- branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h 2015-08-06 23:09:42 UTC (rev 188077)
+++ branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h 2015-08-06 23:09:43 UTC (rev 188078)
@@ -116,6 +116,8 @@
NPReason m_reason;
NPStream m_stream;
PluginQuirkSet m_quirks;
+
+ friend class PluginView;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
