Title: [192475] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 192475
- Author
- matthew_han...@apple.com
- Date
- 2015-11-16 09:51:48 -0800 (Mon, 16 Nov 2015)
Log Message
Merge r189637. rdar://problem/22846841
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (192474 => 192475)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-16 17:31:38 UTC (rev 192474)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-16 17:51:48 UTC (rev 192475)
@@ -1,3 +1,15 @@
+2015-11-16 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r189637. rdar://problem/22846841
+
+ 2015-09-11 Beth Dakin <bda...@apple.com>
+
+ Another build fix.
+
+ * UIProcess/mac/ViewSnapshotStore.h:
+ (WebKit::ViewSnapshot::size):
+ (WebKit::ViewSnapshot::imageSizeInBytes):
+
2015-11-13 Matthew Hanson <matthew_han...@apple.com>
Merge r191872. rdar://problem/23395972
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h (192474 => 192475)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-11-16 17:31:38 UTC (rev 192474)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-11-16 17:51:48 UTC (rev 192475)
@@ -83,6 +83,7 @@
void setSurface(std::unique_ptr<WebCore::IOSurface>);
#else
WebCore::IntSize size() const { return m_size; }
+ size_t imageSizeInBytes() const { return m_imageSizeInBytes; }
#endif
private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
