OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 #include "platform/scroll/ScrollbarTheme.h" | 121 #include "platform/scroll/ScrollbarTheme.h" |
122 #include "platform/weborigin/SchemeRegistry.h" | 122 #include "platform/weborigin/SchemeRegistry.h" |
123 #include "public/platform/Platform.h" | 123 #include "public/platform/Platform.h" |
124 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h" | 124 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h" |
125 #include "public/platform/WebCompositorSupport.h" | 125 #include "public/platform/WebCompositorSupport.h" |
126 #include "public/platform/WebDragData.h" | 126 #include "public/platform/WebDragData.h" |
127 #include "public/platform/WebFloatPoint.h" | 127 #include "public/platform/WebFloatPoint.h" |
128 #include "public/platform/WebGestureCurve.h" | 128 #include "public/platform/WebGestureCurve.h" |
129 #include "public/platform/WebImage.h" | 129 #include "public/platform/WebImage.h" |
130 #include "public/platform/WebLayerTreeView.h" | 130 #include "public/platform/WebLayerTreeView.h" |
| 131 #include "public/platform/WebScheduler.h" |
131 #include "public/platform/WebURLRequest.h" | 132 #include "public/platform/WebURLRequest.h" |
132 #include "public/platform/WebVector.h" | 133 #include "public/platform/WebVector.h" |
133 #include "public/platform/WebViewScheduler.h" | 134 #include "public/platform/WebViewScheduler.h" |
134 #include "public/web/WebAXObject.h" | 135 #include "public/web/WebAXObject.h" |
135 #include "public/web/WebActiveWheelFlingParameters.h" | 136 #include "public/web/WebActiveWheelFlingParameters.h" |
136 #include "public/web/WebAutofillClient.h" | 137 #include "public/web/WebAutofillClient.h" |
137 #include "public/web/WebElement.h" | 138 #include "public/web/WebElement.h" |
138 #include "public/web/WebFrame.h" | 139 #include "public/web/WebFrame.h" |
139 #include "public/web/WebFrameClient.h" | 140 #include "public/web/WebFrameClient.h" |
140 #include "public/web/WebHitTestResult.h" | 141 #include "public/web/WebHitTestResult.h" |
(...skipping 4421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4562 { | 4563 { |
4563 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4564 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
4564 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4565 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
4565 if (!page()) | 4566 if (!page()) |
4566 return 1; | 4567 return 1; |
4567 | 4568 |
4568 return page()->deviceScaleFactor(); | 4569 return page()->deviceScaleFactor(); |
4569 } | 4570 } |
4570 | 4571 |
4571 } // namespace blink | 4572 } // namespace blink |
OLD | NEW |