summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.cc
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 19:22:27 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 19:22:27 +0000
commit961331ed07e81a9505df718ca0210b8beee18cf4 (patch)
treeb3db3359c88c8c84e7f3ab846ad64c202350968a /webkit/glue/webframe_impl.cc
parent348646d70dcd3bfbe9c0664ef6033e528943e7d5 (diff)
downloadchromium_src-961331ed07e81a9505df718ca0210b8beee18cf4.zip
chromium_src-961331ed07e81a9505df718ca0210b8beee18cf4.tar.gz
chromium_src-961331ed07e81a9505df718ca0210b8beee18cf4.tar.bz2
Hook up inspector highlighting again. This time we use
upstream's drawNodeHighlight methods. BUG=5178 Review URL: http://codereview.chromium.org/31010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r--webkit/glue/webframe_impl.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 81af58d..a2ecb7e 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -94,6 +94,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "HTMLHeadElement.h"
#include "HTMLLinkElement.h"
#include "HistoryItem.h"
+#include "InspectorController.h"
#include "markup.h"
#include "Page.h"
#include "PlatformContextSkia.h"
@@ -289,7 +290,6 @@ MSVC_PUSH_DISABLE_WARNING(4355)
MSVC_POP_WARNING()
currently_loading_request_(NULL),
plugin_delegate_(NULL),
- inspected_node_(NULL),
active_match_frame_(NULL),
active_match_index_(-1),
locating_active_rect_(false),
@@ -954,10 +954,6 @@ void WebFrameImpl::InvalidateIfNecessary() {
}
}
-void WebFrameImpl::selectNodeFromInspector(WebCore::Node* node) {
- inspected_node_ = node;
-}
-
void WebFrameImpl::AddMarker(WebCore::Range* range) {
// Use a TextIterator to visit the potentially multiple nodes the range
// covers.
@@ -1457,6 +1453,7 @@ void WebFrameImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) {
#endif
if (frame_->document() && frameview()) {
frameview()->paint(&gc, dirty_rect);
+ frame_->page()->inspectorController()->drawNodeHighlight(gc);
} else {
gc.fillRect(dirty_rect, Color::white);
}