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

Side by Side Diff: third_party/WebKit/Source/web/DevToolsEmulator.cpp

Issue 2896563002: Update WebLocalFrameImpl with WebLocalFrameBase to break dependencies. (Closed)
Patch Set: Rebase Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "web/DevToolsEmulator.h" 5 #include "web/DevToolsEmulator.h"
6 6
7 #include "core/events/WebInputEventConversion.h" 7 #include "core/events/WebInputEventConversion.h"
8 #include "core/exported/WebViewBase.h" 8 #include "core/exported/WebViewBase.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/Settings.h" 10 #include "core/frame/Settings.h"
11 #include "core/frame/VisualViewport.h" 11 #include "core/frame/VisualViewport.h"
12 #include "core/frame/WebLocalFrameBase.h"
12 #include "core/input/EventHandler.h" 13 #include "core/input/EventHandler.h"
13 #include "core/page/Page.h" 14 #include "core/page/Page.h"
14 #include "core/style/ComputedStyle.h" 15 #include "core/style/ComputedStyle.h"
15 #include "platform/RuntimeEnabledFeatures.h" 16 #include "platform/RuntimeEnabledFeatures.h"
16 #include "platform/geometry/FloatRect.h" 17 #include "platform/geometry/FloatRect.h"
17 #include "platform/geometry/FloatSize.h" 18 #include "platform/geometry/FloatSize.h"
18 #include "platform/geometry/IntRect.h" 19 #include "platform/geometry/IntRect.h"
19 #include "platform/geometry/IntSize.h" 20 #include "platform/geometry/IntSize.h"
20 #include "platform/graphics/GraphicsLayer.h" 21 #include "platform/graphics/GraphicsLayer.h"
21 #include "platform/loader/fetch/MemoryCache.h" 22 #include "platform/loader/fetch/MemoryCache.h"
22 #include "platform/wtf/PtrUtil.h" 23 #include "platform/wtf/PtrUtil.h"
23 #include "public/platform/WebLayerTreeView.h" 24 #include "public/platform/WebLayerTreeView.h"
24 #include "web/WebLocalFrameImpl.h"
25 #include "web/WebSettingsImpl.h" 25 #include "web/WebSettingsImpl.h"
26 26
27 namespace { 27 namespace {
28 28
29 static float calculateDeviceScaleAdjustment(int width, 29 static float calculateDeviceScaleAdjustment(int width,
30 int height, 30 int height,
31 float deviceScaleFactor) { 31 float deviceScaleFactor) {
32 // Chromium on Android uses a device scale adjustment for fonts used in text 32 // Chromium on Android uses a device scale adjustment for fonts used in text
33 // autosizing for improved legibility. This function computes this adjusted 33 // autosizing for improved legibility. This function computes this adjusted
34 // value for text autosizing. 34 // value for text autosizing.
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 ToIntSize(*last_pinch_anchor_css_.get() - ToIntSize(anchor_css))); 547 ToIntSize(*last_pinch_anchor_css_.get() - ToIntSize(anchor_css)));
548 } 548 }
549 if (scaled_event.GetType() == WebInputEvent::kGesturePinchEnd) { 549 if (scaled_event.GetType() == WebInputEvent::kGesturePinchEnd) {
550 last_pinch_anchor_css_.reset(); 550 last_pinch_anchor_css_.reset();
551 last_pinch_anchor_dip_.reset(); 551 last_pinch_anchor_dip_.reset();
552 } 552 }
553 return true; 553 return true;
554 } 554 }
555 555
556 } // namespace blink 556 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/WebLocalFrameBase.h ('k') | third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698