Chromium Code Reviews| Index: headless/public/headless_web_frame.h |
| diff --git a/headless/public/web_frame.h b/headless/public/headless_web_frame.h |
| similarity index 85% |
| rename from headless/public/web_frame.h |
| rename to headless/public/headless_web_frame.h |
| index c8e5307180cc218e6b92f725c0d3e7dbb487966f..6ab7e71bdf8d97c9683bf1e07d4be004d7655c01 100644 |
| --- a/headless/public/web_frame.h |
| +++ b/headless/public/headless_web_frame.h |
| @@ -2,23 +2,22 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef HEADLESS_PUBLIC_WEB_FRAME_H_ |
| -#define HEADLESS_PUBLIC_WEB_FRAME_H_ |
| +#ifndef HEADLESS_PUBLIC_HEADLESS_WEB_FRAME_H_ |
| +#define HEADLESS_PUBLIC_HEADLESS_WEB_FRAME_H_ |
| #include "base/callback.h" |
| #include "base/macros.h" |
| #include "base/values.h" |
| #include "headless/public/headless_export.h" |
| +#include "ui/gfx/geometry/size.h" |
| namespace headless { |
| -class WebDocument; |
| - |
| // Class representing a frame in a web page (e.g. main frame or an iframe). |
| // Should be accessed from renderer main thread. |
| -class HEADLESS_EXPORT WebFrame { |
| +class HEADLESS_EXPORT HeadlessWebFrame { |
| public: |
| - virtual ~WebFrame() {} |
| + virtual ~HeadlessWebFrame() {} |
| using ScriptExecutionCallback = |
| base::Callback<void(const std::vector<scoped_ptr<base::Value>>&)>; |
| @@ -46,7 +45,6 @@ class HEADLESS_EXPORT WebFrame { |
| virtual std::string ContentAsText(size_t max_chars) const = 0; |
| virtual std::string ContentAsMarkup() const = 0; |
| - virtual proto::Document ContentAsProtobuf() const = 0; |
| virtual gfx::Size GetScrollOffset() const = 0; |
|
pfeldman
2016/02/09 19:49:51
Are these provisional or are there clients for the
Sami
2016/02/09 21:40:51
PhantomJS at least exposes these, not sure if anyo
|
| virtual void SetScrollOffset(const gfx::Size& offset) = 0; |
| @@ -54,10 +52,13 @@ class HEADLESS_EXPORT WebFrame { |
| virtual float GetPageScaleFactor() const = 0; |
|
pfeldman
2016/02/09 19:49:51
ditto
Sami
2016/02/09 21:40:51
Same for these. Perhaps the emulation path could h
|
| virtual void SetPageScaleFactor(float page_scale_factor) = 0; |
| + protected: |
| + HeadlessWebFrame() {} |
| + |
| private: |
| - DISALLOW_COPY_AND_ASSIGN(WebFrame); |
| + DISALLOW_COPY_AND_ASSIGN(HeadlessWebFrame); |
| }; |
| } // namespace headless |
| -#endif // HEADLESS_PUBLIC_WEB_FRAME_H_ |
| +#endif // HEADLESS_PUBLIC_HEADLESS_WEB_FRAME_H_ |