Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Add tests for did-change-theme-color event

Brian R. Bondy 9 years ago
parent
11b2015535
commit
29b00ae0d6
5 changed files with 38 additions and 8 deletions
Split View Show Diff Stats
  1. 5 7
      atom/browser/api/atom_api_web_contents.cc
  2. 16 0
      docs/api/web-contents.md
  3. 3 1
      docs/api/web-view-tag.md
  4. 7 0
      spec/fixtures/pages/theme-color.html
  5. 7 0
      spec/webview-spec.coffee

+ 5 - 7
atom/browser/api/atom_api_web_contents.cc
View File 

@@ -490,13 +490,11 @@ void WebContents::MediaPaused() {
 
 }
 
 
 void WebContents::DidChangeThemeColor(SkColor theme_color) {
 
-  char themeColor[8] = { 0 };
 
-  snprintf(themeColor, sizeof(themeColor),
 
-      "#%02X%02X%02X",
 
-      SkColorGetR(theme_color),
 
-      SkColorGetG(theme_color),
 
-      SkColorGetB(theme_color));
 
-  Emit("did-change-theme-color", themeColor);
 
+  std::string hex_theme_color = base::StringPrintf("#%02X%02X%02X",
 
+    SkColorGetR(theme_color),
 
+    SkColorGetG(theme_color),
 
+    SkColorGetB(theme_color));
 
+  Emit("did-change-theme-color", hex_theme_color);
 
 }
 
 
 void WebContents::DocumentLoadedInFrame(

+ 16 - 0
docs/api/web-contents.md
View File 

@@ -235,6 +235,22 @@ Returns:
 
 Emitted when a result is available for
 
 [`webContents.findInPage`](web-contents.md#webcontentsfindinpage) request.
 
 
+### Event: 'media-started-playing'
 
+
 
+Emitted when media starts playing.
 
+
 
+### Event: 'media-paused'
 
+
 
+Emitted when media is paused or done playing.
 
+
 
+### Event: 'did-change-theme-color'
 
+
 
+Emitted when a page's theme color changes. This is usually due to encountering a meta tag:
 
+
 
+```html
 
+<meta name='theme-color' content='#ff0000'>
 
+```
 
+
 
 ## Instance Methods
 
 
 The `webContents` object has the following instance methods:

+ 3 - 1
docs/api/web-view-tag.md
View File 

@@ -647,4 +647,6 @@ Emitted when media is paused or done playing.
 
 
 Emitted when a page's theme color changes. This is usually due to encountering a meta tag:
 
 
-    <meta name='theme-color' content='#ff0000'>
 
+```html
 
+<meta name='theme-color' content='#ff0000'>
 
+```

+ 7 - 0
spec/fixtures/pages/theme-color.html
View File 

@@ -0,0 +1,7 @@
 
+<html>
 
+  <head>
 
+    <meta name="theme-color" content="#ffeedd">
 
+  </head>
 
+  <body>
 
+  </body>
 
+</html>

+ 7 - 0
spec/webview-spec.coffee
View File 

@@ -406,3 +406,10 @@ describe '<webview> tag', ->
 
       webview.addEventListener 'did-finish-load', listener2
 
       webview.src = "file://#{fixtures}/pages/content.html"
 
       document.body.appendChild webview
 
+
 
+  describe 'did-change-theme-color event', ->
 
+    it 'emits when theme color changes', (done) ->
 
+      webview.addEventListener 'did-change-theme-color', (e) ->
 
+        done()
 
+      webview.src = "file://#{fixtures}/pages/theme-color.html"
 
+      document.body.appendChild webview