Changeset 207988 in webkit

Timestamp:

Oct 27, 2016, 4:18:52 AM (10 years ago)

Author:

ddkilzer@apple.com

Message:

Fix merge r207708. rdar://problem/28962914

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/MediaElementSession.cpp (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (1 diff)
• platform/graphics/IntRect.h (modified) (1 diff)
• rendering/shapes/Shape.cpp (modified) (1 diff)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  David Kilzer  <ddkilzer@apple.com>
+
+        Fix merge r207708. rdar://problem/28962914
+
+        * html/MediaElementSession.cpp:
+        (WebCore::isElementRectMostlyInMainFrame): Call unsafeGet().
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::calculateMaximumSubsamplingLevel): Call unsafeGet().
+        * platform/graphics/IntRect.h:
+        (WebCore::IntRect::area): Replace non-template area() method with template version.
+        * rendering/shapes/Shape.cpp:
+        (WebCore::Shape::createRasterShape): Call unsafeGet().
+
 2016-10-27  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp

@@ -658 +658 @@
     IntRect mainFrameRectAdjustedForScrollPosition = IntRect(-mainFrameView->documentScrollPositionRelativeToViewOrigin(), mainFrameView->contentsSize());
     IntRect elementRectInMainFrame = element.clientRect();
-    unsigned totalElementArea = elementRectInMainFrame.area();
+    unsigned totalElementArea = elementRectInMainFrame.area().unsafeGet();
     elementRectInMainFrame.intersect(mainFrameRectAdjustedForScrollPosition);
 
-    return elementRectInMainFrame.area() > totalElementArea / 2;
+    return elementRectInMainFrame.area().unsafeGet() > totalElementArea / 2;
 }
 

branches/safari-602-branch/Source/WebCore/platform/graphics/ImageSource.cpp

@@ -104 +104 @@
     
     for (SubsamplingLevel level = 0; level < maxSubsamplingLevel; ++level) {
-        if (frameSizeAtIndex(0, level).area() < maximumImageAreaBeforeSubsampling)
+        if (frameSizeAtIndex(0, level).area().unsafeGet() < maximumImageAreaBeforeSubsampling)
             return level;
     }

branches/safari-602-branch/Source/WebCore/platform/graphics/IntRect.h

@@ -86 +86 @@
     int width() const { return m_size.width(); }
     int height() const { return m_size.height(); }
-    
-    unsigned area() const { return m_size.area().unsafeGet(); }
+
+    template <typename T = WTF::CrashOnOverflow>
+    Checked<unsigned, T> area() const { return m_size.area<T>(); }
 
     void setX(int x) { m_location.setX(x); }

branches/safari-602-branch/Source/WebCore/rendering/shapes/Shape.cpp

@@ -197 +197 @@
         int maxBufferY = std::min(imageRect.height(), marginRect.maxY() - imageRect.y());
 
-        if ((imageRect.area() * 4) == pixelArrayLength) {
+        if ((imageRect.area() * 4).unsafeGet() == pixelArrayLength) {
             for (int y = minBufferY; y < maxBufferY; ++y) {
                 int startX = -1;