Title: [110767] branches/safari-534.55-branch
Diff
Modified: branches/safari-534.55-branch/Source/WebCore/ChangeLog (110766 => 110767)
--- branches/safari-534.55-branch/Source/WebCore/ChangeLog 2012-03-14 22:13:59 UTC (rev 110766)
+++ branches/safari-534.55-branch/Source/WebCore/ChangeLog 2012-03-14 22:15:09 UTC (rev 110767)
@@ -1,5 +1,23 @@
2012-03-14 Lucas Forschler <[email protected]>
+ Merge 110196
+
+ 2012-03-08 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10981173> Dashboard regions should not be in device space
+
+ Reviewed by John Sullivan.
+
+ Test: TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addDashboardRegions): Stop applying the device scale factor to
+ Dashboard regions.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::addDashboardRegions): Ditto.
+
+2012-03-14 Lucas Forschler <[email protected]>
+
Merge 110480
2012-03-12 Beth Dakin <[email protected]>
Modified: branches/safari-534.55-branch/Source/WebCore/rendering/RenderInline.cpp (110766 => 110767)
--- branches/safari-534.55-branch/Source/WebCore/rendering/RenderInline.cpp 2012-03-14 22:13:59 UTC (rev 110766)
+++ branches/safari-534.55-branch/Source/WebCore/rendering/RenderInline.cpp 2012-03-14 22:15:09 UTC (rev 110767)
@@ -1548,14 +1548,6 @@
region.bounds.setX(absPos.x() + region.bounds.x());
region.bounds.setY(absPos.y() + region.bounds.y());
- if (frame()) {
- float deviceScaleFactor = frame()->page()->deviceScaleFactor();
- if (deviceScaleFactor != 1.0f) {
- region.bounds.scale(deviceScaleFactor);
- region.clip.scale(deviceScaleFactor);
- }
- }
-
regions.append(region);
}
}
Modified: branches/safari-534.55-branch/Source/WebCore/rendering/RenderObject.cpp (110766 => 110767)
--- branches/safari-534.55-branch/Source/WebCore/rendering/RenderObject.cpp 2012-03-14 22:13:59 UTC (rev 110766)
+++ branches/safari-534.55-branch/Source/WebCore/rendering/RenderObject.cpp 2012-03-14 22:15:09 UTC (rev 110767)
@@ -2425,14 +2425,6 @@
region.bounds.setX(absPos.x() + styleRegion.offset.left().value());
region.bounds.setY(absPos.y() + styleRegion.offset.top().value());
- if (frame()) {
- float deviceScaleFactor = frame()->page()->deviceScaleFactor();
- if (deviceScaleFactor != 1.0f) {
- region.bounds.scale(deviceScaleFactor);
- region.clip.scale(deviceScaleFactor);
- }
- }
-
regions.append(region);
}
}
Modified: branches/safari-534.55-branch/Tools/ChangeLog (110766 => 110767)
--- branches/safari-534.55-branch/Tools/ChangeLog 2012-03-14 22:13:59 UTC (rev 110766)
+++ branches/safari-534.55-branch/Tools/ChangeLog 2012-03-14 22:15:09 UTC (rev 110767)
@@ -1,3 +1,19 @@
+2012-03-14 Lucas Forschler <[email protected]>
+
+ Merge 110196
+
+ 2012-03-08 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10981173> Dashboard regions should not be in device space
+
+ Reviewed by John Sullivan.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm: Added.
+ (-[DeviceScaleFactorInDashboardRegionsUIDelegate webView:dashboardRegionsChanged:]):
+ (TestWebKitAPI):
+ (TestWebKitAPI::TEST):
+
2011-1-13 Lucas Forschler <[email protected]>
Merge 104239
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
