Fix nwjs#2592: zoomLevel

rogerwang · rogerwang · commit e8d922339973 · 2014-11-13T22:04:11.000+08:00
diff --git a/src/api/dispatcher.cc b/src/api/dispatcher.cc
@@ -136,12 +136,10 @@ v8::Handle<v8::Value> Dispatcher::GetWindowId(blink::WebFrame* frame) {
   return val;
 }
 
-#if 0 //FIXME
-void Dispatcher::ZoomLevelChanged() {
+void Dispatcher::ZoomLevelChanged(blink::WebView* web_view) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope scope(isolate);
 
-  blink::WebView* web_view = render_view()->GetWebView();
   float zoom_level = web_view->zoomLevel();
 
   v8::Handle<v8::Value> val = GetWindowId(web_view->mainFrame());
@@ -161,7 +159,6 @@ void Dispatcher::ZoomLevelChanged() {
 
   node::MakeCallback(isolate, objects_registry, "handleEvent", 3, argv);
 }
-#endif
 
 void Dispatcher::DidCreateDocumentElement(blink::WebLocalFrame* frame) {
   documentCallback("document-start", frame);
diff --git a/src/api/dispatcher.h b/src/api/dispatcher.h
@@ -37,6 +37,7 @@ class RenderView;
 namespace blink {
 class WebFrame;
 class WebURLRequest;
+class WebView;
 }
 
 namespace nwapi {
@@ -48,6 +49,7 @@ class Dispatcher : public content::RenderViewObserver {
 
   static v8::Handle<v8::Object> GetObjectRegistry();
   static v8::Handle<v8::Value> GetWindowId(blink::WebFrame* frame);
+  static void ZoomLevelChanged(blink::WebView* web_view);
   static void willHandleNavigationPolicy(
     content::RenderView* rv,
     blink::WebFrame* frame,
@@ -58,7 +60,6 @@ class Dispatcher : public content::RenderViewObserver {
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DraggableRegionsChanged(blink::WebFrame* frame) OVERRIDE;
-  //FIXME virtual void ZoomLevelChanged() OVERRIDE;
   virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) OVERRIDE;
   virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE;
 
diff --git a/src/api/window_bindings.cc b/src/api/window_bindings.cc
@@ -24,6 +24,7 @@
 #include "base/values.h"
 #include "content/child/child_thread.h"
 #include "content/nw/src/api/bindings_common.h"
+#include "content/nw/src/api/dispatcher.h"
 #include "content/renderer/render_view_impl.h"
 #include "grit/nw_resources.h"
 #undef LOG
@@ -185,8 +186,9 @@ WindowBindings::CallObjectMethodSync(const v8::FunctionCallbackInfo<v8::Value>&
     args.GetReturnValue().Set(scope.Escape(array));
     return;
   }else if (method == "SetZoomLevel") {
-    // double zoom_level = args[2]->ToNumber()->Value();
-    //FIXME: render_view->OnSetZoomLevel(zoom_level);
+    double zoom_level = args[2]->ToNumber()->Value();
+    render_view->GetWebView()->setZoomLevel(zoom_level);
+    nwapi::Dispatcher::ZoomLevelChanged(render_view->GetWebView());
     args.GetReturnValue().Set(v8::Undefined(isolate));
     return;
   }
