Index: webkit/glue/webframe_impl.h |
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h |
index 61751cb8ad6e6af69bc4922eb258986f7cd93f9d..fd887d587c79ce542ab1bff6435d78109c012412 100644 |
--- a/webkit/glue/webframe_impl.h |
+++ b/webkit/glue/webframe_impl.h |
@@ -299,6 +299,10 @@ class WebFrameImpl : public WebFrame { |
WebFrameLoaderClient frame_loader_client_; |
+ // This is a factory for creating cancelable tasks for this frame that run |
+ // asynchronously in order to scope string matches during a find operation. |
+ ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_; |
+ |
// Holding a reference back to the WebViewImpl is necessary to ensure that |
// its HWND is not destroyed before all of the WebCore::Widgets, which refer |
// to the WebViewImpl's HWND as their containingWindow. However, this ref |
@@ -331,12 +335,16 @@ class WebFrameImpl : public WebFrame { |
// Handling requests from TextInputController on this frame. |
scoped_ptr<WebTextInputImpl> webtextinput_impl_; |
+ // The node selected in the web inspector. Used for highlighting it on the page. |
+ WebCore::Node* inspected_node_; |
+ |
// This vector maintains a list of Ranges representing locations for search |
// string matches that were found in the frame during a FindInPage operation. |
Vector<RefPtr<WebCore::Range> > tickmarks_; |
- // The node selected in the web inspector. Used for highlighting it on the page. |
- WebCore::Node* inspected_node_; |
+ // A way for the main frame to keep track of which frame has an active |
+ // tickmark. Should be NULL for all other frames. |
+ WebFrameImpl* active_tickmark_frame_; |
// The index of the active tickmark for the current frame. |
size_t active_tickmark_; |
@@ -381,10 +389,6 @@ class WebFrameImpl : public WebFrame { |
// (on the main frame only). It should be -1 for all other frames. |
int total_matchcount_; |
- // A way for the main frame to keep track of which frame has an active |
- // tickmark. Should be NULL for all other frames. |
- WebFrameImpl* active_tickmark_frame_; |
- |
// This variable keeps a cumulative total of how many frames are currently |
// scoping, and is incremented/decremented on the main frame only. |
// It should be -1 for all other frames. |
@@ -398,10 +402,6 @@ class WebFrameImpl : public WebFrame { |
// and the frame area. |
int next_invalidate_after_; |
- // This is a factory for creating cancelable tasks for this frame that run |
- // asynchronously in order to scope string matches during a find operation. |
- ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_; |
- |
private: |
// A bit mask specifying area of the frame to invalidate. |
enum AreaToInvalidate { |