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

Side by Side Diff: sky/engine/web/WebLocalFrameImpl.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/web/WebLeakDetector.cpp ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 virtual WebLocalFrame* toWebLocalFrame() override; 63 virtual WebLocalFrame* toWebLocalFrame() override;
64 virtual void close() override; 64 virtual void close() override;
65 virtual WebSize contentsSize() const override; 65 virtual WebSize contentsSize() const override;
66 virtual bool hasVisibleContent() const override; 66 virtual bool hasVisibleContent() const override;
67 virtual WebRect visibleContentRect() const override; 67 virtual WebRect visibleContentRect() const override;
68 virtual WebView* view() const override; 68 virtual WebView* view() const override;
69 virtual WebDocument document() const override; 69 virtual WebDocument document() const override;
70 virtual void executeScript(const WebScriptSource&) override; 70 virtual void executeScript(const WebScriptSource&) override;
71 virtual void addMessageToConsole(const WebConsoleMessage&) override; 71 virtual void addMessageToConsole(const WebConsoleMessage&) override;
72 virtual void collectGarbage() override; 72 virtual void collectGarbage() override;
73 virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
74 const WebScriptSource&) override;
75 virtual v8::Handle<v8::Value> callFunctionEvenIfScriptDisabled(
76 v8::Handle<v8::Function>,
77 v8::Handle<v8::Value>,
78 int argc,
79 v8::Handle<v8::Value> argv[]) override;
80 virtual v8::Local<v8::Context> mainWorldScriptContext() const override;
81 virtual void load(const WebURL&, mojo::ScopedDataPipeConsumerHandle); 73 virtual void load(const WebURL&, mojo::ScopedDataPipeConsumerHandle);
82 virtual void replaceSelection(const WebString&) override; 74 virtual void replaceSelection(const WebString&) override;
83 virtual void insertText(const WebString&) override; 75 virtual void insertText(const WebString&) override;
84 virtual void setMarkedText(const WebString&, unsigned location, unsigned len gth) override; 76 virtual void setMarkedText(const WebString&, unsigned location, unsigned len gth) override;
85 virtual void unmarkText() override; 77 virtual void unmarkText() override;
86 virtual bool hasMarkedText() const override; 78 virtual bool hasMarkedText() const override;
87 virtual WebRange markedRange() const override; 79 virtual WebRange markedRange() const override;
88 virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const override; 80 virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const override;
89 virtual size_t characterIndexForPoint(const WebPoint&) const override; 81 virtual size_t characterIndexForPoint(const WebPoint&) const override;
90 virtual bool executeCommand(const WebString&, const WebNode& = WebNode()) ov erride; 82 virtual bool executeCommand(const WebString&, const WebNode& = WebNode()) ov erride;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // Stores the additional input events offset and scale when device metrics e mulation is enabled. 152 // Stores the additional input events offset and scale when device metrics e mulation is enabled.
161 IntSize m_inputEventsOffsetForEmulation; 153 IntSize m_inputEventsOffsetForEmulation;
162 float m_inputEventsScaleFactorForEmulation; 154 float m_inputEventsScaleFactorForEmulation;
163 }; 155 };
164 156
165 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 157 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
166 158
167 } // namespace blink 159 } // namespace blink
168 160
169 #endif // SKY_ENGINE_WEB_WEBLOCALFRAMEIMPL_H_ 161 #endif // SKY_ENGINE_WEB_WEBLOCALFRAMEIMPL_H_
OLDNEW
« no previous file with comments | « sky/engine/web/WebLeakDetector.cpp ('k') | sky/engine/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698