Changeset 192475 in webkit

Timestamp:

Nov 16, 2015 9:51:48 AM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r189637. rdar://problem/22846841

Location:

branches/safari-601.1.46-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/ViewSnapshotStore.h (modified) (1 diff)

branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-16  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r189637. rdar://problem/22846841
+
+    2015-09-11  Beth Dakin  <bdakin@apple.com>
+
+            Another build fix.
+
+            * UIProcess/mac/ViewSnapshotStore.h:
+            (WebKit::ViewSnapshot::size):
+            (WebKit::ViewSnapshot::imageSizeInBytes):
+
 2015-11-13  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h

@@ -84 +84 @@
 #else
     WebCore::IntSize size() const { return m_size; }
+    size_t imageSizeInBytes() const { return m_imageSizeInBytes; }
 #endif