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

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

Issue 2934233002: In-place modification of drag related functionality present in LocalFrame (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
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 6e6ca09fc502cf82686a4eef346e100a1c46d0c3..e74d5f2bb5de532acfacb64d62a614c6b66f81c7 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -67,6 +67,7 @@
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/NavigationScheduler.h"
#include "core/page/ChromeClient.h"
+#include "core/page/DragController.h"
#include "core/page/FocusController.h"
#include "core/page/Page.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
@@ -113,15 +114,13 @@ namespace blink {
using namespace HTMLNames;
-namespace {
-
// Converts from bounds in CSS space to device space based on the given
Xiaocheng 2017/06/16 18:10:48 nit: It's better to add a note here to indicate th
tanvir 2017/06/19 07:01:33 Done.
// 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) {
+FloatRect DataTransfer::DeviceSpaceBounds(const FloatRect css_bounds,
+ const LocalFrame& frame) {
float device_scale_factor = frame.GetPage()->DeviceScaleFactorDeprecated();
float page_scale_factor = frame.GetPage()->GetVisualViewport().Scale();
FloatRect device_bounds(css_bounds);
@@ -137,7 +136,7 @@ static FloatRect DeviceSpaceBounds(const FloatRect css_bounds,
// 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(
+std::unique_ptr<DragImage> DataTransfer::CreateDragImageForFrame(
Xiaocheng 2017/06/16 18:10:48 Ditto.
tanvir 2017/06/19 07:01:33 Done.
const LocalFrame& frame,
float opacity,
RespectImageOrientationEnum image_orientation,
@@ -174,6 +173,8 @@ static std::unique_ptr<DragImage> CreateDragImageForFrame(
opacity);
}
+namespace {
+
// 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.
@@ -230,14 +231,15 @@ class DraggedNodeImageBuilder {
PaintLayerFlags flags = kPaintLayerHaveTransparency |
kPaintLayerAppliedTransform |
kPaintLayerUncachedClipRects;
- PaintRecordBuilder builder(DeviceSpaceBounds(bounding_box, *local_frame_));
+ PaintRecordBuilder builder(
+ DataTransfer::DeviceSpaceBounds(bounding_box, *local_frame_));
PaintLayerPainter(*layer).Paint(builder.Context(), painting_info, flags);
PropertyTreeState border_box_properties = PropertyTreeState::Root();
if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) {
border_box_properties =
*layer->GetLayoutObject().LocalBorderBoxProperties();
}
- return CreateDragImageForFrame(
+ return DataTransfer::CreateDragImageForFrame(
*local_frame_, 1.0f,
LayoutObject::ShouldRespectImageOrientation(dragged_layout_object),
bounding_box, builder, border_box_properties);
@@ -762,31 +764,35 @@ double LocalFrame::DevicePixelRatio() const {
// 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);
+std::unique_ptr<DragImage> DataTransfer::NodeImage(const LocalFrame& frame,
Xiaocheng 2017/06/16 18:10:47 Ditto.
tanvir 2017/06/19 07:01:33 Done.
tanvir 2017/06/19 07:01:33 Done.
+ Node& node) {
+ DraggedNodeImageBuilder image_node(frame, 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())
+std::unique_ptr<DragImage> DragController::DragImageForSelection(
Xiaocheng 2017/06/16 18:10:47 Ditto.
tanvir 2017/06/19 07:01:33 Done.
+ const LocalFrame& frame,
+ float opacity) {
+ if (!frame.Selection().ComputeVisibleSelectionInDOMTreeDeprecated().IsRange())
return nullptr;
- view_->UpdateAllLifecyclePhasesExceptPaint();
- DCHECK(GetDocument()->IsActive());
+ frame.View()->UpdateAllLifecyclePhasesExceptPaint();
+ DCHECK(frame.GetDocument()->IsActive());
- FloatRect painting_rect = FloatRect(Selection().Bounds());
+ FloatRect painting_rect = FloatRect(frame.Selection().Bounds());
GlobalPaintFlags paint_flags =
kGlobalPaintSelectionOnly | kGlobalPaintFlattenCompositingLayers;
- PaintRecordBuilder builder(DeviceSpaceBounds(painting_rect, *this));
- view_->PaintContents(builder.Context(), paint_flags,
- EnclosingIntRect(painting_rect));
- return CreateDragImageForFrame(*this, opacity, kDoNotRespectImageOrientation,
- painting_rect, builder,
- PropertyTreeState::Root());
+ PaintRecordBuilder builder(
+ DataTransfer::DeviceSpaceBounds(painting_rect, frame));
+ frame.View()->PaintContents(builder.Context(), paint_flags,
+ EnclosingIntRect(painting_rect));
+ return DataTransfer::CreateDragImageForFrame(
+ frame, opacity, kDoNotRespectImageOrientation, painting_rect, builder,
+ PropertyTreeState::Root());
}
String LocalFrame::SelectedText() const {

Powered by Google App Engine
This is Rietveld 408576698