Diff
Modified: trunk/Source/WebCore/ChangeLog (153492 => 153493)
--- trunk/Source/WebCore/ChangeLog 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebCore/ChangeLog 2013-07-30 21:27:09 UTC (rev 153493)
@@ -1,3 +1,16 @@
+2013-07-30 Tim Horton <[email protected]>
+
+ Fix typo in enum name ("SelectionInSnaphot" -> "SelectionInSnapshot")
+ https://bugs.webkit.org/show_bug.cgi?id=119275
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.exp.in:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintContentsForSnapshot):
+ * page/FrameView.h:
+ Fix typo.
+
2013-07-30 Alex Christensen <[email protected]>
Compile fix for WebGL on 32-bit Windows.
Modified: trunk/Source/WebCore/WebCore.exp.in (153492 => 153493)
--- trunk/Source/WebCore/WebCore.exp.in 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-07-30 21:27:09 UTC (rev 153493)
@@ -1172,7 +1172,7 @@
__ZN7WebCore9FrameView22setBaseBackgroundColorERKNS_5ColorE
__ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
__ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeES3_fNS_19AdjustViewSizeOrNotE
-__ZN7WebCore9FrameView24paintContentsForSnapshotEPNS_15GraphicsContextERKNS_7IntRectENS0_18SelectionInSnaphotENS0_26CoordinateSpaceForSnapshotE
+__ZN7WebCore9FrameView24paintContentsForSnapshotEPNS_15GraphicsContextERKNS_7IntRectENS0_19SelectionInSnapshotENS0_26CoordinateSpaceForSnapshotE
__ZN7WebCore9FrameView24setScrollPinningBehaviorENS_21ScrollPinningBehaviorE
__ZN7WebCore9FrameView26adjustPageHeightDeprecatedEPffff
__ZN7WebCore9FrameView26adjustTiledBackingCoverageEv
Modified: trunk/Source/WebCore/page/FrameView.cpp (153492 => 153493)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-07-30 21:27:09 UTC (rev 153493)
@@ -3672,7 +3672,7 @@
m_nodeToDraw = node;
}
-void FrameView::paintContentsForSnapshot(GraphicsContext* context, const IntRect& imageRect, SelectionInSnaphot shouldPaintSelection, CoordinateSpaceForSnapshot coordinateSpace)
+void FrameView::paintContentsForSnapshot(GraphicsContext* context, const IntRect& imageRect, SelectionInSnapshot shouldPaintSelection, CoordinateSpaceForSnapshot coordinateSpace)
{
updateLayoutAndStyleIfNeededRecursive();
Modified: trunk/Source/WebCore/page/FrameView.h (153492 => 153493)
--- trunk/Source/WebCore/page/FrameView.h 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebCore/page/FrameView.h 2013-07-30 21:27:09 UTC (rev 153493)
@@ -277,9 +277,9 @@
void setLastPaintTime(double lastPaintTime) { m_lastPaintTime = lastPaintTime; }
void setNodeToDraw(Node*);
- enum SelectionInSnaphot { IncludeSelection, ExcludeSelection };
+ enum SelectionInSnapshot { IncludeSelection, ExcludeSelection };
enum CoordinateSpaceForSnapshot { DocumentCoordinates, ViewCoordinates };
- void paintContentsForSnapshot(GraphicsContext*, const IntRect& imageRect, SelectionInSnaphot shouldPaintSelection, CoordinateSpaceForSnapshot);
+ void paintContentsForSnapshot(GraphicsContext*, const IntRect& imageRect, SelectionInSnapshot shouldPaintSelection, CoordinateSpaceForSnapshot);
virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
Modified: trunk/Source/WebKit2/ChangeLog (153492 => 153493)
--- trunk/Source/WebKit2/ChangeLog 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-30 21:27:09 UTC (rev 153493)
@@ -1,3 +1,16 @@
+2013-07-30 Tim Horton <[email protected]>
+
+ Fix typo in enum name ("SelectionInSnaphot" -> "SelectionInSnapshot")
+ https://bugs.webkit.org/show_bug.cgi?id=119275
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+ (WebKit::imageForRect):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaledSnapshotWithOptions):
+ Fix typo.
+
2013-07-30 Anders Carlsson <[email protected]>
Plug-in process crashes if plug-in is destroyed as a result of sending NPObjectMessageReceiver::Deallocate
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (153492 => 153493)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2013-07-30 21:27:09 UTC (rev 153493)
@@ -139,7 +139,7 @@
graphicsContext->applyDeviceScaleFactor(scaleFactor);
graphicsContext->translate(-rect.x(), -rect.y());
- FrameView::SelectionInSnaphot shouldPaintSelection = FrameView::IncludeSelection;
+ FrameView::SelectionInSnapshot shouldPaintSelection = FrameView::IncludeSelection;
if (options & SnapshotOptionsExcludeSelectionHighlighting)
shouldPaintSelection = FrameView::ExcludeSelection;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153492 => 153493)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-30 21:19:23 UTC (rev 153492)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-30 21:27:09 UTC (rev 153493)
@@ -1523,7 +1523,7 @@
graphicsContext->applyDeviceScaleFactor(combinedScaleFactor);
graphicsContext->translate(-rect.x(), -rect.y());
- FrameView::SelectionInSnaphot shouldPaintSelection = FrameView::IncludeSelection;
+ FrameView::SelectionInSnapshot shouldPaintSelection = FrameView::IncludeSelection;
if (options & SnapshotOptionsExcludeSelectionHighlighting)
shouldPaintSelection = FrameView::ExcludeSelection;
