Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2924013002: Rename CreateDragImage to CreateDragImageForFrame to avoid name conflicts (Closed)
Patch Set: updated Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index c4a778575e1c40c242ebde2ee37bb18e87a6b7ef..2c011a3885ebf6fe989a397d79c284a02fb88220 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -117,6 +117,9 @@ namespace {
// Converts from bounds in CSS space to device space based on the given
// frame.
+// TODO(tanvir.rizvi): DeviceSpaceBounds is used for drag related functionality
+// and is irrelevant to core functionality of LocalFrame. This should be moved
+// out of LocalFrame to appropriate place.
static FloatRect DeviceSpaceBounds(const FloatRect css_bounds,
const LocalFrame& frame) {
float device_scale_factor = frame.GetPage()->DeviceScaleFactorDeprecated();
@@ -131,7 +134,10 @@ static FloatRect DeviceSpaceBounds(const FloatRect css_bounds,
// Returns a DragImage whose bitmap contains |contents|, positioned and scaled
// in device space.
-static std::unique_ptr<DragImage> CreateDragImage(
+// TODO(tanvir.rizvi): CreateDragImageForFrame is used for drag related
+// functionality and is irrelevant to core functionality of LocalFrame. This
+// should be moved out of LocalFrame to appropriate place.
+static std::unique_ptr<DragImage> CreateDragImageForFrame(
const LocalFrame& frame,
float opacity,
RespectImageOrientationEnum image_orientation,
@@ -168,6 +174,9 @@ static std::unique_ptr<DragImage> CreateDragImage(
opacity);
}
+// TODO(tanvir.rizvi): DraggedNodeImageBuilder is used for drag related
+// functionality and is irrelevant to core functionality of LocalFrame. This
+// should be moved out of LocalFrame to appropriate place.
class DraggedNodeImageBuilder {
STACK_ALLOCATED();
@@ -228,7 +237,7 @@ class DraggedNodeImageBuilder {
border_box_properties =
*layer->GetLayoutObject().LocalBorderBoxProperties();
}
- return CreateDragImage(
+ return CreateDragImageForFrame(
*local_frame_, 1.0f,
LayoutObject::ShouldRespectImageOrientation(dragged_layout_object),
bounding_box, builder, border_box_properties);
@@ -749,11 +758,17 @@ double LocalFrame::DevicePixelRatio() const {
return ratio;
}
+// TODO(tanvir.rizvi): NodeImage is used only by DataTransfer,
+// and is irrelevant to LocalFrame core functionality, so it can be moved to
+// DataTransfer.
std::unique_ptr<DragImage> LocalFrame::NodeImage(Node& node) {
DraggedNodeImageBuilder image_node(*this, node);
return image_node.CreateImage();
}
+// TODO(tanvir.rizvi): DragImageForSelection is used only by DragController,
+// and is irrelevant to LocalFrame core functionality, so it can be moved to
+// DragController.
std::unique_ptr<DragImage> LocalFrame::DragImageForSelection(float opacity) {
if (!Selection().ComputeVisibleSelectionInDOMTreeDeprecated().IsRange())
return nullptr;
@@ -768,8 +783,9 @@ std::unique_ptr<DragImage> LocalFrame::DragImageForSelection(float opacity) {
PaintRecordBuilder builder(DeviceSpaceBounds(painting_rect, *this));
view_->PaintContents(builder.Context(), paint_flags,
EnclosingIntRect(painting_rect));
- return CreateDragImage(*this, opacity, kDoNotRespectImageOrientation,
- painting_rect, builder, PropertyTreeState::Root());
+ return CreateDragImageForFrame(*this, opacity, kDoNotRespectImageOrientation,
+ painting_rect, builder,
+ PropertyTreeState::Root());
}
String LocalFrame::SelectedText() const {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698